CVS update: php3

Date: Sunday June 20, 1999 @ 10:26 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv29164 Modified Files: aclocal.m4 Log Message: use absolute paths only Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.38 php3/aclocal.m4:1.39 --- php3/aclocal.m4:1.38 Sun Jun 20 08:38:41 1999 +++ php3/aclocal.m4 Sun Jun 20 10:26:50 1999 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.38 1999/06/20 12:38:41 sas Exp $ +dnl $Id: aclocal.m4,v 1.39 1999/06/20 14:26:50 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -20,17 +20,32 @@ ]) 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,[ + ai_expand="cd $1 && pwd" + if test -n "$ai_expand" ; then + $2="$ai_expand" + else + $2="$1" + fi +]) + +dnl dnl AC_ADD_LIBPATH(path) dnl dnl add a library to linkpath/runpath dnl AC_DEFUN(AC_ADD_LIBPATH,[ - AC_PHP_ONCE(LIBPATH, $1, [ - EXTRA_LIBS="$EXTRA_LIBS -L$1" + 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}$1'" + RPATHS="$RPATHS ${apxs_runpath_switch}$ai_p'" else - RPATHS="$RPATHS ${ld_runpath_switch}$1" + RPATHS="$RPATHS ${ld_runpath_switch}$ai_p" fi ]) ]) @@ -41,8 +56,9 @@ dnl add a include path dnl AC_DEFUN(AC_ADD_INCLUDE,[ - AC_PHP_ONCE(INCLUDEPATH, $1, [ - INCLUDES="$INCLUDES -I$1" + AC_EXPAND_PATH($1, ai_p) + AC_PHP_ONCE(INCLUDEPATH, $ai_p, [ + INCLUDES="$INCLUDES -I$ai_p" ]) ])