CVS update: php3

Date: Saturday May 8, 1999 @ 17:46 Author: jah Update of /repository/php3 In directory php:/tmp/cvs-serv1579 Modified Files: CREDITS ChangeLog Makefile.in configure.in cvsusers Log Message: Don't try to add Informix support if INFORMIXDIR is set but --with-informix not specified. And change of email address. Index: php3/CREDITS diff -u php3/CREDITS:1.45 php3/CREDITS:1.46 --- php3/CREDITS:1.45 Thu Apr 22 09:19:48 1999 +++ php3/CREDITS Sat May 8 17:46:49 1999 @@ -60,7 +60,7 @@ Major Contributors ================== -* Jouni Ahto (jah@cultnet.fi) +* Jouni Ahto (jah@mork.net) Postgres, Informix * Alex Belits (abelits@phobos.illtel.denver.co.us) @@ -184,7 +184,7 @@ * Jim Jagielski (jim@jagunet.com) A/UX, FreeBSD/x86 -* Jouni Ahto (jah@cultnet.fi) +* Jouni Ahto (jah@mork.net) Debian Linux 2.0 Index: php3/ChangeLog diff -u php3/ChangeLog:1.620 php3/ChangeLog:1.621 --- php3/ChangeLog:1.620 Fri May 7 09:20:43 1999 +++ php3/ChangeLog Sat May 8 17:46:49 1999 @@ -1,6 +1,8 @@ PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ? 1999, Version 3.0.8 +- Small fix in configure.in: doesn't try to add in Informix support anymore + if INFORMIXDIR is set but --with-informix not specified (Jouni Ahto) - add mcrypt module (Sascha) - added REFCURSOR (including nested table) handling for OCI8. (Thies C. Arntzen) - finalized new behaviour of hw_modifyobject() (U. Steinmann) Index: php3/Makefile.in diff -u php3/Makefile.in:1.303 php3/Makefile.in:1.304 --- php3/Makefile.in:1.303 Sun May 2 12:19:00 1999 +++ php3/Makefile.in Sat May 8 17:46:49 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.303 1999/05/02 16:19:00 sas Exp $ +# $Id: Makefile.in,v 1.304 1999/05/08 21:46:49 jah Exp $ # prefix = @prefix@ @@ -132,7 +132,7 @@ (cd dbase; $(MAKE)) functions/ifx.c: functions/ifx.ec - (if test @INFORMIXDIR@; then esql -e @IFX_ESQL_FLAGS@ functions/ifx.ec; mv ifx.c functions; else touch functions/ifx.c; fi) + @IFX_C_MAKE@ language-parser.tab.h language-parser.tab.c: $(srcdir)/language-parser.y bison -p php -v -d $(srcdir)/language-parser.y -o language-parser.tab.c Index: php3/configure.in diff -u php3/configure.in:1.347 php3/configure.in:1.348 --- php3/configure.in:1.347 Tue May 4 07:52:30 1999 +++ php3/configure.in Sat May 8 17:46:49 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.347 1999/05/04 11:52:30 sas Exp $ +dnl $Id: configure.in,v 1.348 1999/05/08 21:46:49 jah Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -1547,6 +1547,7 @@ 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." + IFX_C_MAKE='touch functions/ifx.c' AC_MSG_RESULT(no) else if test "$withval" = "yes"; then @@ -1592,18 +1593,22 @@ AC_SUBST(IFX_ESQL_FLAGS) AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION) AC_MSG_RESULT(yes) + IFX_C_MAKE="(esql -e $IFX_ESQL_FLAGS functions/ifx.ec; mv ifx.c functions)" fi else INFORMIXDIR= + IFX_C_MAKE='touch functions/ifx.c' AC_MSG_RESULT(no) fi ],[ + IFX_C_MAKE='touch functions/ifx.c' AC_MSG_RESULT(no) ]) AC_SUBST(IFX_LIBS) AC_SUBST(IFX_LFLAGS) AC_SUBST(IFX_INCLUDE) AC_SUBST(INFORMIXDIR) +AC_SUBST(IFX_C_MAKE) AC_MSG_CHECKING(for InterBase support) AC_ARG_WITH(interbase, Index: php3/cvsusers diff -u php3/cvsusers:1.50 php3/cvsusers:1.51 --- php3/cvsusers:1.50 Fri Apr 16 01:16:56 1999 +++ php3/cvsusers Sat May 8 17:46:49 1999 @@ -15,7 +15,7 @@ lr Lachlan Roche lr@www.wwi.com.au MD5 damian ian -jah Jouni Ahto jah@cultnet.fi Postgres, Informix +jah Jouni Ahto jah@mork.net Postgres, Informix adam amitay Amitay Isaacs amitay@w-o-i.com LDAP dizzy -- 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