use LTLIB_CFLAGS and LTLIB_LIBS instead of the global LIBS to find and use

libltdl

thanks to Alon Bar-Lev for the patch


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3243 c6295689-39f2-0310-b995-f0e70906c6a9

configure.in

@@ -195,13 +195,25 @@ AC_CACHE_CHECK([for flex directory], ac_cv_flexdir, [
 ])
 
 dnl use ltdl
-AC_CHECK_LIB([ltdl],lt_dlopen)
+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])
 
-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"
+	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])
 
 OPENCT_MSG=no
 if test "x${ENABLE_OPENCT}" = "xyes"; then

src/libopensc/Makefile.am

@@ -37,7 +37,7 @@ libopensc_la_SOURCES = \
 	pkcs15-actalis.c pkcs15-atrust-acos.c pkcs15-tccardos.c pkcs15-piv.c \
 	compression.c p15card-helper.c
 libopensc_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
-libopensc_la_LIBADD = @LIBSCCONF@ $(OPENSSL_LIBS) $(OPENCT_LIBS) $(PCSC_LIBS) $(LTLIBLTDL)
+libopensc_la_LIBADD = @LIBSCCONF@ $(OPENSSL_LIBS) $(OPENCT_LIBS) $(PCSC_LIBS) $(LTLIB_LIBS)
 
 include_HEADERS = \
 	opensc.h pkcs15.h emv.h \

src/pkcs11/Makefile.am

@@ -33,7 +33,7 @@ libpkcs11_la_LIBADD =
 
 pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h
 pkcs11_spy_la_LDFLAGS = -module -avoid-version
-pkcs11_spy_la_LIBADD = $(OPENSSL_LIBS) libpkcs11.la $(LTLIBLTDL)
+pkcs11_spy_la_LIBADD = $(OPENSSL_LIBS) libpkcs11.la $(LTLIB_LIBS)
 
 include_HEADERS = pkcs11.h