CVS update: php3
| From: | rasmus | Date: | Tue, 24 Nov 1998 04:18:26 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2569@lists.php.net to get a copy of this message | ||
Date: Monday November 23, 1998 @ 23:18
Author: rasmus
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv8715
Modified Files:
Makefile.in configure.in
Log Message:
A few more apxs tweaks
Index: php3/Makefile.in
diff -c php3/Makefile.in:1.273 php3/Makefile.in:1.274
*** php3/Makefile.in:1.273 Tue Nov 17 18:21:13 1998
--- php3/Makefile.in Mon Nov 23 23:18:24 1998
***************
*** 24,30 ****
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.273 1998/11/17 23:21:13 tommay Exp $
#
prefix = @prefix@
--- 24,30 ----
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.274 1998/11/24 04:18:24 rasmus Exp $
#
prefix = @prefix@
***************
*** 115,121 ****
$(RANLIB) libmodphp3-so.a
libphp3.so: mod_php3.c libmodphp3-so.a
! $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a $(LIBS)
docs:
cd doc; $(MAKE)
--- 115,121 ----
$(RANLIB) libmodphp3-so.a
libphp3.so: mod_php3.c libmodphp3-so.a
! $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a
docs:
cd doc; $(MAKE)
Index: php3/configure.in
diff -c php3/configure.in:1.279 php3/configure.in:1.280
*** php3/configure.in:1.279 Fri Nov 20 09:31:32 1998
--- php3/configure.in Mon Nov 23 23:18:25 1998
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.279 1998/11/20 14:31:32 cschneid Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.280 1998/11/24 04:18:25 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 57,63 ****
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"
--- 57,63 ----
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"
***************
*** 925,931 ****
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
--- 925,931 ----
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
--
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