From 79a888de2cd08fbe4c17e697c631daec79d99e99 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Fri, 30 May 2014 15:40:46 +0000 Subject: [PATCH] Revert addition of PERL_GCC_PEDANTIC to CFLAGS Brian and I decided to handle this by just stripping -ansi -pedantic from the mod_perl build instead. Revert "Since we can't tell if the system perl was built with pedantic, we have a problem because we default debug enabled which uses AX_CFLAGS_WARN_ALL_ANSI, For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The result is added to the shellvar being CFLAGS by default. Which then gets included for building mod_perl, Either way I think this is the correct corse of action to overcome these new builds of mod_perl." This reverts commit cb94340e268466d19f41961f3b435897994ec1fa. --- configure.ac | 2 -- src/mod/languages/mod_perl/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b5b68de210..4da80f2105 100644 --- a/configure.ac +++ b/configure.ac @@ -464,7 +464,6 @@ if test "${enable_debug}" = "yes"; then CFLAGS="$saved_CFLAGS" if test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then - APR_ADDTO(SWITCH_PERL_CPPFLAGS, -DPERL_GCC_PEDANTIC) APR_ADDTO(SWITCH_AM_CFLAGS, -g -ggdb) export DEBUG_CFLAGS="-g -ggdb" fi @@ -727,7 +726,6 @@ fi AC_SUBST(SWITCH_AM_CFLAGS) AC_SUBST(SWITCH_ANSI_CFLAGS) -AC_SUBST(SWITCH_PERL_CPPFLAGS) AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS) AC_SUBST(ESL_LDFLAGS) diff --git a/src/mod/languages/mod_perl/Makefile.am b/src/mod/languages/mod_perl/Makefile.am index 3c8d84cfd0..6a8f56a9fd 100644 --- a/src/mod/languages/mod_perl/Makefile.am +++ b/src/mod/languages/mod_perl/Makefile.am @@ -17,7 +17,7 @@ mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -ME freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS) -freeswitch_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ $(SWITCH_PERL_CPPFLAGS) +freeswitch_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ reswig: swigclean mod_perl_wrap.cpp swigclean: clean