CVS update: php3
| From: | jah | Date: | Thu, 17 Sep 1998 12:10:00 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1194@lists.php.net to get a copy of this message | ||
Date: Thursday September 17, 1998 @ 8:10
Author: jah
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv29195
Modified Files:
Makefile.in configure.in
Log Message:
Must pass a define to esql to get Informix to compile.
Index: php3/Makefile.in
diff -c php3/Makefile.in:1.258 php3/Makefile.in:1.259
*** php3/Makefile.in:1.258 Wed Sep 16 13:36:17 1998
--- php3/Makefile.in Thu Sep 17 08:09:58 1998
***************
*** 24,30 ****
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.258 1998/09/16 17:36:17 danny Exp $
#
prefix = @prefix@
--- 24,30 ----
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.259 1998/09/17 12:09:58 jah Exp $
#
prefix = @prefix@
***************
*** 124,130 ****
(cd dbase; $(MAKE))
functions/ifx.c: functions/ifx.ec
! (if test $(INFORMIXDIR); then esql -e -ED$(HAVE_IFX_IUS) functions/ifx.ec; mv ifx.c functions;
else touch functions/ifx.c; fi)
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
--- 124,130 ----
(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)
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 -c php3/configure.in:1.244 php3/configure.in:1.245
*** php3/configure.in:1.244 Mon Sep 14 18:20:49 1998
--- php3/configure.in Thu Sep 17 08:09:59 1998
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.244 1998/09/14 22:20:49 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.245 1998/09/17 12:09:59 jah Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 1083,1089 ****
--- 1083,1093 ----
IFX_VERSION=[
esql -V | sed -ne '1
s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p']
if test $IFX_VERSION -ge "900"; then
AC_DEFINE(HAVE_IFX_IUS)
+ IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
+ else
+ IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
fi
+ AC_SUBST(IFX_ESQL_FLAGS)
AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION)
AC_MSG_RESULT(yes)
fi
--
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