aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-03-01 00:05:16 +0000
committerDavid Shaw <[email protected]>2005-03-01 00:05:16 +0000
commitdb82cdd26a819062b2b4183ff542d75d2fbb4a4e (patch)
tree24151cc0accc5d33fdffdb7207ddcd719ddb42e8
parent* keyedit.c (keyedit_menu): Only print the key signing hint when signing (diff)
downloadgnupg-db82cdd26a819062b2b4183ff542d75d2fbb4a4e.tar.gz
gnupg-db82cdd26a819062b2b4183ff542d75d2fbb4a4e.zip
* libcurl.m4: Use $LIBS instead of $LDFLAGS. This should help build
problems on Mingw32.
Diffstat (limited to '')
-rw-r--r--m4/ChangeLog5
-rw-r--r--m4/libcurl.m48
2 files changed, 9 insertions, 4 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index f99f6436a..28f1c3105 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-28 David Shaw <[email protected]>
+
+ * libcurl.m4: Use $LIBS instead of $LDFLAGS. This should help
+ build problems on Mingw32.
+
2005-02-03 David Shaw <[email protected]>
* libcurl.m4: More comments.
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index c09084378..edf12a8c5 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -132,8 +132,8 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
[
_libcurl_save_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
- _libcurl_save_ldflags=$LDFLAGS
- LDFLAGS="$LDFLAGS $LIBCURL"
+ _libcurl_save_libs=$LIBS
+ LIBS="$LIBS $LIBCURL"
AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
/* Try and use a few common options to force a failure if we are
@@ -149,9 +149,9 @@ x=CURLOPT_VERBOSE;
]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
CPPFLAGS=$_libcurl_save_cppflags
- LDFLAGS=$_libcurl_save_ldflags
+ LIBS=$_libcurl_save_libs
unset _libcurl_save_cppflags
- unset _libcurl_save_ldflags
+ unset _libcurl_save_libs
])
if test $libcurl_cv_lib_curl_usable = yes ; then