- Marc de Bruin pointed out that configure --with-gnutls=PATH didn't work

  properly and provided a fix. http://curl.haxx.se/bug/view.cgi?id=2843008

diff --git a/CHANGES b/CHANGES
index 0a901c31e8ef4d5255d91fcfb7416225bf8bf066..1bd2c223beff1a8acb8a9ab3741d3f9b4876608b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel Stenberg (24 Aug 2009)
+- Marc de Bruin pointed out that configure --with-gnutls=PATH didn't work
+  properly and provided a fix. http://curl.haxx.se/bug/view.cgi?id=2843008
+
 - Eric Wong introduced support for the new option -T. (dot) that makes curl
   read stdin in a non-blocking fashion. This also brings back -T- (minus) to
   the previous blocking behavior since it could break stuff for people at

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5ba3746dfccb158def1570ef309229d8a85a57f0..fbdd93ff4d8913779fef519c3779ce952d012b2f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -20,6 +20,7 @@ This release includes the following bugfixes:
  o use after free if we're completed but easy_conn not NULL (pipelined)
  o missing strdup() return code check
  o CURLOPT_PROXY_TRANSFER_MODE could pass along wrong syntax
+ o configure --with-gnutls=PATH fixed
 
 This release includes the following known bugs:
 

diff --git a/configure.ac b/configure.ac
index 2c9f1d8e018795bac9f9e2cac04f2ec35eee8838..e5e58c657e2d25935390112d892a557d62dea97d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1571,12 +1571,13 @@ if test "$OPENSSL_ENABLED" != "1"; then
     else
       dnl this is with a given path, first check if there's a libgnutls-config
       dnl there and if not, make an educated guess
-      check=`$OPT_GNUTLS/libgnutls-config --version 2>/dev/null`
+      cfg=$OPT_GNUTLS/bin/libgnutls-config
+      check=`$cfg --version 2>/dev/null`
       if test -n "$check"; then
-        addlib=`$OPT_GNUTLS/libgnutls-config --libs`
-        addcflags=`$OPT_GNUTLS/libgnutls-config --cflags`
-        version=`$OPT_GNUTLS/libgnutls-config --version`
-        gtlslib=`$OPT_GNUTLS/libgnutls-config --prefix`/lib$libsuff
+        addlib=`$cfg --libs`
+        addcflags=`$cfg --cflags`
+        version=`$cfg --version`
+        gtlslib=`$cfg --prefix`/lib$libsuff
       else
         dnl without pkg-config and libgnutls-config, we guess a lot!
         addlib=-lgnutls