CVS update: php3

Date: Sunday February 7, 1999 @ 12:28 Author: rasmus Update of /repository/php3 In directory asf:/u/temp/cvs-serv27845 Modified Files: configure.in Log Message: More apxs work Index: php3/configure.in diff -c php3/configure.in:1.314 php3/configure.in:1.315 *** php3/configure.in:1.314 Sun Feb 7 03:30:29 1999 --- php3/configure.in Sun Feb 7 12:28:13 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.314 1999/02/07 08:30:29 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.315 1999/02/07 17:28:13 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 46,52 **** AC_MSG_RESULT($php_cv_cc_dashr) if test $php_cv_cc_dashr = "yes"; then ld_runpath_switch="-R" ! apxs_runpath_switch="-Wl,-R" else AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ --- 46,52 ---- AC_MSG_RESULT($php_cv_cc_dashr) if test $php_cv_cc_dashr = "yes"; then ld_runpath_switch="-R" ! apxs_runpath_switch="-Wl,-R'" else AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ *************** *** 57,67 **** AC_MSG_RESULT($php_cv_cc_rpath) if test $php_cv_cc_rpath = "yes"; then ld_runpath_switch="-Wl,-rpath," ! apxs_runpath_switch="-Wl,-rpath " else dnl something innocuous ld_runpath_switch="-L" ! apxs_runpath_switch="-L" fi fi --- 57,67 ---- AC_MSG_RESULT($php_cv_cc_rpath) if test $php_cv_cc_rpath = "yes"; then ld_runpath_switch="-Wl,-rpath," ! apxs_runpath_switch="-Wl,'-rpath " else dnl something innocuous ld_runpath_switch="-L" ! apxs_runpath_switch="-L'" fi fi *************** *** 547,553 **** if test ! -f $IMAP_DIR/lib/libc-client4.so; then AC_MSG_ERROR(You need to copy or link $IMAP_DIR/lib/c-client.a to $IMAP_DIR/lib/libc-client.a) else ! IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib -L$IMAP_DIR/lib -lc-client4" fi else IMAP_LIBS="-L$IMAP_DIR/lib -lc-client" --- 547,553 ---- if test ! -f $IMAP_DIR/lib/libc-client4.so; then AC_MSG_ERROR(You need to copy or link $IMAP_DIR/lib/c-client.a to $IMAP_DIR/lib/libc-client.a) else ! IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client4" fi else IMAP_LIBS="-L$IMAP_DIR/lib -lc-client" *************** *** 745,751 **** ORACLE_LIBDIR=lib if test -n "$APXS"; then ! ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${apxs_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR" else ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR" fi --- 745,751 ---- ORACLE_LIBDIR=lib if test -n "$APXS"; then ! ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${apxs_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR'" else ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR" fi *************** *** 1029,1035 **** fi MYSQL_INCLUDE=-I$MYSQL_INCDIR if test -n "$APXS"; then ! MYSQL_LFLAGS="${apxs_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" else MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" fi --- 1029,1035 ---- fi MYSQL_INCLUDE=-I$MYSQL_INCDIR if test -n "$APXS"; then ! MYSQL_LFLAGS="${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" else MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" fi *************** *** 1232,1238 **** fi MCK_INCLUDE=-I$MCK_INCDIR if test -n "$APXS"; then ! MCK_LFLAGS="-L$MCK_LIBDIR ${apxs_runpath_switch}$MCK_LIBDIR" else MCK_LFLAGS="-L$MCK_LIBDIR ${ld_runpath_switch}$MCK_LIBDIR" fi --- 1232,1238 ---- fi MCK_INCLUDE=-I$MCK_INCDIR if test -n "$APXS"; then ! MCK_LFLAGS="-L$MCK_LIBDIR ${apxs_runpath_switch}$MCK_LIBDIR'" else MCK_LFLAGS="-L$MCK_LIBDIR ${ld_runpath_switch}$MCK_LIBDIR" 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