summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-09-26 20:59:47 +0000
committerSascha Schumann <sas@php.net>1999-09-26 20:59:47 +0000
commitb7a11301432d26f8ef6dcdc9746be1804d07d555 (patch)
tree8132ab8e94f34d5fdb894d519e543ed648036fed
parent96b6bdff278628821151f16f6f4e8ecec3cea228 (diff)
downloadphp-git-b7a11301432d26f8ef6dcdc9746be1804d07d555.tar.gz
Actually allow to set CXXFLAGS
-rw-r--r--Zend/Makefile.am1
-rw-r--r--Zend/configure.in2
2 files changed, 3 insertions, 0 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index b566f441e9..a66f8a07dd 100644
--- 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 dba42d2e72..670d263aeb 100644
--- 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)