diff options
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/gcrypt/Makefile.am | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.in b/configure.in index d7af864b0..63f7baaf9 100644 --- a/configure.in +++ b/configure.in @@ -1017,8 +1017,7 @@ if test x$openssl = xtrue; then fi if test x$gcrypt = xtrue; then - AC_HAVE_LIBRARY([gcrypt],[LIBS="$LIBS"],[AC_MSG_ERROR([libgcrypt library not found])]) - AC_CHECK_HEADER([gcrypt.h],,[AC_MSG_ERROR([libgcrypt header gcrypt.h not found!])]) + AM_PATH_LIBGCRYPT(,,[AC_MSG_ERROR([libgcrypt not found!])]) fi if test x$uci = xtrue; then diff --git a/src/libstrongswan/plugins/gcrypt/Makefile.am b/src/libstrongswan/plugins/gcrypt/Makefile.am index 2872fee08..35007e3ee 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 +AM_CFLAGS = -rdynamic $(LIBGCRYPT_CFLAGS) plugin_LTLIBRARIES = libstrongswan-gcrypt.la @@ -12,5 +12,4 @@ libstrongswan_gcrypt_la_SOURCES = gcrypt_plugin.h gcrypt_plugin.c \ gcrypt_hasher.h gcrypt_hasher.c libstrongswan_gcrypt_la_LDFLAGS = -module -libstrongswan_gcrypt_la_LIBADD = -lgcrypt - +libstrongswan_gcrypt_la_LIBADD = $(LIBGCRYPT_LIBS) |