CVS update: php3

Date: Thursday August 27, 1998 @ 6:50 Author: jah Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv27716 Modified Files: acconfig.h config.h.in configure.in Log Message: Changes in configuring Informix support. Should work harder on the docs. Index: php3/acconfig.h diff -c php3/acconfig.h:1.61 php3/acconfig.h:1.62 *** php3/acconfig.h:1.61 Wed Aug 12 05:21:38 1998 --- php3/acconfig.h Thu Aug 27 06:50:58 1998 *************** *** 161,166 **** --- 161,172 ---- #ifndef HAVE_IFX #define HAVE_IFX 0 #endif + #ifndef HAVE_IFX_IUS + #define HAVE_IFX_IUS 0 + #endif + #ifndef IFX_VERSION + #define IFX_VERSION 0 + #endif #ifndef HAVE_PQCMDTUPLES #define HAVE_PQCMDTUPLES 0 Index: php3/config.h.in diff -c php3/config.h.in:1.111 php3/config.h.in:1.112 *** php3/config.h.in:1.111 Wed Aug 12 05:21:38 1998 --- php3/config.h.in Thu Aug 27 06:50:58 1998 *************** *** 207,212 **** --- 207,218 ---- #ifndef HAVE_IFX #define HAVE_IFX 0 #endif + #ifndef HAVE_IFX_IUS + #define HAVE_IFX_IUS 0 + #endif + #ifndef IFX_VERSION + #define IFX_VERSION 0 + #endif #ifndef HAVE_PQCMDTUPLES #define HAVE_PQCMDTUPLES 0 Index: php3/configure.in diff -c php3/configure.in:1.238 php3/configure.in:1.239 *** php3/configure.in:1.238 Thu Aug 20 16:53:10 1998 --- php3/configure.in Thu Aug 27 06:50:59 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.238 1998/08/20 20:53:10 musone Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.239 1998/08/27 10:50:59 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 1017,1063 **** [ --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 ! IFX_LIBS="-lixsql -lixasf -lixos -lixgen -lixgls -lnetstub $INFORMIXDIR/lib/esql/checkapi.o -lixglx" ! ! old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS; old_LIBS=$LIBS ! CFLAGS="$CFLAGS $IFX_INCLUDE" ! LDFLAGS="$LDFLAGS $IFX_LFLAGS" ! LIBS="$LIBS $IFX_LIBS" ! AC_DEFINE(HAVE_IFX) ! AC_MSG_RESULT(yes) ! CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS ! else ! AC_MSG_RESULT(no) ! fi ],[ AC_MSG_RESULT(no) ]) --- 1017,1070 ---- [ --with-informix[=DIR] Include Informix support. DIR is the Informix base install directory, defaults to ${INFORMIXDIR:-nothing}.], [ ! if test "$withval" != "no"; then ! if test "$INFORMIXDIR" = ""; then ! INFORMIX_WARNING=" ! WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR ! environment value set up. Configuring and compiling Informix ! support to PHP3 is impossible and has been turned off. Please ! try again after setting up your environment." ! AC_MSG_RESULT(no) ! else ! 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" ! if test "$withval" != "$INFORMIXDIR"; then 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 ! IFX_INCLUDE=-I$IFX_INCDIR ! IFX_LFLAGS=$IFX_LIBDIR ! if test -z "$IFX_LIBS"; then ! IFX_LIBS=esql -libs | sed -e 's/-lm//' ! dnl -lm twice otherwise? ! IFX_LIBS=echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g' ! dnl Seems to get rid of newlines. ! dnl According to Perl's DBD-Informix, might contain these strings. ! else ! dnl Allow override to use static and/or threaded libs ! IFX_LIBS="$IFX_LIBS" ! fi ! CFLAGS="$CFLAGS $IFX_INCLUDE" ! LDFLAGS="$LDFLAGS $IFX_LFLAGS" ! AC_DEFINE(HAVE_IFX) ! AC_MSG_CHECKING([Informix version]) ! IFX_VERSION=[esql -V | sed -ne 's/[^0-9]\+\([0-9]\)\.\([0-9]\+\).*/\1\2/p'] ! if test $IFX_VERSION -ge "900"; then ! AC_DEFINE(HAVE_IFX_IUS) ! fi ! AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION) ! AC_MSG_RESULT(yes) ! fi ! else ! AC_MSG_RESULT(no) ! fi ],[ AC_MSG_RESULT(no) ]) -- 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