[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/configure.in branches/PHP_5_3/configure.in trunk/configure.in
jani Tue, 22 Dec 2009 09:57:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=292470 Log: - Fixed bug #50517 (EXTRA_LDFLAGS polluted by wrong entries) # Until someone shows me use case for LDFLAGS, this is gone. # This was wrong place to import it anyway. Bug: http://bugs.php.net/50517 (Open) EXTRA_LDFLAGS polluted by wrong entries Changed paths: U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-12-22 09:07:31 UTC (rev 292469) +++ php/php-src/branches/PHP_5_2/configure.in 2009-12-22 09:57:19 UTC (rev 292470) @@ -959,7 +959,6 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS -EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-12-22 09:07:31 UTC (rev 292469) +++ php/php-src/branches/PHP_5_3/configure.in 2009-12-22 09:57:19 UTC (rev 292470) @@ -984,7 +984,6 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS -EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-12-22 09:07:31 UTC (rev 292469) +++ php/php-src/trunk/configure.in 2009-12-22 09:57:19 UTC (rev 292470) @@ -978,7 +978,6 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS -EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/configure.in branches/PHP_5_3/configure.in trunk/configure.in
jani Tue, 15 Dec 2009 10:55:27 + Revision: http://svn.php.net/viewvc?view=revisionrevision=292153 Log: - Allow using $sbindir as well Changed paths: U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-12-15 10:54:45 UTC (rev 292152) +++ php/php-src/branches/PHP_5_2/configure.in 2009-12-15 10:55:27 UTC (rev 292153) @@ -1224,6 +1224,7 @@ PHP_SUBST_OLD(php_abs_top_srcdir) PHP_SUBST(bindir) +PHP_SUBST(sbindir) PHP_SUBST(exec_prefix) PHP_SUBST_OLD(program_prefix) PHP_SUBST_OLD(program_suffix) Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-12-15 10:54:45 UTC (rev 292152) +++ php/php-src/branches/PHP_5_3/configure.in 2009-12-15 10:55:27 UTC (rev 292153) @@ -1240,6 +1240,7 @@ PHP_SUBST_OLD(php_abs_top_srcdir) PHP_SUBST(bindir) +PHP_SUBST(sbindir) PHP_SUBST(exec_prefix) PHP_SUBST_OLD(program_prefix) PHP_SUBST_OLD(program_suffix) Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-12-15 10:54:45 UTC (rev 292152) +++ php/php-src/trunk/configure.in 2009-12-15 10:55:27 UTC (rev 292153) @@ -1179,6 +1179,7 @@ PHP_SUBST_OLD(php_abs_top_srcdir) PHP_SUBST(bindir) +PHP_SUBST(sbindir) PHP_SUBST(exec_prefix) PHP_SUBST_OLD(program_prefix) PHP_SUBST_OLD(program_suffix) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/configure.in branches/PHP_5_3/configure.in trunk/configure.in
gwynne Mon, 30 Nov 2009 21:38:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291523 Log: The old Darwin hack is BROKEN and INCORRECT. It works only for Darwin 9, not 10, and uses an ugly CFLAGS hack that messes with the entire build. This version sets one cached value to the correct result for Darwin 9 and 10. It's cleaner, has no side effects, has nothing to do with Autoconf versions, and works for everyone. Changed paths: U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-11-30 21:02:46 UTC (rev 291522) +++ php/php-src/branches/PHP_5_2/configure.in 2009-11-30 21:38:44 UTC (rev 291523) @@ -122,21 +122,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1331,6 +1316,14 @@ LDFLAGS=$LDFLAGS $PHP_AIX_LDFLAGS +dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6. +dnl This hack works around it. Ugly. +case $host_alias in +*darwin9*|*darwin10*) + ac_cv_exeext= + ;; +esac + dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ @@ -1354,15 +1347,6 @@ CC=$old_CC -dnl Finish the Darwin hack -if test $php_did_darwin9_cheat -eq 1; then - if test $PHP_DEBUG = 1; then -CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'` - else -CFLAGS=`echo -O2 $CFLAGS | $SED -e 's/-gstabs//g'` - fi -fi - PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-11-30 21:02:46 UTC (rev 291522) +++ php/php-src/branches/PHP_5_3/configure.in 2009-11-30 21:38:44 UTC (rev 291523) @@ -122,21 +122,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1339,6 +1324,14 @@ LDFLAGS=$LDFLAGS $PHP_AIX_LDFLAGS +dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6. +dnl This hack works around it. Ugly. +case $host_alias in +*darwin9*|*darwin10*) + ac_cv_exeext= + ;; +esac + dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ @@ -1362,15 +1355,6 @@ CC=$old_CC -dnl Finish the Darwin hack -if test $php_did_darwin9_cheat -eq 1; then - if test $PHP_DEBUG = 1; then -CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'` - else -CFLAGS=`echo -O2 $CFLAGS | $SED -e 's/-gstabs//g'` - fi -fi - PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-11-30 21:02:46 UTC (rev 291522) +++ php/php-src/trunk/configure.in 2009-11-30 21:38:44 UTC (rev 291523) @@ -124,21 +124,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1277,6 +1262,14 @@ LDFLAGS=$LDFLAGS
[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/configure.in branches/PHP_5_3/configure.in trunk/configure.in
johannesMon, 20 Jul 2009 14:34:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284438 Changed paths: U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Log: CVS-SVN Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-07-20 13:19:35 UTC (rev 284437) +++ php/php-src/branches/PHP_5_2/configure.in 2009-07-20 14:34:09 UTC (rev 284438) @@ -171,7 +171,7 @@ case $php_cv_bison_version in |invalid[)] if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f $abs_srcdir/Zend/zend_language_parser.c ; then - AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) + AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN checkout!]) fi ;; esac Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-07-20 13:19:35 UTC (rev 284437) +++ php/php-src/branches/PHP_5_3/configure.in 2009-07-20 14:34:09 UTC (rev 284438) @@ -170,7 +170,7 @@ case $php_cv_bison_version in |invalid[)] if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f $abs_srcdir/Zend/zend_language_parser.c ; then - AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) + AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN checkout!]) fi ;; esac Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-07-20 13:19:35 UTC (rev 284437) +++ php/php-src/trunk/configure.in 2009-07-20 14:34:09 UTC (rev 284438) @@ -170,7 +170,7 @@ case $php_cv_bison_version in |invalid[)] if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f $abs_srcdir/Zend/zend_language_parser.c ; then - AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) + AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN checkout!]) fi ;; esac -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
