Changeset 1011

Timestamp:

01/03/08 10:21:30 (11 months ago)

Author:

ludovic.rousseau

Message:

do not use AC_LIB_LINKFLAGS() since this macro is provided by gettext
and we do not use gettext. Use AC_CHECK_LIB() instead

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/ifd/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -145 +145 @@
 
 dnl use ltdl
-AC_LIB_LINKFLAGS(ltdl)
-
-saved_LIBS="$LIBS"
-LIBS="$saved_LIBS $LIBLTDL"
-AC_CHECK_HEADER([ltdl.h], [AC_MSG_RESULT([yes])],
-   [ AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool]) ])
-LIBS="$saved_LIBS"
+if test -z "${LTLIB_LIBS}"; then
+    AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl])
+    AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl])
+
+    AC_CHECK_LIB(
+        [ltdl],
+        [lt_dlopen],
+        [LTLIB_LIBS="-lltdl"],
+        [AC_MSG_ERROR([ltdl1 not found, please install libltdl and/or libtool])])
+
+    AC_CHECK_HEADER(
+        [ltdl.h],
+        ,
+        [AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])]
+    )
+fi
+AC_SUBST([LTLIB_CFLAGS])
+AC_SUBST([LTLIB_LIBS])
 
 dnl See if socket() is found from libsocket

trunk/src/ifd/Makefile.am

@@ -3 +3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = $(CPPFLAGS) $(PCSC_CFLAGS) $(LIBUSB_CFLAGS)
+INCLUDES = $(CPPFLAGS) $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(LTLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libifd.la
@@ -27 +27 @@
         ria.c
 # new driver not working yet: ifd-wbeiuu.c
-libifd_la_LIBADD = ../ct/libopenct.la $(LTLIBLTDL) $(LIBUSB_LIBS)
+libifd_la_LIBADD = ../ct/libopenct.la $(LTLIB_LIBS) $(LIBUSB_LIBS)
 
 ifdhandler_SOURCES = ifdhandler.c