cvs: php4 / acinclude.m4 configure.in /ext/standard/ config.m4

sas Wed May 17 21:08:44 2000 EDT Modified files: /php4 acinclude.m4 configure.in /php4/ext/standard config.m4 Log: Add debug.log facility. If there are any obscure bugs in our build system, this will give us enough information to find and fix it. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.83 php4/acinclude.m4:1.84 --- php4/acinclude.m4:1.83 Wed May 17 01:24:39 2000 +++ php4/acinclude.m4 Wed May 17 21:08:44 2000 @@ -1,9 +1,37 @@ -dnl $Id: acinclude.m4,v 1.83 2000/05/16 23:24:39 sas Exp $ +dnl $Id: acinclude.m4,v 1.84 2000/05/17 19:08:44 sas Exp $ dnl dnl This file contains local autoconf functions. sinclude(dynlib.m4) +AC_DEFUN(PHP_DEBUG_MACRO,[ + DEBUG_LOG="$1" + cat >$1 <<X +CONFIGURE: $CONFIGURE_COMMAND +CC: $CC +CFLAGS: $CFLAGS +CPPFLAGS: $CPPFLAGS +CXX: $CXX +CXXFLAGS: $CXXFLAGS +INCLUDES: $INCLUDES +LDFLAGS: $LDFLAGS +LIBS: $LIBS +DLIBS: $DLIBS +SAPI: $PHP_SAPI +PHP_RPATHS: $PHP_RPATHS +uname -a: uname -a + +X + cat >conftest.$ac_ext <<X +main() +{ + exit(0); +} +X + (eval echo \"$ac_link\"; eval $ac_link && ./conftest) >>$1 2>&1 + rm -fr conftest* +]) + AC_DEFUN(PHP_MISSING_TIME_R_DECL,[ AC_MSG_CHECKING(for missing declarations of reentrant functions) AC_TRY_COMPILE([#include <time.h>],[struct tm *(*func)() = localtime_r],[ Index: php4/configure.in diff -u php4/configure.in:1.127 php4/configure.in:1.128 --- php4/configure.in:1.127 Wed May 17 14:50:04 2000 +++ php4/configure.in Wed May 17 21:08:44 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.127 2000/05/17 12:50:04 andrei Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.128 2000/05/17 19:08:44 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -868,6 +868,23 @@ fi fi + + if test -n "$DEBUG_LOG"; then + rm -f config.cache +cat <<X ++--------------------------------------------------------------------+ +| ATTENTION! | +| Something is likely to be screwed up here, because the configure | +| script was not able to detect a simple feature on your platform. | +| This is often caused by incorrect configuration parameters. Please | +| see the file debug.log for error messages. | +| | +| If you are unable to fix this, send the file debug.log to the | +| php-install@lists.php.net mailing list and include appropiate | +| information about your setup. | +X + fi + echo "+--------------------------------------------------------------------+" echo "| License: |" echo "| This software is subject to the PHP License, available in this |" @@ -876,6 +893,12 @@ echo "| If you do not agree with the terms of this license, you must abort |" echo "| the installation process at this point. |" echo "+--------------------------------------------------------------------+" + +cat<<X + +Thank you for using PHP. + +X fi ]) Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.21 php4/ext/standard/config.m4:1.22 --- php4/ext/standard/config.m4:1.21 Fri May 5 13:23:12 2000 +++ php4/ext/standard/config.m4 Wed May 17 21:08:44 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.21 2000/05/05 11:23:12 sas Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.22 2000/05/17 19:08:44 sas Exp $ -*- sh -*- divert(3)dnl @@ -26,6 +26,7 @@ if test "$ac_cv_crypt_des" = "yes"; then ac_result=1 else + PHP_DEBUG_MACRO(debug.log) ac_result=0 fi AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports standard DES salt])