- fixed compliation error using --enable-smartcard

3 files changed, 24 insertions, 124 deletions

diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index d36313fa1..e83cd12ed 100644
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -8,6 +8,11 @@ openac_LDADD = ac.o asn1.o ca.o certs.o constants.o crl.o defs.o mp_defs.o fetch
                $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \
                -lgmp
 
+# This compile option activates smartcard support
+if USE_SMARTCARD
+  openac_LDADD += -ldl
+endif
+
 dist_man_MANS = openac.8
 
 PLUTODIR=$(top_srcdir)/src/pluto
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index c9dc7d7b0..e6412f752 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -5,129 +5,20 @@
 ipsec_PROGRAMS = pluto _pluto_adns
 
 pluto_SOURCES = \
-linux26/rtnetlink.h \
-linux26/xfrm.h \
-linux26/netlink.h \
-rsaref/pkcs11t.h \
-rsaref/pkcs11.h \
-rsaref/unix.h \
-rsaref/pkcs11f.h \
-alg/ike_alg_twofish.c \
-alg/ike_alg_aes.c \
-alg/ike_alg_blowfish.c \
-alg/ike_alg_sha2.c \
-alg/ike_alg_serpent.c \
-alg/ike_alginit.c \
-kernel_alg.c \
-kernel_alg.h \
-kernel_pfkey.h \
-kernel_pfkey.c \
-gcryptfix.c \
-gcryptfix.h \
-primegen.c \
-smallprime.c \
-ocsp.c \
-ocsp.h \
-pgp.c \
-ac.c \
-certs.c \
-connections.c \
-certs.h \
-virtual.c \
-connections.h \
-fetch.c \
-virtual.h \
-fetch.h \
-ipsec_doi.c \
-ipsec_doi.h \
-x509.c \
-kameipsec.h \
-cookie.c \
-x509.h \
-cookie.h \
-pgp.h \
-ac.h \
-sha1.c \
-sha1.h \
-constants.c \
-smartcard.c \
-kernel.c \
-constants.h \
-smartcard.h \
-kernel.h \
-dnskey.c \
-asn1.c \
-dnskey.h \
-elgamal.c \
-db_ops.c \
-asn1.h \
-elgamal.h \
-oid.c \
-db_ops.h \
-mp_defs.c \
-state.c \
-oid.h \
-mp_defs.h \
-ca.c \
-state.h \
-pkcs7.c \
-lex.c \
-ca.h \
-pkcs7.h \
-id.c \
-lex.h \
-id.h \
-keys.c \
-ike_alg.c \
-keys.h \
-md5.c \
-md5.h \
-kernel_noklips.c \
-ike_alg.h \
-rcv_whack.c \
-rcv_whack.h \
-alg_info.c \
-alg_info.h \
-pem.c \
-kernel_noklips.h \
-foodgroups.c \
-pem.h \
-kernel_netlink.c \
-foodgroups.h \
-vendor.c \
-vendor.h \
-packet.c \
-packet.h \
-crl.c \
-md2.c \
-rnd.c \
-crl.h \
-md2.h \
-spdb.c \
-rnd.h \
-spdb.h \
-modecfg.c \
-timer.h \
-nat_traversal.c \
-server.c \
-dsa.c \
-plutomain.c \
-modecfg.h \
-kernel_netlink.h \
-nat_traversal.h \
-server.h \
-dsa.h \
-timer.c \
-crypto.c \
-pkcs1.c \
-log.c \
-defs.c \
-demux.c \
-crypto.h \
-pkcs1.h \
-log.h \
-defs.h \
-demux.h
+linux26/rtnetlink.h linux26/xfrm.h linux26/netlink.h rsaref/pkcs11t.h rsaref/pkcs11.h \
+rsaref/unix.h rsaref/pkcs11f.h alg/ike_alg_twofish.c alg/ike_alg_aes.c alg/ike_alg_blowfish.c \
+alg/ike_alg_sha2.c alg/ike_alg_serpent.c alg/ike_alginit.c kernel_alg.c kernel_alg.h kernel_pfkey.h \
+kernel_pfkey.c gcryptfix.c gcryptfix.h primegen.c smallprime.c ocsp.c ocsp.h pgp.c ac.c certs.c \
+connections.c certs.h virtual.c connections.h fetch.c virtual.h fetch.h ipsec_doi.c ipsec_doi.h \
+x509.c kameipsec.h cookie.c x509.h cookie.h pgp.h ac.h sha1.c sha1.h constants.c smartcard.c \
+kernel.c constants.h smartcard.h kernel.h dnskey.c asn1.c dnskey.h elgamal.c db_ops.c asn1.h \
+elgamal.h oid.c db_ops.h mp_defs.c state.c oid.h mp_defs.h ca.c state.h pkcs7.c lex.c ca.h \
+pkcs7.h id.c lex.h id.h keys.c ike_alg.c keys.h md5.c md5.h kernel_noklips.c ike_alg.h rcv_whack.c \
+rcv_whack.h alg_info.c alg_info.h pem.c kernel_noklips.h foodgroups.c pem.h kernel_netlink.c \
+foodgroups.h vendor.c vendor.h packet.c packet.h crl.c md2.c rnd.c crl.h md2.h spdb.c rnd.h \
+spdb.h modecfg.c timer.h nat_traversal.c server.c dsa.c plutomain.c modecfg.h kernel_netlink.h \
+nat_traversal.h server.h dsa.h timer.c crypto.c pkcs1.c log.c defs.c demux.c crypto.h pkcs1.h \
+log.h defs.h demux.h
 
 _pluto_adns_SOURCES = adns.c adns.h
 
@@ -161,7 +52,6 @@ endif
 
 # This compile option activates smartcard support
 if USE_SMARTCARD
-  AM_CFLAGS += -DSMARTCARD
   pluto_LDADD += -ldl
 endif
 
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index 0031b0348..079e25a35 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -9,6 +9,11 @@ scepclient_LDADD = asn1.o ca.o crl.o certs.o constants.o defs.o fetch.o id.o \
                    $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \
                    -lgmp
 
+# This compile option activates smartcard support
+if USE_SMARTCARD
+  scepclient_LDADD += -ldl
+endif
+
 dist_man_MANS = scepclient.8
 
 PLUTODIR=$(top_srcdir)/src/pluto