diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-09-16 21:20:04 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-09-16 21:22:31 +0200 |
| commit | c0e1ab2ee4acb94c9a16070dae3850609501eee9 (patch) | |
| tree | b14aedbc3527e2466168c32f1a89e7a04e0f5965 | |
| parent | ce735c9f1a84a49092b3d3047eb90a200851f7fc (diff) | |
| download | gnutls-c0e1ab2ee4acb94c9a16070dae3850609501eee9.tar.gz | |
Use the pkg-config macro to find libtasn1.
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | m4/hooks.m4 | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 3b336510dc..51474bae99 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -37,6 +37,7 @@ AM_CPPFLAGS = \ -I$(srcdir)/includes \ -I$(builddir)/includes \ -I$(srcdir)/x509 \ + $(LIBTASN1_CFLAGS) \ $(P11_KIT_CFLAGS) if ENABLE_OPENPGP @@ -134,7 +135,7 @@ endif if ENABLE_MINITASN1 libgnutls_la_LIBADD += minitasn1/libminitasn1.la else -libgnutls_la_LDFLAGS += $(LTLIBTASN1) +libgnutls_la_LDFLAGS += $(LIBTASN1_LIBS) endif if ENABLE_NETTLE diff --git a/m4/hooks.m4 b/m4/hooks.m4 index 8485dcbe0d..ba4163b881 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -99,10 +99,8 @@ fi included_libtasn1=$withval, included_libtasn1=no) if test "$included_libtasn1" = "no"; then - AC_LIB_HAVE_LINKFLAGS(tasn1,, [#include <libtasn1.h>], - [asn1_check_version (NULL)]) - if test "$ac_cv_libtasn1" != yes; then - included_libtasn1=yes + PKG_CHECK_MODULES(LIBTASN1, [libtasn1 >= 2.14], [], [included_libtasn1=yes]) + if test "$included_libtasn1" = yes; then AC_MSG_WARN([[ *** *** Libtasn1 was not found. Will use the included one. |