diff options
| author | Martin Willi <martin@strongswan.org> | 2009-08-31 13:14:54 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-08-31 13:14:54 +0200 |
| commit | 1d39663f7a0bfd7399ea0db24e4190bdbf196c46 (patch) | |
| tree | 59f619f0dfa61601ed869bf20cc2887919cc7f87 | |
| parent | 8706a151ff5a2402e41c21133084cd6bdf0a6b7e (diff) | |
| download | strongswan-1d39663f7a0bfd7399ea0db24e4190bdbf196c46.tar.bz2 strongswan-1d39663f7a0bfd7399ea0db24e4190bdbf196c46.tar.xz | |
do not depend on gcrypt autoconf macros
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/gcrypt/Makefile.am | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index c29454bd8..cc378169a 100644 --- a/configure.in +++ b/configure.in @@ -1111,7 +1111,8 @@ if test x$openssl = xtrue; then fi if test x$gcrypt = xtrue; then - AM_PATH_LIBGCRYPT(,,[AC_MSG_ERROR([libgcrypt not found!])]) + AC_HAVE_LIBRARY([gcrypt],[LIBS="$LIBS"],[AC_MSG_ERROR([gcrypt library not found])]) + AC_CHECK_HEADER([gcrypt.h],,[AC_MSG_ERROR([gcrypt header gcrypt.h not found!])]) AC_MSG_CHECKING([gcrypt CAMELLIA cipher]) AC_TRY_COMPILE( [#include <gcrypt.h>], diff --git a/src/libstrongswan/plugins/gcrypt/Makefile.am b/src/libstrongswan/plugins/gcrypt/Makefile.am index 7394676e2..a468a5ed9 100644 --- a/src/libstrongswan/plugins/gcrypt/Makefile.am +++ b/src/libstrongswan/plugins/gcrypt/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -AM_CFLAGS = -rdynamic $(LIBGCRYPT_CFLAGS) +AM_CFLAGS = -rdynamic plugin_LTLIBRARIES = libstrongswan-gcrypt.la @@ -14,4 +14,4 @@ libstrongswan_gcrypt_la_SOURCES = gcrypt_plugin.h gcrypt_plugin.c \ gcrypt_hasher.h gcrypt_hasher.c libstrongswan_gcrypt_la_LDFLAGS = -module -avoid-version -libstrongswan_gcrypt_la_LIBADD = $(LIBGCRYPT_LIBS) +libstrongswan_gcrypt_la_LIBADD = -lgcrypt |