Commit d738adc1 authored by Yang Tse's avatar Yang Tse
Browse files

configure: LIBMETALINK_CFLAGS actually is LIBMETALINK_CPPFLAGS

parent c6910375

configure.ac

+3 −3
Original line number Diff line number Diff line
@@ -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

src/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -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