moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

configure: stop prepending to LDFLAGS, CPPFLAGS

Browse Source 
- 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
This commit is contained in:
Jay Satiro 2017-04-24 03:13:28 -04:00
parent 93567071b7
commit 338f427a24
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -898,8 +898,8 @@ else
if test "$PKGCONFIG" != "no" ; then if test "$PKGCONFIG" != "no" ; then
LIBS="`$PKGCONFIG --libs-only-l zlib` $LIBS" LIBS="`$PKGCONFIG --libs-only-l zlib` $LIBS"
LDFLAGS="`$PKGCONFIG --libs-only-L zlib` $LDFLAGS" LDFLAGS="$LDFLAGS `$PKGCONFIG --libs-only-L zlib`"
CPPFLAGS="`$PKGCONFIG --cflags-only-I zlib` $CPPFLAGS" CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags-only-I zlib`"
OPT_ZLIB="" OPT_ZLIB=""
HAVE_LIBZ="1" HAVE_LIBZ="1"
fi fi
@ -2493,8 +2493,8 @@ if test X"$OPT_LIBMETALINK" != Xno; then
clean_CPPFLAGS="$CPPFLAGS" clean_CPPFLAGS="$CPPFLAGS"
clean_LDFLAGS="$LDFLAGS" clean_LDFLAGS="$LDFLAGS"
clean_LIBS="$LIBS" clean_LIBS="$LIBS"
CPPFLAGS="$addcflags $clean_CPPFLAGS" CPPFLAGS="$clean_CPPFLAGS $addcflags"
LDFLAGS="$addld $clean_LDFLAGS" LDFLAGS="$clean_LDFLAGS $addld"
LIBS="$addlib $clean_LIBS" LIBS="$addlib $clean_LIBS"
AC_MSG_CHECKING([if libmetalink is recent enough]) AC_MSG_CHECKING([if libmetalink is recent enough])
AC_LINK_IFELSE([ AC_LINK_IFELSE([
@ -2578,7 +2578,7 @@ if test X"$OPT_LIBSSH2" != Xno; then
DIR_SSH2=${PREFIX_SSH2}/lib$libsuff DIR_SSH2=${PREFIX_SSH2}/lib$libsuff
fi fi
LDFLAGS="$LD_SSH2 $LDFLAGS" LDFLAGS="$LDFLAGS $LD_SSH2"
CPPFLAGS="$CPPFLAGS $CPP_SSH2" CPPFLAGS="$CPPFLAGS $CPP_SSH2"
LIBS="$LIB_SSH2 $LIBS" LIBS="$LIB_SSH2 $LIBS"
@ -2793,8 +2793,8 @@ if test "$want_winidn" = "yes"; then
WINIDN_DIR="$want_winidn_path/lib$libsuff" WINIDN_DIR="$want_winidn_path/lib$libsuff"
fi fi
# #
CPPFLAGS="$WINIDN_CPPFLAGS $CPPFLAGS" CPPFLAGS="$CPPFLAGS $WINIDN_CPPFLAGS"
LDFLAGS="$WINIDN_LDFLAGS $LDFLAGS" LDFLAGS="$LDFLAGS $WINIDN_LDFLAGS"
LIBS="$WINIDN_LIBS $LIBS" LIBS="$WINIDN_LIBS $LIBS"
# #
AC_MSG_CHECKING([if IdnToUnicode can be linked]) 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"]) AC_MSG_NOTICE([IDN_DIR: "$IDN_DIR"])
fi fi
# #
CPPFLAGS="$IDN_CPPFLAGS $CPPFLAGS" CPPFLAGS="$CPPFLAGS $IDN_CPPFLAGS"
LDFLAGS="$IDN_LDFLAGS $LDFLAGS" LDFLAGS="$LDFLAGS $IDN_LDFLAGS"
LIBS="$IDN_LIBS $LIBS" LIBS="$IDN_LIBS $LIBS"
# #
AC_MSG_CHECKING([if idn2_lookup_ul can be linked]) AC_MSG_CHECKING([if idn2_lookup_ul can be linked])

4
m4/curl-confopts.m4
View File

@ -516,8 +516,8 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
fi fi
fi fi
# #
CPPFLAGS="$ares_CPPFLAGS $clean_CPPFLAGS" CPPFLAGS="$clean_CPPFLAGS $ares_CPPFLAGS"
LDFLAGS="$ares_LDFLAGS $clean_LDFLAGS" LDFLAGS="$clean_LDFLAGS $ares_LDFLAGS"
LIBS="$ares_LIBS $clean_LIBS" LIBS="$ares_LIBS $clean_LIBS"
# #
if test "$embedded_ares" != "yes"; then if test "$embedded_ares" != "yes"; then