From a447162f7db96bb772cc0e7638b08886f7c1bc1d Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Tue, 1 Dec 2009 18:24:30 +0000
Subject: [PATCH] try to not insert -std=c99 into cflags passed to libs that
 are not ansi compliant

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15739 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 build/config/ax_cflags_warn_all_ansi.m4 | 4 ++--
 build/modmake.rules.in                  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/config/ax_cflags_warn_all_ansi.m4 b/build/config/ax_cflags_warn_all_ansi.m4
index 262306f507..634055d6b3 100644
--- a/build/config/ax_cflags_warn_all_ansi.m4
+++ b/build/config/ax_cflags_warn_all_ansi.m4
@@ -1,5 +1,5 @@
 AC_DEFUN([AX_CFLAGS_WARN_ALL_ANSI],[dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([FLAGS],[SWITCH_AM_CFLAGS])dnl
 AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all_ansi])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
 VAR,[VAR="no, unknown"
@@ -47,7 +47,7 @@ AS_VAR_POPDEF([FLAGS])dnl
 dnl the only difference - the LANG selection... and the default FLAGS
 
 AC_DEFUN([AX_CXXFLAGS_WARN_ALL_ANSI],[dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([FLAGS],[SWITCH_AM_CXXFLAGS])dnl
 AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all_ansi])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
 VAR,[VAR="no, unknown"
diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index 67fbecf303..e43cd8eb07 100644
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -42,13 +42,14 @@ LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@
 SOLINK = @SOLINK@
 
 CFLAGS=@CFLAGS@
+CXXFLAGS=@CXXFLAGS@
 LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS)
 
 ALL_CFLAGS   = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
 ALL_CXXFLAGS   = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
 
 DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target) --prefix=$(PREFIX) --disable-shared --with-pic
-DEFAULT_VARS:= CFLAGS="$(ALL_CFLAGS)" CPPFLAGS="$(ALL_CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
+DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
 
 COMPILE      = $(CC) $(ALL_CFLAGS) $(DEFS)
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)