aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2012-12-21 13:00:00 +0100
committerYang Tse <yangsita@gmail.com>2012-12-21 13:00:00 +0100
commitd738adc1fbda9e2e545185f9d1b0551fd2d669e6 (patch)
treef9067c9dc79a8f265f0f77cdab203df23ad88bec
parentc691037517a969891592e9dbae0a6ed615041881 (diff)
configure: LIBMETALINK_CFLAGS actually is LIBMETALINK_CPPFLAGS
-rw-r--r--configure.ac6
-rw-r--r--src/Makefile.am4
2 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 68437ee69..0848481f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1981,7 +1981,7 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then
CLEANLIBS="$LIBS"
CLEANCPPFLAGS="$CPPFLAGS"
- CLEADLDFLAGS="$LDFLAGS"
+ CLEANLDFLAGS="$LDFLAGS"
LIBS="$addlib $LIBS"
LDFLAGS="$LDFLAGS $addld"
@@ -2496,10 +2496,10 @@ if test X"$OPT_LIBMETALINK" != Xno; then
AC_DEFINE(USE_METALINK, 1, [Define to enable metalink support])
LIBMETALINK_LIBS=$addlib
LIBMETALINK_LDFLAGS=$addld
- LIBMETALINK_CFLAGS=$addcflags
+ LIBMETALINK_CPPFLAGS=$addcflags
AC_SUBST([LIBMETALINK_LIBS])
AC_SUBST([LIBMETALINK_LDFLAGS])
- AC_SUBST([LIBMETALINK_CFLAGS])
+ AC_SUBST([LIBMETALINK_CPPFLAGS])
curl_mtlnk_msg="enabled"
fi
diff --git a/src/Makefile.am b/src/Makefile.am
index 6de750114..d6fd36c12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,7 @@ endif
include Makefile.inc
# This might hold -Werror
-CFLAGS += @CURL_CFLAG_EXTRAS@ @LIBMETALINK_CFLAGS@
+CFLAGS += @CURL_CFLAG_EXTRAS@
# Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME)
@@ -64,7 +64,9 @@ curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @ZLIB_LIBS@ @CURL
endif
curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
+curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
+
BUILT_SOURCES = hugehelp.c
CLEANFILES = hugehelp.c
# Use the C locale to ensure that only ASCII characters appear in the