Directly link to gmp library. Based on original patch by Alon Bar-Lev <alon.barlev...

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f1e672c47dee03852a50e4bb5a6b8f8139fb257a..3beb7c7207928ac1cd5d951d3979c1ad7cf8efe4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -140,7 +140,7 @@ thirdparty_libadd += $(LIBTASN1_LIBS)
 endif
 
 if ENABLE_NETTLE
-thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS)
+thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
 libgnutls_la_LIBADD += nettle/libcrypto.la
 endif
 

diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 13f2d3ba1e0acd51897ef4823807e485c9346853..a25fcdf637198ebd95dece39d649f00b6c61b2c6 100644 (file)
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
 URL: http://www.gnutls.org/
 Version: @VERSION@
 Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@
+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
 @GNUTLS_REQUIRES_PRIVATE@
 Cflags: -I${includedir}

diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index e2b704e9ce7b10660060fc7b602f95d8014a1894..0987c8e186c491f2417239711c98953689c30e1a 100644 (file)
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -25,7 +25,10 @@ AM_CPPFLAGS = \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../includes       \
        -I$(builddir)/../../gl          \
-       -I$(srcdir)/..
+       -I$(srcdir)/..                  \
+       $(NETTLE_CFLAGS)                \
+       $(HOGWEED_CFLAGS)               \
+       $(GMP_CFLAGS)
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(srcdir)/../minitasn1

diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 3439edb2a8e1efb455d9a7e5b9cedb54ad8c3be6..cd9ef5ce974d2ecc7a987f234645069dc1ea8bc8 100644 (file)
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -82,6 +82,17 @@ AC_MSG_ERROR([[
 
   GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
 
+  AC_ARG_VAR(GMP_CFLAGS, [C compiler flags for gmp])
+  AC_ARG_VAR(GMP_LIBS, [linker flags for gmp])
+  if test x$GMP_LIBS = x; then
+       AC_CHECK_LIB(gmp, __gmpz_cmp, [GMP_LIBS="-lgmp"], [AC_MSG_ERROR([[
+***
+*** gmp was not found.
+]])])
+  fi
+  AC_SUBST(GMP_CFLAGS)
+  AC_SUBST(GMP_LIBS)
+
   AC_ARG_WITH(included-libtasn1,
     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
       included_libtasn1=$withval,