diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-02-05 10:40:18 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-02-05 23:14:58 +0100 |
| commit | fae10ff832cf82488cd23e1d1899b9bd0e64685e (patch) | |
| tree | 029ffa2309bb574f5462d10445ee285204b5f773 | |
| parent | 398ab40e4381be13774f36dbd747670388514b5e (diff) | |
| download | gnutls-fae10ff832cf82488cd23e1d1899b9bd0e64685e.tar.gz | |
Add the nettle libs into gnutls.pc.
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/gnutls.pc.in | 2 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index d177253363..74aa1a3458 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -144,7 +144,7 @@ endif libgnutls_la_LDFLAGS += $(LTLIBPAKCHOIS) if ENABLE_NETTLE -libgnutls_la_LDFLAGS += $(LTLIBNETTLE) -lgmp -lpthread -lhogweed +libgnutls_la_LDFLAGS += $(NETTLE_LIBS) libgnutls_la_LIBADD += nettle/libcrypto.la else libgnutls_la_LDFLAGS += $(LTLIBGCRYPT) diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index 3e71f9e84e..6ad27912df 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -20,6 +20,6 @@ Description: Transport Security Layer implementation for the GNU system URL: http://www.gnu.org/software/gnutls/ Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LTLIBPAKCHOIS@ @LTLIBGCRYPT@ +Libs.private: @LTLIBPAKCHOIS@ @LTLIBGCRYPT@ @NETTLE_LIBS@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index 42e45574b0..f1c3cb393b 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -70,9 +70,11 @@ if test "$cryptolib" = "nettle";then *** Libnettle 2.1 was not found. ]]) fi + NETTLE_LIBS="-lgmp -lpthread -lhogweed" else AC_MSG_RESULT(no) fi + AC_SUBST(NETTLE_LIBS) AM_CONDITIONAL(ENABLE_NETTLE, test "$cryptolib" = "nettle") AC_ARG_WITH(included-libtasn1, |