From: Travis Cross <tc@traviscross.com>
Date: Wed, 19 Mar 2014 02:22:06 +0000 (+0000)
Subject: Fix mod_opal build
X-Git-Tag: v1.5.12~400
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f76e88f153fbfd7679a88368b45e2ea092444ea;p=thirdparty%2Ffreeswitch.git

Fix mod_opal build

...by separating out CPPFLAGS and CXXFLAGS.
---

diff --git a/src/mod/endpoints/mod_opal/Makefile.am b/src/mod/endpoints/mod_opal/Makefile.am
index e28129d9ba..5df9a2a6f7 100644
--- a/src/mod/endpoints/mod_opal/Makefile.am
+++ b/src/mod/endpoints/mod_opal/Makefile.am
@@ -6,6 +6,7 @@ PKG_DIR=/usr/local/lib/pkgconfig
 #DEBUG_SUFFIX:=--define-variable=suffix=_d
 mod_LTLIBRARIES = mod_opal.la
 mod_opal_la_SOURCES  = mod_opal.cpp
-mod_opal_la_CFLAGS   = $(AM_CFLAGS) $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(PKG_DIR) pkg-config opal $(DEBUG_SUFFIX) --cflags)
+mod_opal_la_CPPFLAGS   = $(AM_CPPFLAGS) $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(PKG_DIR) pkg-config opal $(DEBUG_SUFFIX) --cflags | sed 's/-[^ID][^ ]*//g')
+mod_opal_la_CXXFLAGS   = $(AM_CXXFLAGS) $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(PKG_DIR) pkg-config opal $(DEBUG_SUFFIX) --cflags | sed 's/-[ID][^ ]*//g')
 mod_opal_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_opal_la_LDFLAGS  = -avoid-version -module -no-undefined -shared $(shell pkg-config opal $(DEBUG_SUFFIX) --libs)