We don't need to export CFLAGS

FreeRADIUS · May 31, 2013 · 98e36f9 · 98e36f9
1 parent 516a781
commit 98e36f9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -108,7 +108,7 @@ endif
 endif
 
 distclean: clean
-	@-find src/modules -regex .\*/config[.][^.]*\$ -delete
+	@-find src/modules -regex .\*/config[.][^.]*\$$ -delete
 	@rm -f config.cache config.log config.status libtool \
 		src/include/radpaths.h src/include/stamp-h \
 		libltdl/config.log libltdl/config.status \

diff --git a/configure b/configure
@@ -4257,23 +4257,22 @@ if ${ax_cv_qunused_arguments_flag+:} false; then :
 else
 
 
-  CFLAGS_SAVED=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Qunused-arguments -foobar"
-  export CFLAGS
+    CFLAGS_SAVED=$CFLAGS
+    CFLAGS="$CFLAGS -Werror -Qunused-arguments -foobar"
 
-  ac_ext=c
+    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
-1;
+return 0;
   ;
   return 0;
 }
@@ -4290,6 +4289,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
     CFLAGS="$CFLAGS_SAVED"
 
 fi
@@ -7570,23 +7570,23 @@ if ${ax_cv_wdocumentation_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-  CFLAGS_SAVED=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wdocumentation"
-  export CFLAGS
 
-  ac_ext=c
+    CFLAGS_SAVED=$CFLAGS
+    CFLAGS="$CFLAGS -Werror -Wdocumentation"
+
+    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
-1;
+return 0;
   ;
   return 0;
 }

diff --git a/m4/ax_cc.m4 b/m4/ax_cc.m4
@@ -17,34 +17,34 @@ AC_DEFUN([AX_CC_IS_CLANG],[
 
 AC_DEFUN([AX_QUNUSED_ARGUMENTS_FLAG],[
   AC_CACHE_CHECK([for the compiler flag "-Qunused-arguments"], [ax_cv_qunused_arguments_flag],[
-  
-  CFLAGS_SAVED=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Qunused-arguments -foobar"
-  export CFLAGS
-
-  AC_LANG_PUSH(C)
-  AC_TRY_COMPILE(
-    [],
-    [1;],
-    [ax_cv_qunused_arguments_flag="yes"],
-    [ax_cv_qunused_arguments_flag="no"])
+
+    CFLAGS_SAVED=$CFLAGS
+    CFLAGS="$CFLAGS -Werror -Qunused-arguments -foobar"
+    
+    AC_LANG_PUSH(C)
+    AC_TRY_COMPILE(
+      [],
+      [return 0;],
+      [ax_cv_qunused_arguments_flag="yes"],
+      [ax_cv_qunused_arguments_flag="no"])
     AC_LANG_POP
+
     CFLAGS="$CFLAGS_SAVED"
   ])
 ])
 
 AC_DEFUN([AX_WDOCUMENTATION_FLAG],[
   AC_CACHE_CHECK([for the compiler flag "-Wdocumentation"], [ax_cv_wdocumentation_flag],[
-  CFLAGS_SAVED=$CFLAGS
-  CFLAGS="$CFLAGS -Werror -Wdocumentation"
-  export CFLAGS
-
-  AC_LANG_PUSH(C)
-  AC_TRY_COMPILE(
-    [],
-    [1;],
-    [ax_cv_wdocumentation_flag="yes"],
-    [ax_cv_wdocumentation_flag="no"])
+
+    CFLAGS_SAVED=$CFLAGS
+    CFLAGS="$CFLAGS -Werror -Wdocumentation"
+
+    AC_LANG_PUSH(C)
+    AC_TRY_COMPILE(
+      [],
+      [return 0;],
+      [ax_cv_wdocumentation_flag="yes"],
+      [ax_cv_wdocumentation_flag="no"])
     AC_LANG_POP
 
     CFLAGS="$CFLAGS_SAVED"