security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* libcurl.m4: Use LIBCURL_CPPFLAGS and not LIBCURL_INCLUDES to match

Browse Source 
automake syntax.
This commit is contained in:
David Shaw 2005-01-18 03:54:46 +00:00
parent cc19a07082
commit 586be6711e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
m4/ChangeLog
View File

@ -1,3 +1,8 @@
2005-01-17 David Shaw <dshaw@grover.jabberwocky.com>
* libcurl.m4: Use LIBCURL_CPPFLAGS and not LIBCURL_INCLUDES to
match automake syntax.
2005-01-03 David Shaw <dshaw@jabberwocky.com> 2005-01-03 David Shaw <dshaw@jabberwocky.com>
* Makefile.am, libusb.m4: New libusb check macro. * Makefile.am, libusb.m4: New libusb check macro.

10
m4/libcurl.m4
View File

@ -13,7 +13,7 @@
# --without-libcurl does run ACTION-IF-NO. # --without-libcurl does run ACTION-IF-NO.
# #
# This macro defines HAVE_LIBCURL if a working libcurl setup is found, # This macro defines HAVE_LIBCURL if a working libcurl setup is found,
# and sets @LIBCURL@ and @LIBCURL_INCLUDES@ to the necessary values. # and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary values.
# Other useful defines are LIBCURL_FEATURE_xxx where xxx are the # Other useful defines are LIBCURL_FEATURE_xxx where xxx are the
# various features supported by libcurl, and LIBCURL_PROTOCOL_yyy # various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
# where yyy are the various protocols supported by libcurl. Both xxx # where yyy are the various protocols supported by libcurl. Both xxx
@ -82,8 +82,8 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
fi fi
if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
if test x"$LIBCURL_INCLUDES" = "x" ; then if test x"$LIBCURL_CPPFLAGS" = "x" ; then
LIBCURL_INCLUDES=`$_libcurl_config --cflags` LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
fi fi
if test x"$LIBCURL" = "x" ; then if test x"$LIBCURL" = "x" ; then
LIBCURL=`$_libcurl_config --libs` LIBCURL=`$_libcurl_config --libs`
@ -124,7 +124,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
[libcurl_cv_lib_curl_usable], [libcurl_cv_lib_curl_usable],
[ [
_libcurl_save_cppflags=$CPPFLAGS _libcurl_save_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $LIBCURL_INCLUDES" CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
_libcurl_save_ldflags=$LDFLAGS _libcurl_save_ldflags=$LDFLAGS
LDFLAGS="$LDFLAGS $LIBCURL" LDFLAGS="$LDFLAGS $LIBCURL"
@ -150,7 +150,7 @@ x=CURLOPT_VERBOSE;
if test $libcurl_cv_lib_curl_usable = yes ; then if test $libcurl_cv_lib_curl_usable = yes ; then
AC_DEFINE(HAVE_LIBCURL,1, AC_DEFINE(HAVE_LIBCURL,1,
[Define to 1 if you have a functional curl library.]) [Define to 1 if you have a functional curl library.])
AC_SUBST(LIBCURL_INCLUDES) AC_SUBST(LIBCURL_CPPFLAGS)
AC_SUBST(LIBCURL) AC_SUBST(LIBCURL)
for _libcurl_feature in $_libcurl_features ; do for _libcurl_feature in $_libcurl_features ; do