diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libextra/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 4034696740..4810ccb2ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = ChangeLog NEWS INSTALL README THANKS COPYING PGPKEYS COPYING.LIB -SUBDIRS = lib libextra src doc tests +SUBDIRS = libasn1 lib libextra src doc tests ChangeLog: cvs2cl --utc -U .cvsusers --fsf -t -S --prune @@ -8,6 +8,7 @@ Version ?.?.? and compression algorithms. - Added check for C99 macro support by the compiler. - Added functions gnutls_b64_encode_fmt2() and gnutls_b64_decode_fmt2() +- Added the new libasn1 library. Version 0.4.3 (23/05/2002) - The gnutls-extra library now compiles fine, if the opencdk library is diff --git a/configure.in b/configure.in index 3d08b5428c..a17a080223 100644 --- a/configure.in +++ b/configure.in @@ -309,7 +309,7 @@ AC_MSG_RESULT([*** ]) AM_PROG_LIBTOOL -LIBGNUTLS_LIBS="$LIBS -L${libdir} -lgnutls $LIBGCRYPT_LIBS" +LIBGNUTLS_LIBS="$LIBS -L${libdir} -lgnutls -lasn1 $LIBGCRYPT_LIBS" LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}" AC_SUBST(LIBGNUTLS_LIBS) @@ -337,6 +337,8 @@ AC_MSG_WARN(*** fi fi +AC_CONFIG_SUBDIRS(libasn1) + AC_CONFIG_FILES(lib/gnutls.h.in) AC_CONFIG_COMMANDS([lib/gnutls.h],[[ @@ -346,8 +348,6 @@ AC_CONFIG_COMMANDS([lib/gnutls.h],[[ echo "" >> lib/gnutls.h cat lib/gnutls_errors_int.h | grep -v _INT_ >> lib/gnutls.h echo "" >> lib/gnutls.h - cat lib/x509_asn1.h >> lib/gnutls.h - echo "" >> lib/gnutls.h echo "#ifdef __cplusplus" >> lib/gnutls.h echo "}" >> lib/gnutls.h echo "#endif" >> lib/gnutls.h diff --git a/libextra/Makefile.am b/libextra/Makefile.am index 850edb2626..4f4e0fe8d6 100644 --- a/libextra/Makefile.am +++ b/libextra/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I../lib +INCLUDES = -I../lib -I../libasn1/lib/ include_HEADERS = gnutls-extra.h bin_SCRIPTS = libgnutls-extra-config diff --git a/tests/Makefile.am b/tests/Makefile.am index df3a4b6838..4e8fc29ed1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -INCLUDES= -I../lib/ +INCLUDES= -I../lib/ -I../libasn1/lib/ noinst_PROGRAMS = x509test x509test_SOURCES = x509_test.c |