updated for version 7.3.1221

Problem:    When build flags change "make distclean" run into a configure
            error.
Solution:   When CFLAGS changes delete auto/config.cache.  Also avoid adding
            duplicate text to flags.

diff --git a/src/Makefile b/src/Makefile
index 39e0e32cb11eba22ff70c1cb8ed6aba2b57ffd99..39bcbd2687cda025e99d85f5fb9147629c1dca9b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1655,6 +1655,11 @@ tools: $(TOOLS)
 # sure configure is run when it's needed.
 #
 config auto/config.mk: auto/configure config.mk.in config.h.in
+       if test -f auto/config.cache && \
+           grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
+           ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
+               rm auto/config.cache; \
+       fi
        GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
                CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
                LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \

diff --git a/src/auto/configure b/src/auto/configure
index d1bde84724d5f311617ca72df388ce40e848b12c..e93173fe1e006368376eb9ed9a32b03184b16a63 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5133,6 +5133,7 @@ $as_echo_n "checking if compile and link flags for Perl are sane... " >&6; }
       ldflags_save=$LDFLAGS
       CFLAGS="$CFLAGS $perlcppflags"
       LIBS="$LIBS $perllibs"
+      perlldflags=`echo "$perlldflags" | sed -e 's/^ *//g'`
       LDFLAGS="$perlldflags $LDFLAGS"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5162,7 +5163,9 @@ rm -f core conftest.err conftest.$ac_objext \
                  PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[^ ]*//'`
        fi
        if test "X$perlldflags" != "X"; then
-         LDFLAGS="$perlldflags $LDFLAGS"
+         if test "X`echo \"$LDFLAGS\" | grep -F -e \"$perlldflags\"`" = "X"; then
+           LDFLAGS="$perlldflags $LDFLAGS"
+         fi
        fi
        PERL_LIBS=$perllibs
        PERL_SRC="auto/if_perl.c if_perlsfio.c"
@@ -6454,7 +6457,9 @@ $as_echo "$rubyhdrdir" >&6; }
        if test "X$rubyldflags" != "X"; then
                                  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
          if test "X$rubyldflags" != "X"; then
-           LDFLAGS="$rubyldflags $LDFLAGS"
+           if test "X`echo \"$LDFLAGS\" | grep -F -e \"$rubyldflags\"`" = "X"; then
+             LDFLAGS="$rubyldflags $LDFLAGS"
+           fi
          fi
        fi
        RUBY_SRC="if_ruby.c"
@@ -12690,7 +12695,7 @@ $as_echo "no" >&6; }
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5
 $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
   if test "$gccmajor" -gt "3"; then
-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
+    CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   else
@@ -12705,7 +12710,7 @@ $as_echo_n "checking linker --as-needed support... " >&6; }
 LINK_AS_NEEDED=
 # Check if linker supports --as-needed and --no-as-needed options
 if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
-  LDFLAGS="$LDFLAGS -Wl,--as-needed"
+  LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
   LINK_AS_NEEDED=yes
 fi
 if test "$LINK_AS_NEEDED" = yes; then

diff --git a/src/configure.in b/src/configure.in
index d67593001ca87d074bb337a1c27abe76abd959c1..f1720ced56322b12cd0f4785b331eb4274b326a5 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -776,6 +776,7 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
       ldflags_save=$LDFLAGS
       CFLAGS="$CFLAGS $perlcppflags"
       LIBS="$LIBS $perllibs"
+      perlldflags=`echo "$perlldflags" | sed -e 's/^ *//g'`
       LDFLAGS="$perlldflags $LDFLAGS"
       AC_TRY_LINK(,[ ],
             AC_MSG_RESULT(yes); perl_ok=yes,
@@ -789,7 +790,9 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
          PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[[^ ]]*//'`
        fi
        if test "X$perlldflags" != "X"; then
-         LDFLAGS="$perlldflags $LDFLAGS"
+         if test "X`echo \"$LDFLAGS\" | grep -F -e \"$perlldflags\"`" = "X"; then
+           LDFLAGS="$perlldflags $LDFLAGS"
+         fi
        fi
        PERL_LIBS=$perllibs
        PERL_SRC="auto/if_perl.c if_perlsfio.c"
@@ -1546,7 +1549,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
          dnl configure, so strip these flags first (if present)
          rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
          if test "X$rubyldflags" != "X"; then
-           LDFLAGS="$rubyldflags $LDFLAGS"
+           if test "X`echo \"$LDFLAGS\" | grep -F -e \"$rubyldflags\"`" = "X"; then
+             LDFLAGS="$rubyldflags $LDFLAGS"
+           fi
          fi
        fi
        RUBY_SRC="if_ruby.c"
@@ -3719,7 +3724,7 @@ if test "$GCC" = yes; then
   dnl And undefine it first to avoid a warning.
   AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
   if test "$gccmajor" -gt "3"; then
-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
+    CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
@@ -3734,7 +3739,7 @@ AC_MSG_CHECKING(linker --as-needed support)
 LINK_AS_NEEDED=
 # Check if linker supports --as-needed and --no-as-needed options
 if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
-  LDFLAGS="$LDFLAGS -Wl,--as-needed"
+  LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
   LINK_AS_NEEDED=yes
 fi
 if test "$LINK_AS_NEEDED" = yes; then

diff --git a/src/version.c b/src/version.c
index 3ff82039bfcf488f32d5a25fedcd974a97eb4056..b8545f581474194b1af4f90043851a895733b7be 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1221,
 /**/
     1220,
 /**/