Actually allow to set CXXFLAGS

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index b566f441e9f230135a201e403441ae3ccf117709..a66f8a07dd4c0537a887bed3fbb5de1155636e8b 100644 (file)
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -13,6 +13,7 @@ libzend_a_SOURCES=\
        zend_list.c zend_indent.c zend_builtin_functions.c
 
 # taken from automake 1.4
+CXXFLAGS= @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 
 # automake isn't too clever about "non-standard" use of lex and yacc

diff --git a/Zend/configure.in b/Zend/configure.in
index dba42d2e726c68b8354ccb937dd4a6f141df8e1e..670d263aeb2a55bf2fbda21bd4f0b8d18859c0c3 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -161,6 +161,8 @@ AC_CHECK_LIB(g++, cin)
 AC_CHECK_LIB(stdc++, cin)
 fi
 
+AC_SUBST(CXXFLAGS)
+
 AC_SUBST(CFLAGS_SHLIB)
 AC_SUBST(LDFLAGS_SHLIB)
 AC_SUBST(LDFLAGS_SHLIB_EXPORT)