- Cleanups to Makefile.am if / endif mess

- Don't bother checking OpenSSL engine
  LDFLAGS if no engine detected


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

configure.in

@@ -420,13 +420,17 @@ LIBS="$saved_LIBS"
 
 if test "x$SSL_MSG" = "xyes" ; then
   AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
+else
+  LIBCRYPTO=""
+  LIBCRYPTOA=""
 fi
 AM_CONDITIONAL(HAVE_SSL, test "x$SSL_MSG" = "xyes")
 AM_CONDITIONAL(HAVE_ENGINE, test "x$ENGINE_MSG" = "xyes")
 
 AC_SUBST(OPENSSL_LDFLAGS)
 OPENSSL_LDFLAGS=""
-for openssl_ldflag in "-Wl,-Bsymbolic" "-G -Wl,-Bsymbolic" "-shared -G -Wl,-Bsymbolic" "-Wl,-all_load"; do
+if test "x$ENGINE_MSG" = "xyes" ; then
+  for openssl_ldflag in "-Wl,-Bsymbolic" "-G -Wl,-Bsymbolic" "-shared -G -Wl,-Bsymbolic" "-Wl,-all_load"; do
 	AC_MSG_CHECKING([whether we can use $openssl_ldflag])
 	saved_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $openssl_ldflag"
@@ -437,7 +441,8 @@ for openssl_ldflag in "-Wl,-Bsymbolic" "-G -Wl,-Bsymbolic" "-shared -G -Wl,-Bsym
 		OPENSSL_LDFLAGS="$openssl_ldflag"
 		break;
 	fi
-done
+  done
+fi
 
 AC_ARG_WITH(pam-dir,
 	[  --with-pam-dir=PATH     Specify path for PAM installation libraries],
@@ -913,7 +918,9 @@ AC_DEFINE_UNQUOTED(OPENSC_CONF_PATH, "$opensc_conf_path", [default config file f
 AC_SUBST(LIBSCCONF)
 LIBSCCONF="\${top_builddir}/src/scconf/libscconf.la"
 AC_SUBST(LIBSCLDAP)
-LIBSCLDAP="\${top_builddir}/src/scldap/libscldap.la"
+if test "x$LDAP_MSG" = "xyes" ; then
+  LIBSCLDAP="\${top_builddir}/src/scldap/libscldap.la"
+fi
 AC_SUBST(LIBOPENSC)
 LIBOPENSC="\${top_builddir}/src/libopensc/libopensc.la"
 

src/libopensc/Makefile.am

@@ -7,44 +7,35 @@ MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = Makefile.mak libopensc.pc.in \
 	reader-pcsc.c reader-openct.c reader-usbtoken.c emv.c
 
-if HAVE_SSL
-SSL_LIB = @LIBCRYPTO@
-endif
-
 if HAVE_PCSCLITE
 PCSC_SRC = reader-pcsc.c
-PCSC_FLAGS = @CFLAGS_PCSC@
-PCSC_LIB = @LIBPCSC@
 endif
-
-if HAVE_USBTOKEN
-USBTOKEN_SRC = reader-usbtoken.c
-endif
-
 if HAVE_OPENCT
 OPENCT_SRC = reader-openct.c
 endif
+if HAVE_USBTOKEN
+USBTOKEN_SRC = reader-usbtoken.c
+endif
+READER_SRC = $(PCSC_SRC) $(OPENCT_SRC) $(USBTOKEN_SRC)
 
-INCLUDES = @CPPFLAGS@ $(PCSC_FLAGS) @OPENCT_CFLAGS@
+INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @CFLAGS_PCSC@
 LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
 
 bin_SCRIPTS = opensc-config
 
 lib_LTLIBRARIES = libopensc.la
 libopensc_la_SOURCES = \
-	sc.c ctx.c module.c asn1.c log.c base64.c \
-	errors.c sec.c card.c iso7816.c dir.c \
-	portability.c padding.c \
+	sc.c ctx.c log.c errors.c portability.c module.c \
+	asn1.c base64.c sec.c card.c iso7816.c dir.c padding.c \
 	pkcs15.c pkcs15-cert.c pkcs15-data.c pkcs15-pin.c \
 	pkcs15-prkey.c pkcs15-pubkey.c pkcs15-sec.c \
-	pkcs15-wrap.c pkcs15-algo.c \
-	pkcs15-cache.c $(PCSC_SRC) reader-ctapi.c \
-	$(USBTOKEN_SRC) $(OPENCT_SRC) ctbcs.c \
+	pkcs15-wrap.c pkcs15-algo.c pkcs15-cache.c \
+	ctbcs.c reader-ctapi.c $(READER_SRC) \
 	card-setcos.c card-miocos.c card-flex.c card-gpk.c \
 	card-etoken.c card-tcos.c card-emv.c card-default.c \
 	card-mcrd.c card-starcos.c
 libopensc_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
-libopensc_la_LIBADD = @LIBDL@ @OPENCT_LIBS@ $(PCSC_LIB) $(SSL_LIB) $(LIBSCCONF)
+libopensc_la_LIBADD = @LIBSCCONF@ @LIBDL@ @LIBCRYPTO@ @OPENCT_LIBS@ @LIBPCSC@
 
 include_HEADERS = \
 	opensc.h pkcs15.h emv.h \

src/scam/Makefile.am

@@ -4,16 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 lib_LTLIBRARIES = libscam.la
 
-if HAVE_LDAP
-LDAP_LIB = @LIBSCLDAP@
-endif
-if HAVE_SSL
-SSL_LIB = @LIBCRYPTO@
-endif
-
-SRC = scam.c scam.h p15_eid.c p15_ldap.c
-
-libscam_la_SOURCES = $(SRC)
+libscam_la_SOURCES = scam.c scam.h p15_eid.c p15_ldap.c
 libscam_la_LDFLAGS = -avoid-version
-libscam_la_LIBADD = @LIBOPENSC@ $(LDAP_LIB) $(SSL_LIB) \
+libscam_la_LIBADD = @LIBOPENSC@ @LIBCRYPTO@ @LIBSCLDAP@ \
 	../scrandom/libscrandom.la

src/scldap/Makefile.am

@@ -7,16 +7,13 @@ MAINTAINERCLEANFILES = Makefile.in
 include_HEADERS = scldap.h
 
 if HAVE_LDAP
-LDAP_LTLIB = libscldap.la
-LDAP_PROGRAM = test-ldap
+lib_LTLIBRARIES = libscldap.la
+noinst_PROGRAMS = test-ldap
 endif
 
-lib_LTLIBRARIES = $(LDAP_LTLIB)
 libscldap_la_SOURCES = scldap.c scldap.h
 libscldap_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
-libscldap_la_LIBADD = @LIBLDAP@ @LIBSCCONF@
-
-noinst_PROGRAMS = $(LDAP_PROGRAM)
+libscldap_la_LIBADD = @LIBSCCONF@ @LIBLDAP@
 
 test_ldap_SOURCES = test-ldap.c
-test_ldap_LDFLAGS = @LDFLAGS@ @LIBSCLDAP@
+test_ldap_LDFLAGS = @LDFLAGS@ libscldap.la