[svn] GnuPG - r4132 - trunk/m4

[svn author dshaw]

Author: dshaw
Date: 2006-05-10 04:09:27 +0200 (Wed, 10 May 2006)
New Revision: 4132

Modified:
   trunk/m4/ChangeLog
   trunk/m4/libcurl.m4
Log:
* libcurl.m4: Fix mistaken AC_SUBST when curl is not found.


Modified: trunk/m4/ChangeLog
===================================================================
--- trunk/m4/ChangeLog	2006-05-02 08:19:59 UTC (rev 4131)
+++ trunk/m4/ChangeLog	2006-05-10 02:09:27 UTC (rev 4132)
@@ -1,3 +1,7 @@
+2006-05-09  David Shaw  <dshaw at jabberwocky.com>
+
+	* libcurl.m4: Fix mistaken AC_SUBST when curl is not found.
+
 2006-01-17  David Shaw  <dshaw at jabberwocky.com>
 
 	* libcurl.m4: Add IDN, SSPI, NTLM, and TFTP defines.

Modified: trunk/m4/libcurl.m4
===================================================================
--- trunk/m4/libcurl.m4	2006-05-02 08:19:59 UTC (rev 4131)
+++ trunk/m4/libcurl.m4	2006-05-10 02:09:27 UTC (rev 4132)
@@ -1,7 +1,7 @@
 # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
 #                       [ACTION-IF-YES], [ACTION-IF-NO])
 # ----------------------------------------------------------
-#      David Shaw <dshaw at jabberwocky.com>   Jan-17-2006
+#      David Shaw <dshaw at jabberwocky.com>   May-09-2006
 #
 # Checks for libcurl.  DEFAULT-ACTION is the string yes or no to
 # specify whether to default to --with-libcurl or --without-libcurl.
@@ -210,6 +210,9 @@
 	      AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
 	      eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
            done
+	else
+	   unset LIBCURL
+	   unset LIBCURL_CPPFLAGS
         fi
      fi