CVS update: php3
| From: | rasmus | Date: | Thu, 19 Nov 1998 15:54:57 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2483@lists.php.net to get a copy of this message | ||
Date: Thursday November 19, 1998 @ 10:54
Author: rasmus
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv18537
Modified Files:
configure.in
Log Message:
apxs fix
Index: php3/configure.in
diff -c php3/configure.in:1.277 php3/configure.in:1.278
*** php3/configure.in:1.277 Tue Nov 17 18:21:15 1998
--- php3/configure.in Thu Nov 19 10:54:56 1998
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.277 1998/11/17 23:21:15 tommay Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.278 1998/11/19 15:54:56 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 46,51 ****
--- 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,[
***************
*** 56,64 ****
--- 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
***************
*** 921,927 ****
fi
fi
MYSQL_INCLUDE=-I$MYSQL_INCDIR
! MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR"
MYSQL_LIBS=-lmysqlclient
AC_DEFINE(HAVE_MYSQL)
--- 924,934 ----
fi
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
MYSQL_LIBS=-lmysqlclient
AC_DEFINE(HAVE_MYSQL)
--
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