[Pcsclite-cvs-commit] PCSC Makefile.am,1.9,1.10 configure.in,1.29,1.30

aet-guest@quantz.debian.org aet-guest@quantz.debian.org
Sun, 07 Sep 2003 22:28:55 +0200


Update of /cvsroot/pcsclite/PCSC
In directory quantz:/tmp/cvs-serv24028

Modified Files:
	Makefile.am configure.in 
Log Message:
Build fixes. The first version that actually compiles for
Linux, Solaris, Tru64 and AIX after src/Makefile.am and
configure.in modifications.

- Untested
- No hotplug/power management support
- Untested for *BSD, MacOS X and HP-UX,
  there's other things to do before even
  trying to compile.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	7 Sep 2003 17:57:33 -0000	1.9
+++ Makefile.am	7 Sep 2003 20:28:53 -0000	1.10
@@ -1,6 +1,5 @@
 # Process this file with automake to create Makefile.in.
 
-AUTOMAKE_OPTIONS = no-dependencies
 SUBDIRS = src etc doc
 
 AUX_DIST = \
@@ -45,4 +44,3 @@
 	s+/cvsroot/pcsclite/PCSC/++g; print ; }' > $@
 
 .PHONY: ChangeLog.cvs
-

Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/configure.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- configure.in	7 Sep 2003 18:05:23 -0000	1.29
+++ configure.in	7 Sep 2003 20:28:53 -0000	1.30
@@ -5,12 +5,12 @@
 AC_PREREQ(2.52)
 
 AC_INIT(COPYING)
-AM_INIT_AUTOMAKE(pcsc-lite, 1.2.0-cvs)
 AM_CONFIG_HEADER(config.h)
 
 AC_CONFIG_SRCDIR(src/pcscdaemon.c)
-
 AC_CONFIG_AUX_DIR(build)
+AM_INIT_AUTOMAKE(pcsc-lite, 1.2.0-cvs)
+
 AC_PREFIX_DEFAULT(/usr/local)
 
 AC_CANONICAL_HOST
@@ -243,8 +243,13 @@
 # Always link lib{socket,nsl,resolv) if found, sigh
 LIBS="$LIBS $LIBSOCKET $LIBRESOLV"
 
+dnl Probe for a proper flex library
+AC_SUBST(LIBFL)
+AC_CHECK_LIB(l, yywrap, [LIBFL="$LIBFL -ll"], AC_CHECK_LIB(fl, yywrap, [LIBFL="$LIBFL -lfl"]))
+
 dnl check if libusb is available
-AC_CHECK_LIB(usb, usb_init, [ use_libusb=true ], [ use_libusb=false ])
+AC_SUBST(LIBUSB)
+AC_CHECK_LIB(usb, usb_init, [LIBUSB="$LIBUSB -lusb" use_libusb=true ], [ use_libusb=false ])
 AC_CHECK_HEADERS(usb.h, [ use_libusb=true ], [ use_libusb=false ])
 
 dnl --enable-libusb=DIR
@@ -259,7 +264,7 @@
 			*)
 				use_libusb=false
 				libusb_prefix=${enableval}
-				AC_CHECK_LIB(usb, usb_init, [ use_libusb=true ], [ use_libusb=false ], "-L${libusb_prefix}/lib")
+				AC_CHECK_LIB(usb, usb_init, [LIBUSB="$LIBUSB -lusb" use_libusb=true ], [ use_libusb=false ], "-L${libusb_prefix}/lib")
 				AC_CHECK_HEADERS(${libusb_prefix}/include/usb.h, [ use_libusb=true ], [ use_libusb=false ])
 				if test x$use_libusb = xtrue; then
 					CPPFLAGS="$CPPFLAGS -I${libusb_prefix}/include"
@@ -341,6 +346,9 @@
   *) AC_MSG_ERROR([bad value ${enableval} for --enable-scf]) ;;
 esac], [scf=false])
 
+AC_SUBST(LIBSMARTCARD)
+# FIXME
+LIBSMARTCARD=""
 AC_MSG_RESULT([enable SCF reader support     : $scf])
 
 AM_CONDITIONAL(MSC_ENABLE_SCF, test x$scf = xtrue)
@@ -413,6 +421,8 @@
   CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
   CC="$PTHREAD_CC"
 fi
+
+CPPFLAGS="-I\${top_srcdir}/src $CPPFLAGS"
 
 dnl Setup dist stuff
 AC_SUBST(ac_aux_dir)