*** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index 40346967405f71485e08abe85a0ee47849b59fb1..4810ccb2babac0c1543b52b7077130f56723e23c 100644 (file)
--- 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

diff --git a/NEWS b/NEWS
index 97e0d198af16658eb9b122972831bf23c05c95a9..036786f2ee649cd048b69d840990f4f90f008224 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 3d08b5428ccb471b7233dc15b7d13d6d72f8aa96..a17a080223cfd445c795e63b80887f07e47275b2 100644 (file)
--- 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 850edb262620bb3b0d652923f69e81ca9d8a6767..4f4e0fe8d64138b6de8c2990b2acb32ca947a7ec 100644 (file)
--- 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 df3a4b6838b578c1c58fca83b162e8b83d6f64d4..4e8fc29ed13254b68a57eaafd742d2420ca1091f 100644 (file)
--- 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