PHP 4.0 Bug #1936: php4-beta1 & oracle8i

From: skaar@ita.chalmers.se Operating system: Solaris 7 PHP version: 4.0 Beta 1 PHP Bug Type: Oracle related Bug description: php4-beta1 & oracle8i this is just a quick and dirty patch to get php4 to compile with Oracle8i (8.1.5) - I just tested some basic oci-scripts and it seems to work just fine. -- cut -- *** configure.orig Sun Aug 1 01:05:23 1999 --- configure Sun Aug 1 01:05:40 1999 *************** *** 7143,7148 **** --- 7143,7152 ---- then 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 + # for Oracle8i + elif test -f "$ORACLEINST_TOP/install/unix.rgs" + then + ORACLE_VERSION=`grep rdbms $ORACLEINST_TOP/install/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 2 | cut -c 1-3` else ORACLE_VERSION=8.0 fi *************** *** 7226,7231 **** --- 7230,7248 ---- else ORACLE_SHLIBS="$ORACLE_STLIBS" fi + ;; + 8.1) + if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s? -o \ + -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.a # AIX + then + if test "$CC" = "gcc" -a "uname -sv" = "AIX 4"; then + # for Oracle 8 on AIX 4 + ORA_SYSLIB="$ORA_SYSLIB -nostdlib /lib/crt0_r.o /usr/lib/libpthreads.a /usr/lib/libc_r.a -l gcc" + fi + ORACLE_SHLIBS="-lclntsh -lpsa8 -lcore8 -lnls8 -lclntsh $ORA_SYSLIB" + else + ORACLE_SHLIBS="$ORACLE_STLIBS" + fi cat >> confdefs.h <<\EOF #define HAVE_OCI8 1 EOF *************** *** 7637,7642 **** --- 7654,7663 ---- then 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 + # for Oracle8i + elif test -f "$ORACLEINST_TOP/install/unix.rgs" + then + ORACLE_VERSION=`grep rdbms $ORACLEINST_TOP/install/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 2 | cut -c 1-3` else ORACLE_VERSION=8.0 fi *************** *** 7720,7725 **** --- 7741,7759 ---- else ORACLE_SHLIBS="$ORACLE_STLIBS" fi + ;; + 8.1) + if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s? -o \ + -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.a # AIX + then + if test "$CC" = "gcc" -a "uname -sv" = "AIX 4"; then + # for Oracle 8 on AIX 4 + ORA_SYSLIB="$ORA_SYSLIB -nostdlib /lib/crt0_r.o /usr/lib/libpthreads.a /usr/lib/libc_r.a -l gcc" + fi + ORACLE_SHLIBS="-lclntsh -lpsa8 -lcore8 -lnls8 -lclntsh $ORA_SYSLIB" + else + ORACLE_SHLIBS="$ORACLE_STLIBS" + fi cat >> confdefs.h <<\EOF #define HAVE_OCI8 1 EOF -- cut --