Fixes.

diff --git a/configure.in b/configure.in
index 57e30d584dd9be909f760fa24324444a7e0cd6ba..a8a2f86847a494031cd8951c9dd937888618a0af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -289,18 +289,6 @@ if test "x$opt_guile_bindings" = "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_GUILE, test "x$opt_guile_bindings" = "xyes")
 
-# Check for libgcrypt
-AC_LIB_HAVE_LINKFLAGS(gcrypt,, [#include <gcrypt.h>],
-  [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128])
-if test "$ac_cv_libgcrypt" != yes; then
-  AC_MSG_ERROR([[
-***  
-*** libgcrypt was not found. You may want to get it from
-*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-***
-]])
-fi
-
 dnl Check for libcfg+
 
 SAVED_LIBS=$LIBS

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5c41eb3ec70980e2d41e5015e43e664b28fa3b49..3c5bad11408b1d3ffaf4bf13de3e52a6843c14d5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -31,9 +31,8 @@ localedir = $(datadir)/locale
 
 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"                             \
        -I$(srcdir)/gl -I$(builddir)/gl                                 \
-       -I$(top_srcdir)/includes -I../includes                          \
-       -I$(srcdir)/x509                                                \
-       -I$(top_srcdir)/libextra -I$(top_srcdir)/lib/openpgp/
+       -I$(srcdir)/../includes -I$(builddir)../includes                \
+       -I$(srcdir)/x509
 
 if ENABLE_OPENPGP
 SUBDIRS += opencdk
@@ -45,9 +44,6 @@ if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(srcdir)/minitasn1
 endif
 
-m4datadir = $(datadir)/aclocal
-dist_m4data_DATA = libgnutls.m4
-
 # Pkg-config script.
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnutls.pc

diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 90822a5560f4cca1f2bc54afe992af79a5faaa4f..d8224b77926b9f5d0d083f2e1221c2e955bb24da 100644 (file)
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -49,6 +49,17 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_MSG_CHECKING([whether to build C++ library])
   AC_MSG_RESULT($use_cxx)
 
+  AC_LIB_HAVE_LINKFLAGS(gcrypt,, [#include <gcrypt.h>],
+    [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128])
+  if test "$ac_cv_libgcrypt" != yes; then
+    AC_MSG_ERROR([[
+***  
+*** libgcrypt was not found. You may want to get it from
+*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+***
+    ]])
+  fi
+
   AC_ARG_WITH(included-libtasn1,
     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
       included_libtasn1=$withval,

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 2808be02dcf6ea628a994c99ed974b9624f38365..331ddafa31de47864e0b4e834ab42cc3e203d53e 100644 (file)
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -22,9 +22,10 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I ../lib/m4
 
-AM_CPPFLAGS = -I$(srcdir)/gl -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \
-       -I$(top_srcdir)/lib -I../includes -I$(top_srcdir)/includes      \
-       -I$(top_srcdir)/lib/minitasn1
+AM_CPPFLAGS = -I$(srcdir)/gl                                           \
+       -I$(srcdir)/../lib/gl -I$(builddir)/../lib/gl                   \
+       -I$(srcdir)/../lib                                              \
+       -I$(builddir)/../includes -I$(srcdir)/../includes
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
@@ -32,9 +33,6 @@ endif
 
 SUBDIRS = gl
 
-m4datadir = $(datadir)/aclocal
-dist_m4data_DATA = libgnutls-extra.m4
-
 # Pkg-config script.
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnutls-extra.pc
@@ -59,7 +57,7 @@ lib_LTLIBRARIES += libgnutls-openssl.la
 libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h       \
        openssl_compat.c
 
-libgnutls_openssl_la_LIBADD = ../lgl/liblgnu.la ../lib/libgnutls.la 
+libgnutls_openssl_la_LIBADD = ../lib/gl/liblgnu.la ../lib/libgnutls.la 
 
 libgnutls_openssl_la_LDFLAGS += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
@@ -102,7 +100,7 @@ libgnutls_extra_la_LDFLAGS += \
 
 libgnutls_extra_la_SOURCES += libgnutls-extra.vers
 
-libgnutls_extra_la_LIBADD += ../lgl/liblgnu.la gl/libxgnu.la \
+libgnutls_extra_la_LIBADD += ../lib/gl/liblgnu.la gl/libxgnu.la \
        ../lib/libgnutls.la
 
 if HAVE_LD_VERSION_SCRIPT

diff --git a/src/Makefile.am b/src/Makefile.am
index 069e0fcdeed79869e00e58da27126cd77b20b488..1517d5e82ee76ae8efb5e79f525b90725e8db04a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,9 @@ EXTRA_DIST = README README.srptool
 
 SUBDIRS = cfg
 
-AM_CPPFLAGS = -I../includes -I$(top_srcdir)/includes \
-       -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \
-       -I$(top_srcdir)/gl -I$(top_builddir)/gl \
+AM_CPPFLAGS = -I$(builddir)../includes -I$(srcdir)/..includes \
+       -I$(srcdir)/../lib/gl -I$(builddir)/../lib/gl \
+       -I$(srcdir)/../gl -I$(builddir)/../gl \
        -I$(srcdir)/cfg
 
 bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
@@ -41,11 +41,11 @@ gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
 
 if ENABLE_SRP
 srptool_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c crypt.c
-srptool_LDADD = ../lib/libgnutls.la ../gl/libgnu.la ../lgl/liblgnu.la
+srptool_LDADD = ../lib/libgnutls.la ../gl/libgnu.la ../lib/gl/liblgnu.la
 endif
 
 psktool_SOURCES = psk.gaa psk-gaa.h psk-gaa.c psk.c
-psktool_LDADD = ../lib/libgnutls.la ../gl/libgnu.la ../lgl/liblgnu.la
+psktool_LDADD = ../lib/libgnutls.la ../gl/libgnu.la ../lib/gl/liblgnu.la
 
 gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h        \
        common.c select.c
@@ -71,7 +71,7 @@ endif
 
 noinst_PROGRAMS = errcodes printlist
 errcodes_SOURCES = errcodes.c
-errcodes_LDADD = ../lib/libgnutls.la ../gl/libgnu.la ../lgl/liblgnu.la
+errcodes_LDADD = ../lib/libgnutls.la ../gl/libgnu.la ../lib/gl/liblgnu.la
 
 printlist_SOURCES = printlist.c
 printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la