Mercurial > hg > xemacs-beta

changeset 5832:af34373e378f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged SSS libs change from xemacs-beta.
author Jeff Sparkes <jsparkes@gmail.com>
date Thu, 27 Nov 2014 14:37:46 -0500
parents 5f02d29a2a65 (current diff) ad3e9b3274d5 (diff)
children b8316d3409cd
files
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 23 19:26:14 2014 +0100
+++ b/ChangeLog	Thu Nov 27 14:37:46 2014 -0500
@@ -1,3 +1,8 @@
+2014-11-09  Jeff Sparkes  <jsparkes@gmail.com>
+
+	* configure.ac (HAVE_GNUTLS): Add SSL/TLS libraries to $LIBS, not
+	$LDFLAGS.
+
 2014-10-10  Marcus Crestani  <crestani@xemacs.org>
         
 	* configure.ac: Disable ASLR on Yosemite.
--- a/configure.ac	Sun Nov 23 19:26:14 2014 +0100
+++ b/configure.ac	Thu Nov 27 14:37:46 2014 -0500
@@ -5371,7 +5371,7 @@
     fi
     gnutls_libs=`pkg-config --libs gnutls`
     if test "$?" = 0; then
-      XE_PREPEND("$gnutls_libs", LDFLAGS)
+      XE_APPEND("$gnutls_libs", LIBS)
     fi
     AC_CHECK_FUNC(gnutls_certificate_verification_status_print,
 	[AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_VERIFICATION_STATUS_PRINT)])
@@ -5385,7 +5385,7 @@
     fi
     nss_libs=`pkg-config --libs nss`
     if test "$?" = 0; then
-      XE_PREPEND("$nss_libs", LDFLAGS)
+      XE_APPEND("$nss_libs", LIBS)
     fi
   else
     AC_DEFINE(HAVE_OPENSSL)
@@ -5395,7 +5395,7 @@
     fi
     openssl_libs=`pkg-config --libs openssl`
     if test "$?" = 0; then
-      XE_PREPEND("$openssl_libs", LDFLAGS)
+      XE_APPEND("$openssl_libs", LIBS)
     fi
     AC_CHECK_FUNC(X509_check_host, [AC_DEFINE(HAVE_X509_CHECK_HOST)])
   fi