reuse known values

diff --git a/configure.in b/configure.in
index db4e020130d85819bfef74f698e4641d2526b90b..9da3131d9f15e217ae8e8d03195b062ba95b2ecc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -136,8 +136,8 @@ AC_AIX
 abs_srcdir=`(cd $srcdir; pwd)`
 abs_builddir=`pwd`
 
-php_abs_top_srcdir=`(cd $srcdir; pwd)`
-php_abs_top_builddir=`pwd`
+php_abs_top_srcdir=$abs_srcdir
+php_abs_top_builddir=$abs_builddir
 
 dnl Because ``make install'' is often performed by the superuser,
 dnl we create the libs subdirectory as the user who configures PHP.
@@ -1075,7 +1075,7 @@ PHP_CONFIGURE_PART(Generating files)
 
 CXXFLAGS_CLEAN=$CXXFLAGS
 CFLAGS_CLEAN=$CFLAGS
-CFLAGS="$CFLAGS $standard_libtool_flag"
+CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
 INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"