[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  6ffd8f2 Put zlib and popt -I options early in the CFLAGS.
      from  ba43e88 Fix hard-link bugs when receiver isn't capable.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6ffd8f2169af2ca7b1f654cf469d21ae201f1143
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Jun 14 09:48:56 2014 -0700

    Put zlib and popt -I options early in the CFLAGS.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/configure.ac b/configure.ac
index 4f41f8d..588f551 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)


-- 
The rsync repository.