cvs: php4 /ext/oci8 config.m4 /ext/oracle config.m4

thies Mon Jun 19 02:16:57 2000 EDT Modified files: /php4/ext/oci8 config.m4 /php4/ext/oracle config.m4 Log: some adjustments to the sysliblist # still needs some fixing - sascha? Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.18 php4/ext/oci8/config.m4:1.19 --- php4/ext/oci8/config.m4:1.18 Fri May 19 02:19:18 2000 +++ php4/ext/oci8/config.m4 Mon Jun 19 02:16:57 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.18 2000/05/19 09:19:18 thies Exp $ +dnl $Id: config.m4,v 1.19 2000/06/19 09:16:57 thies Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -52,17 +52,11 @@ fi if test -f "$OCI8_DIR/lib/sysliblist"; then - OCI8_SYSLIB="cat $OCI8_DIR/lib/sysliblist | sed -e 's/-l//g'" + PHP_EVAL_LIBLINE($OCI8_DIR/lib/sysliblist, OCI8_SYSLIB) elif test -f "$OCI8_DIR/rdbms/lib/sysliblist"; then - OCI8_SYSLIB="cat $OCI8_DIR/rdbms/lib/sysliblist | sed -e 's/-l//g'" + PHP_EVAL_LIBLINE($OCI8_DIR/rdbms/lib/sysliblist, OCI8_SYSLIB) fi - if test -n "$OCI8_SYSLIB"; then - for oci8_slib in echo $OCI8_SYSLIB; do - AC_ADD_LIBRARY_WITH_PATH($oci8_slib, "", OCI8_SHARED_LIBADD) - done - fi - AC_OCI8_VERSION($OCI8_DIR) case $OCI8_VERSION in 8.0) @@ -86,14 +80,4 @@ PHP_SUBST(OCI8_SHARED_LIBADD) PHP_SUBST(OCI8_DIR) PHP_SUBST(OCI8_VERSION) - - # i have no idea if the following will work! thies@digicol.de 20000508 - if test "$CC" = "gcc" -a "uname -sv" = "AIX 4"; then - if test "$ext_shared" = "yes"; then - OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -nostdlib /lib/crt0_r.o /usr/lib/libpthreads.a /usr/lib/libc_r.a -lgcc" - else - LIBS="$LIBS -nostdlib /lib/crt0_r.o /usr/lib/libpthreads.a /usr/lib/libc_r.a -lgcc" - fi - fi - fi Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.12 php4/ext/oracle/config.m4:1.13 --- php4/ext/oracle/config.m4:1.12 Fri May 19 02:19:18 2000 +++ php4/ext/oracle/config.m4 Mon Jun 19 02:16:57 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.12 2000/05/19 09:19:18 thies Exp $ +dnl $Id: config.m4,v 1.13 2000/06/19 09:16:57 thies Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -52,17 +52,11 @@ fi if test -f "$ORACLE_DIR/lib/sysliblist"; then - ORACLE_SYSLIB="cat $ORACLE_DIR/lib/sysliblist | sed -e 's/-l//g'" + PHP_EVAL_LIBLINE($ORACLE_DIR/lib/sysliblist, ORACLE_SHARED_LIBADD) elif test -f "$ORACLE_DIR/rdbms/lib/sysliblist"; then - ORACLE_SYSLIB="cat $ORACLE_DIR/rdbms/lib/sysliblist | sed -e 's/-l//g'" + PHP_EVAL_LIBLINE($ORACLE_DIR/rdbms/lib/sysliblist, ORACLE_SHARED_LIBADD) fi - if test -n "$ORACLE_SYSLIB"; then - for oracle_slib in echo $ORACLE_SYSLIB; do - AC_ADD_LIBRARY_WITH_PATH($oracle_slib, "", ORACLE_SHARED_LIBADD) - done - fi - AC_ORACLE_VERSION($ORACLE_DIR) case $ORACLE_VERSION in 7.0|7.1) @@ -162,14 +156,4 @@ PHP_SUBST(ORACLE_SHARED_LIBADD) PHP_SUBST(ORACLE_DIR) PHP_SUBST(ORACLE_VERSION) - - # i have no idea if the following will work! thies@digicol.de 20000508 - if test "$CC" = "gcc" -a "uname -sv" = "AIX 4"; then - if test "$ext_shared" = "yes"; then - ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -nostdlib /lib/crt0_r.o /usr/lib/libpthreads.a /usr/lib/libc_r.a -lgcc" - else - LIBS="$LIBS -nostdlib /lib/crt0_r.o /usr/lib/libpthreads.a /usr/lib/libc_r.a -lgcc" - fi - fi - fi