CVS update: php3

Date: Monday August 10, 1998 @ 14:07 Author: jah Update of /repository/php3 In directory asf:/tmp/cvs-serv17549 Modified Files: acconfig.h configure.in setup Log Message: Some sanity checks if trying to enable Informix support and environment doesn't seem to be ready. Forgot acconfig.h. Added support for Informix to setup. Index: php3/acconfig.h diff -c php3/acconfig.h:1.59 php3/acconfig.h:1.60 *** php3/acconfig.h:1.59 Mon Jul 27 11:55:40 1998 --- php3/acconfig.h Mon Aug 10 14:07:37 1998 *************** *** 155,160 **** --- 155,164 ---- #define HAVE_VELOCIS 0 #endif + #ifndef HAVE_IFX + #define HAVE_IFX 0 + #endif + #ifndef HAVE_PQCMDTUPLES #define HAVE_PQCMDTUPLES 0 #endif Index: php3/configure.in diff -c php3/configure.in:1.235 php3/configure.in:1.236 *** php3/configure.in:1.235 Sun Aug 9 15:05:32 1998 --- php3/configure.in Mon Aug 10 14:07:38 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.235 1998/08/09 19:05:32 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.236 1998/08/10 18:07:38 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 1015,1029 **** AC_MSG_CHECKING(for Informix support) AC_ARG_WITH(informix, [ --with-informix[=DIR] Include Informix support. DIR is the Informix base ! install directory, defaults to $INFORMIXDIR.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then IFX_INCDIR=$INFORMIXDIR/incl/esql IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql" else IFX_INCDIR=$withval/incl/esql IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql" fi IFX_INCLUDE=-I$IFX_INCDIR IFX_LFLAGS=$IFX_LIBDIR --- 1015,1048 ---- AC_MSG_CHECKING(for Informix support) AC_ARG_WITH(informix, [ --with-informix[=DIR] Include Informix support. DIR is the Informix base ! install directory, defaults to ${INFORMIXDIR:-nothing}.], [ if test "$withval" != "no"; then if test "$withval" = "yes"; then IFX_INCDIR=$INFORMIXDIR/incl/esql IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql" + if test "$INFORMIXDIR" = ""; then + INFORMIX_WARNING=" + WARNING: You asked for Informix support, but didn't specify Informix base install + directory and don't have \\\$INFORMIXDIR environment value set up. Trying + to compile will probably fail." + fi else IFX_INCDIR=$withval/incl/esql IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql" + if test "$withval" != "$INFORMIXDIR"; then + if test "$INFORMIXDIR" = ""; then + INFORMIX_WARNING=" + WARNING: You specified Informix base install directory, but your environment + is not yet ready for compiling. Please set \\\$INFORMIXDIR to $withval + before trying to compile." + else + INFORMIX_WARNING=" + WARNING: You specified Informix base install directory that is different + than your \\\$INFORMIXDIR environment variable. You'd better know + exactly what you are doing." + fi + fi fi IFX_INCLUDE=-I$IFX_INCDIR IFX_LFLAGS=$IFX_LIBDIR *************** *** 1503,1508 **** --- 1522,1531 ---- echo " http://www.php.net/manual/configuration05.php3 for more details." fi fi + fi + dnl Warn if Informix support was requested but environment is not set up correctly. + if test "$INFORMIX_WARNING" != ""; then + echo "$INFORMIX_WARNING" fi ]) # Local Variables: Index: php3/setup diff -c php3/setup:1.41 php3/setup:1.42 *** php3/setup:1.41 Sat Aug 8 18:45:20 1998 --- php3/setup Mon Aug 10 14:07:38 1998 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.41 1998/08/08 22:45:20 rasmus Exp $ if [ "$1" = "-q" ]; then quiet_mode=on --- 29,35 ---- # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.42 1998/08/10 18:07:38 jah Exp $ if [ "$1" = "-q" ]; then quiet_mode=on *************** *** 282,287 **** --- 282,294 ---- 'no /usr/local/solid Solid install' \ ' Whether to build PHP with Solid support.\n More information about Solid can be found at http://www.solidtech.com/.' + + define_option with-informix 'Informix support?' yesnodir \ + "no $INFORMIXDIR Informix home" \ + ' Whether to build PHP with Informix support. If you have not set up your\n + Informix environment, enter what $INFORMIXDIR is usually set to here.\n + You MUST set $INFORMIXDIR before trying to compile!\n + More info about Informix can be found at http://www.informix.com/.' define_option with-ldap 'LDAP support?' yesnodir \ 'no /usr/local/ldap LDAP base install' \ -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net