diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-12 15:52:30 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-12 15:52:30 +0000 |
| commit | d3c89339db8104c6935e5fd1e118f8525c911bc8 (patch) | |
| tree | cac1c3dfa0a5e980aaea02dca5ecf2b4a2166172 /lib | |
| parent | 0017a350835ea7d18cb0a1292c0ce1025fa983ff (diff) | |
| download | gnutls-d3c89339db8104c6935e5fd1e118f8525c911bc8.tar.gz | |
opencdk is being included if not found.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 7a86ad8a98..b56ba7edaf 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -11,7 +11,15 @@ else endif DIST_SUBDIRS = minitasn1 x509 -SUBDIRS = $(MINITASN1_DIR) x509 +if ENABLE_MINITASN1 +SUBDIRS = minitasn1 x509 +MINITASN1_OBJECTS = minitasn1/libminitasn1.la +LIBASN1_LINK = +else +SUBDIRS = x509 +MINITASN1_OBJECTS = +LIBASN1_LINK = -ltasn1 +endif EXTRA_DIST = debug.h gnutls_compress.h defines.h gnutls.asn pkix.asn \ gnutls_cipher.h gnutls_buffers.h gnutls_errors.h gnutls_int.h \ @@ -52,12 +60,7 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c \ libgnutls_la_SOURCES = $(COBJECTS) -libgnutls_la_LIBADD = $(MINITASN1_OBJECTS) x509/dn.lo x509/crl.lo x509/common.lo \ - x509/x509.lo x509/extensions.lo x509/compat.lo x509/verify.lo x509/dsa.lo \ - x509/mpi.lo x509/privkey.lo x509/pkcs7.lo x509/crq.lo x509/xml.lo x509/sign.lo \ - x509/pkcs5.lo x509/privkey_pkcs8.lo x509/pkcs12.lo x509/pkcs12_bag.lo \ - x509/pkcs12_encr.lo x509/rfc2818_hostname.lo x509/x509_write.lo \ - x509/crl_write.lo +libgnutls_la_LIBADD = $(MINITASN1_OBJECTS) x509/libx509.la libgnutls_la_LDFLAGS = $(LIBASN1_LINK) $(LIBGCRYPT_LIBS) \ $(libgnutls_version_script_cmd) \ |