Replace CPPFLAGS by CFLAGS to avoid duplicate use of the flags in the lines executed...

diff --git a/configure b/configure
index 86358cf3466d05367468b42e6bb42f736117159f..35ae8f11390a1580f4c01e83336113117adab9d1 100755 (executable)
--- a/configure
+++ b/configure
@@ -2761,11 +2761,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 esac
 
 if test "${CC}" = "cc" ; then
-   CFLAGS="${CFLAGS} -Wall -g -O2 -Aa -Werror=implicit"
+   CFLAGS="${CFLAGS} -Wall -g -O2 -Aa -Werror=implicit-function-declaration"
 else
    CFLAGS="${CFLAGS} -Wall -Werror=implicit-function-declaration"
 fi
-CPPFLAGS="${CFLAGS}"
 
 case "$host" in
    *-solaris*)
@@ -5446,8 +5445,8 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       saved_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+       saved_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5491,7 +5490,7 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
- CPPFLAGS=$saved_CPPFLAGS
+ CFLAGS=$saved_CFLAGS
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

diff --git a/configure.in b/configure.in
index 74e658fdcfc5d748c956ade984ec67322e3196af..108ebff58bd0a188121b330630ebb64ffa61b3d1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,11 +20,10 @@ dnl  *   ) AC_PROG_CXX ;;
 esac
 
 if test "${CC}" = "cc" ; then
-   CFLAGS="${CFLAGS} -Wall -g -O2 -Aa -Werror=implicit"
+   CFLAGS="${CFLAGS} -Wall -g -O2 -Aa -Werror=implicit-function-declaration"
 else
    CFLAGS="${CFLAGS} -Wall -Werror=implicit-function-declaration"
 fi
-CPPFLAGS="${CFLAGS}"
 
 case "$host" in
    *-solaris*)
@@ -63,12 +62,12 @@ AC_SYS_LARGEFILE
 # needs to be defined for it
 AC_MSG_CHECKING([for fopen64])
 AC_CACHE_VAL(bu_cv_have_fopen64,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[FILE *f = fopen64 ("/tmp/foo","r");]])],[bu_cv_have_fopen64=yes],[saved_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[FILE *f = fopen64 ("/tmp/foo","r");]])],[bu_cv_have_fopen64=yes],[saved_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
  AC_TRY_LINK([#include <stdio.h>], [FILE *f = fopen64 ("/tmp/foo","r");],
 bu_cv_have_fopen64="need -D_LARGEFILE64_SOURCE",
 bu_cv_have_fopen64=no)
- CPPFLAGS=$saved_CPPFLAGS])])
+ CFLAGS=$saved_CFLAGS])])
 AC_MSG_RESULT($bu_cv_have_fopen64)
 if test "$bu_cv_have_fopen64" != no; then
   AC_DEFINE([HAVE_FOPEN64], 1,