summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2014-06-14 09:48:56 -0700
committerWayne Davison <wayned@samba.org>2014-06-14 09:48:56 -0700
commit6ffd8f2169af2ca7b1f654cf469d21ae201f1143 (patch)
treedbd4143eeacc750ecc3b65dc12040843f5702254
parentba43e88527980718f99b680c3a3e3e2a3a97b6f3 (diff)
downloadrsync-6ffd8f2169af2ca7b1f654cf469d21ae201f1143.tar.gz
rsync-6ffd8f2169af2ca7b1f654cf469d21ae201f1143.tar.bz2
rsync-6ffd8f2169af2ca7b1f654cf469d21ae201f1143.zip
Put zlib and popt -I options early in the CFLAGS.
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 4f41f8d7..588f551a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -765,7 +765,7 @@ AC_MSG_CHECKING([whether to use included libpopt])
if test x"$with_included_popt" = x"yes"; then
AC_MSG_RESULT($srcdir/popt)
BUILD_POPT='$(popt_OBJS)'
- CFLAGS="$CFLAGS -I$srcdir/popt"
+ CFLAGS="-I$srcdir/popt $CFLAGS"
if test x"$ALLOCA" != x
then
# this can be removed when/if we add an included alloca.c;
@@ -790,7 +790,7 @@ AC_MSG_CHECKING([whether to use included zlib])
if test x"$with_included_zlib" = x"yes"; then
AC_MSG_RESULT($srcdir/zlib)
BUILD_ZLIB='$(zlib_OBJS)'
- CFLAGS="$CFLAGS -I$srcdir/zlib"
+ CFLAGS="-I$srcdir/zlib $CFLAGS"
else
AC_DEFINE(EXTERNAL_ZLIB, 1, [Define to 1 if using external zlib])
AC_MSG_RESULT(no)