Modified: freeswitch/trunk/build/config/ax_cflags_warn_all_ansi.m4 (15738 => 15739)
--- freeswitch/trunk/build/config/ax_cflags_warn_all_ansi.m4 2009-12-01 17:46:28 UTC (rev 15738)
+++ freeswitch/trunk/build/config/ax_cflags_warn_all_ansi.m4 2009-12-01 18:24:30 UTC (rev 15739)
@@ -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 @@
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"
Modified: freeswitch/trunk/build/modmake.rules.in (15738 => 15739)
--- freeswitch/trunk/build/modmake.rules.in 2009-12-01 17:46:28 UTC (rev 15738)
+++ freeswitch/trunk/build/modmake.rules.in 2009-12-01 18:24:30 UTC (rev 15739)
@@ -42,13 +42,14 @@
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)