CVS update: php4

Date: Sunday June 20, 1999 @ 14:52 Author: sas Update of /repository/php4 In directory php:/tmp/cvs-serv17490 Modified Files: Makefile.in acinclude.m4 configure.in.in Log Message: Introduce AC_ADD_* macros The use of AC_EXPAND_PATH makes it possible to continue to use relative paths when configuring PHP. (e.g. --with-apache=../apache-1.3.x works again) Index: php4/Makefile.in diff -u php4/Makefile.in:1.37 php4/Makefile.in:1.38 --- php4/Makefile.in:1.37 Sun Jun 20 13:15:29 1999 +++ php4/Makefile.in Sun Jun 20 14:52:37 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.37 1999/06/20 17:15:29 sas Exp $ +# $Id: Makefile.in,v 1.38 1999/06/20 18:52:37 sas Exp $ # prefix = @prefix@ @@ -53,13 +53,13 @@ LDFLAGS_SHLIB_EXPORT = @LDFLAGS_SHLIB_EXPORT@ CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ $(CFLAGS_SHLIB) $(CPPFLAGS) $(INCLUDE) @DEBUG_CFLAGS@ @STRONGHOLD@ $(PROF_CFLAGS) -LDFLAGS = @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT) -L$(ZEND_DIR) +LDFLAGS = @RPATHS@ @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT) -L$(ZEND_DIR) REGCFLAGS = $(CFLAGS) RANLIB = @RANLIB@ YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ -APXS_LDFLAGS = $(EXTRA_LIBS) $(LIBS) +APXS_LDFLAGS = @RPATHS@ $(EXTRA_LIBS) $(LIBS) WARNING_LEVEL = @WARNING_LEVEL@ SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.11 php4/acinclude.m4:1.12 --- php4/acinclude.m4:1.11 Sun Jun 20 13:04:30 1999 +++ php4/acinclude.m4 Sun Jun 20 14:52:38 1999 @@ -1,6 +1,84 @@ -dnl $Id: acinclude.m4,v 1.11 1999/06/20 17:04:30 sas Exp $ +dnl $Id: acinclude.m4,v 1.12 1999/06/20 18:52:38 sas Exp $ dnl dnl This file contains local autoconf functions. + +dnl +dnl AC_PHP_ONCE(namespace, variable, code) +dnl +dnl execute code, if variable is not set in namespace +dnl +AC_DEFUN(AC_PHP_ONCE,[ + unique=echo $ac_n "$2$ac_c" | tr -c a-zA-Z0-9 x + cmd="echo $ac_n \"\$$1$unique$ac_c\"" + if test -n "$unique" && test "eval $cmd" = "" ; then + eval "$1$unique=set" + $3 + fi +]) + +dnl +dnl AC_EXPAND_PATH(path, variable) +dnl +dnl expands path to an absolute path and assigns it to variable +dnl +AC_DEFUN(AC_EXPAND_PATH,[ + if echo "$1" | grep -v '^/' >/dev/null ; then + $2="pwd/$1" + else + $2="$1" + fi + eval "echo \"made from $1 \$$2\"" +]) + +dnl +dnl AC_ADD_LIBPATH(path) +dnl +dnl add a library to linkpath/runpath +dnl +AC_DEFUN(AC_ADD_LIBPATH,[ + AC_EXPAND_PATH($1, ai_p) + AC_PHP_ONCE(LIBPATH, $ai_p, [ + EXTRA_LIBS="$EXTRA_LIBS -L$ai_p" + if test -n "$APXS" ; then + RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" + else + RPATHS="$RPATHS ${ld_runpath_switch}$ai_p" + fi + ]) +]) + +dnl +dnl AC_ADD_INCLUDE(path) +dnl +dnl add a include path +dnl +AC_DEFUN(AC_ADD_INCLUDE,[ + AC_EXPAND_PATH($1, ai_p) + AC_PHP_ONCE(INCLUDEPATH, $ai_p, [ + INCLUDES="$INCLUDES -I$ai_p" + ]) +]) + +dnl +dnl AC_ADD_LIBRARY(library) +dnl +dnl add a library to the link line +dnl +AC_DEFUN(AC_ADD_LIBRARY,[ + AC_PHP_ONCE(LIBRARY, $1, [ + EXTRA_LIBS="$EXTRA_LIBS -l$1" + ]) +]) + +dnl +dnl AC_ADD_LIBRARY_WITH_PATH(library, path) +dnl +dnl add a library to the link line and path to linkpath/runpath +dnl +AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[ + AC_ADD_LIBPATH($2) + AC_ADD_LIBRARY($1) +]) dnl Index: php4/configure.in.in diff -u php4/configure.in.in:1.38 php4/configure.in.in:1.39 --- php4/configure.in.in:1.38 Thu Jun 17 11:45:26 1999 +++ php4/configure.in.in Sun Jun 20 14:52:38 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.38 1999/06/17 15:45:26 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.39 1999/06/20 18:52:38 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -333,7 +333,7 @@ if test "$withval" = "yes"; then withval=apxs fi - APXS="$withval" + AC_EXPAND_PATH($withval, APXS) APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp4.so @@ -372,6 +372,7 @@ fi if test "$withval" != "no"; then if test -f $withval/src/include/httpd.h; then + AC_EXPAND_PATH($withval, withval) APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix" APACHE_TARGET=$withval/src/modules/php4 if test ! -d $APACHE_TARGET; then @@ -429,6 +430,7 @@ fi if test "$withval" != "no"; then # For Apache 1.2.x + AC_EXPAND_PATH($withval, withval) if test -f $withval/src/httpd.h; then APACHE_INCLUDE=-I$withval/src APACHE_TARGET=$withval/src @@ -866,6 +868,7 @@ AC_SUBST(CFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB) AC_SUBST(LDFLAGS_SHLIB_EXPORT) +AC_SUBST(RPATHS) PHP_BUILD_DATE=date '+%Y-%m-%d' AC_SUBST(PHP_BUILD_DATE)