From fb5c0c1d85c802367871a1a306d4f8b4d01859b4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Apr 2006 09:28:44 +0000
Subject: [PATCH] r15232: Look for CC flags, not C++ flags..

---
 source/build/m4/ax_cflags_gcc_option.m4 | 77 +------------------------
 source/build/m4/check_cc.m4             |  2 +-
 2 files changed, 2 insertions(+), 77 deletions(-)

diff --git a/source/build/m4/ax_cflags_gcc_option.m4 b/source/build/m4/ax_cflags_gcc_option.m4
index fedaa67cba8..ec01a000aae 100644
--- a/source/build/m4/ax_cflags_gcc_option.m4
+++ b/source/build/m4/ax_cflags_gcc_option.m4
@@ -6,10 +6,6 @@ dnl the optionflag to CFLAGS if it is understood. You can override
 dnl the shellvar-default of CFLAGS of course. The order of arguments
 dnl stems from the explicit macros like AX_CFLAGS_WARN_ALL.
 dnl
-dnl The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add
-dnl to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
-dnl (since it is possible to use different compilers for C and C++).
-dnl
 dnl The macro is a lot simpler than any special AX_CFLAGS_* macro (or
 dnl ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
 dnl However, if you use this macro in a few places, it would be great
@@ -17,7 +13,7 @@ dnl if you would make up a new function-macro and submit it to the
 dnl ac-archive.
 dnl
 dnl   - $1 option-to-check-for : required ("-option" as non-value)
-dnl   - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
+dnl   - $2 shell-variable-to-add-to : CFLAGS
 dnl   - $3 action-if-found : add value to shellvariable
 dnl   - $4 action-if-not-found : nothing
 dnl
@@ -74,40 +70,6 @@ AS_VAR_POPDEF([FLAGS])dnl
 ])
 
 
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
-                      m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
 dnl -------------------------------------------------------------------------
 
 AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
@@ -143,42 +105,5 @@ AS_VAR_POPDEF([FLAGS])dnl
 ])
 
 
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS="$[]FLAGS"
-for ac_arg dnl
-in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
-   #
-do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS="$ac_save_[]FLAGS"
- AC_LANG_RESTORE
-])
-case ".$VAR" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
 AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
 [AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])])
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CXXFLAGS_GCC_OPTION_NEW($@)],[AX_CXXFLAGS_GCC_OPTION_OLD($@)])])
diff --git a/source/build/m4/check_cc.m4 b/source/build/m4/check_cc.m4
index a56627eecca..8c099512fce 100644
--- a/source/build/m4/check_cc.m4
+++ b/source/build/m4/check_cc.m4
@@ -226,7 +226,7 @@ if test x$GNU_MAKE = x"yes"; then
 fi
 AC_MSG_RESULT($new_make)
 automatic_dependencies=no
-AX_CXXFLAGS_GCC_OPTION(-MT, [], [ automatic_dependencies=$new_make ], [])
+AX_CFLAGS_GCC_OPTION(-MT, [], [ automatic_dependencies=$new_make ], [])
 AC_MSG_CHECKING([Whether to use automatic dependencies])
 AC_MSG_RESULT($automatic_dependencies)
 AC_SUBST(automatic_dependencies)