CVS update: php3
| From: | ssb | Date: | Wed, 23 Sep 1998 13:47:23 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1437@lists.php.net to get a copy of this message | ||
Date: Wednesday September 23, 1998 @ 9:47
Author: ssb
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv8987
Modified Files:
configure.in aclocal.m4
Log Message:
PHP now compiles with Oracle 8 on Linux
Index: php3/configure.in
diff -c php3/configure.in:1.255 php3/configure.in:1.256
*** php3/configure.in:1.255 Tue Sep 22 08:51:09 1998
--- php3/configure.in Wed Sep 23 09:47:21 1998
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.255 1998/09/22 12:51:09 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.256 1998/09/23 13:47:21 ssb Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 584,590 ****
then
# Oracle include files
! if test -d "$ORACLEINST_TOP/rdbms/demo"
then
# V7.[0123]
ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo
--- 584,595 ----
then
# Oracle include files
!
! if test -d "$ORACLEINST_TOP/rdbms/public"
! then
! # V8.0.5
! ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/rdbms/public"
! elif test -d "$ORACLEINST_TOP/rdbms/demo"
then
# V7.[0123]
ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo
Index: php3/aclocal.m4
diff -c php3/aclocal.m4:1.27 php3/aclocal.m4:1.28
*** php3/aclocal.m4:1.27 Mon Sep 21 23:02:28 1998
--- php3/aclocal.m4 Wed Sep 23 09:47:21 1998
***************
*** 1,4 ****
! dnl $Id: aclocal.m4,v 1.27 1998/09/22 03:02:28 rasmus Exp $
dnl
dnl This file contains local autoconf functions.
--- 1,4 ----
! dnl $Id: aclocal.m4,v 1.28 1998/09/23 13:47:21 ssb Exp $
dnl
dnl This file contains local autoconf functions.
***************
*** 9,15 ****
ORACLE_VERSION=
grep '"ocommon"' $ORACLEINST_TOP/orainst/unix.rgs | sed
's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4
test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
else
! ORACLE_VERSION=7.3
fi
AC_MSG_RESULT($ORACLE_VERSION)
])
--- 9,15 ----
ORACLE_VERSION=grep '"ocommon"' $ORACLEINST_TOP/orainst/unix.rgs | sed
's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4
test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
else
! ORACLE_VERSION=8.0
fi
AC_MSG_RESULT($ORACLE_VERSION)
])
--
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