[Pcsclite-cvs-commit] r6424 - in /trunk/contrib/libPCSCv2part10: PCSCv2part10.h configure.in

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Aug 10 12:52:54 2012
New Revision: 6424

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6424
Log:
Only include reader.h if we found it

reader.h is not provided on Mac OS X for example.

Modified:
    trunk/contrib/libPCSCv2part10/PCSCv2part10.h
    trunk/contrib/libPCSCv2part10/configure.in

Modified: trunk/contrib/libPCSCv2part10/PCSCv2part10.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/contrib/libPCSCv2part10/PCSCv2part10.h?rev=6424&op=diff
==============================================================================
--- trunk/contrib/libPCSCv2part10/PCSCv2part10.h (original)
+++ trunk/contrib/libPCSCv2part10/PCSCv2part10.h Fri Aug 10 12:52:54 2012
@@ -21,7 +21,13 @@
  * $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_READER_H
 #include <reader.h>
+#endif
 
 /**
  * @file

Modified: trunk/contrib/libPCSCv2part10/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/contrib/libPCSCv2part10/configure.in?rev=6424&op=diff
==============================================================================
--- trunk/contrib/libPCSCv2part10/configure.in (original)
+++ trunk/contrib/libPCSCv2part10/configure.in Fri Aug 10 12:52:54 2012
@@ -47,7 +47,7 @@
 saved_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PCSC_CFLAGS"
 PCSC_ERROR_MSG="install pcsc-lite, or use ./configure PCSC_CFLAGS=..."
-AC_CHECK_HEADER(reader.h,, [AC_MSG_ERROR([$PCSC_ERROR_MSG])])
+AC_CHECK_HEADERS(reader.h)
 CPPFLAGS="$saved_CPPFLAGS"
 
 # Write Makefiles.