Commit 338f427a authored by Jay Satiro's avatar Jay Satiro
Browse files

configure: stop prepending to LDFLAGS, CPPFLAGS 

- Change prepends to appends because user's LDFLAGS and CPPFLAGS should
  always come first so they're searched before ours.

Bug: https://github.com/curl/curl/issues/1420
Reported-by: Helmut K. C. Tessarek
parent 93567071

configure.ac

+9 −9
Original line number Diff line number Diff line
@@ -898,8 +898,8 @@ else 


    if test "$PKGCONFIG" != "no" ; then

      LIBS="`$PKGCONFIG --libs-only-l zlib` $LIBS"

      LDFLAGS="`$PKGCONFIG --libs-only-L zlib` $LDFLAGS"

      CPPFLAGS="`$PKGCONFIG --cflags-only-I zlib` $CPPFLAGS"

      LDFLAGS="$LDFLAGS `$PKGCONFIG --libs-only-L zlib`"

      CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags-only-I zlib`"

      OPT_ZLIB=""

      HAVE_LIBZ="1"

    fi
@@ -2493,8 +2493,8 @@ if test X"$OPT_LIBMETALINK" != Xno; then 
    clean_CPPFLAGS="$CPPFLAGS"

    clean_LDFLAGS="$LDFLAGS"

    clean_LIBS="$LIBS"

    CPPFLAGS="$addcflags $clean_CPPFLAGS"

    LDFLAGS="$addld $clean_LDFLAGS"

    CPPFLAGS="$clean_CPPFLAGS $addcflags"

    LDFLAGS="$clean_LDFLAGS $addld"

    LIBS="$addlib $clean_LIBS"

    AC_MSG_CHECKING([if libmetalink is recent enough])

    AC_LINK_IFELSE([
@@ -2578,7 +2578,7 @@ if test X"$OPT_LIBSSH2" != Xno; then 
    DIR_SSH2=${PREFIX_SSH2}/lib$libsuff

  fi



  LDFLAGS="$LD_SSH2 $LDFLAGS"

  LDFLAGS="$LDFLAGS $LD_SSH2"

  CPPFLAGS="$CPPFLAGS $CPP_SSH2"

  LIBS="$LIB_SSH2 $LIBS"
@@ -2793,8 +2793,8 @@ if test "$want_winidn" = "yes"; then 
    WINIDN_DIR="$want_winidn_path/lib$libsuff"

  fi

  #

  CPPFLAGS="$WINIDN_CPPFLAGS $CPPFLAGS"

  LDFLAGS="$WINIDN_LDFLAGS $LDFLAGS"

  CPPFLAGS="$CPPFLAGS $WINIDN_CPPFLAGS"

  LDFLAGS="$LDFLAGS $WINIDN_LDFLAGS"

  LIBS="$WINIDN_LIBS $LIBS"

  #

  AC_MSG_CHECKING([if IdnToUnicode can be linked])
@@ -2909,8 +2909,8 @@ if test "$want_idn" = "yes"; then 
    AC_MSG_NOTICE([IDN_DIR: "$IDN_DIR"])

  fi

  #

  CPPFLAGS="$IDN_CPPFLAGS $CPPFLAGS"

  LDFLAGS="$IDN_LDFLAGS $LDFLAGS"

  CPPFLAGS="$CPPFLAGS $IDN_CPPFLAGS"

  LDFLAGS="$LDFLAGS $IDN_LDFLAGS"

  LIBS="$IDN_LIBS $LIBS"

  #

  AC_MSG_CHECKING([if idn2_lookup_ul can be linked])

m4/curl-confopts.m4

+2 −2
Original line number Diff line number Diff line
@@ -516,8 +516,8 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [ 
      fi

    fi

    #

    CPPFLAGS="$ares_CPPFLAGS $clean_CPPFLAGS"

    LDFLAGS="$ares_LDFLAGS $clean_LDFLAGS"

    CPPFLAGS="$clean_CPPFLAGS $ares_CPPFLAGS"

    LDFLAGS="$clean_LDFLAGS $ares_LDFLAGS"

    LIBS="$ares_LIBS $clean_LIBS"

    #

    if test "$embedded_ares" != "yes"; then