cvs: /php4 acinclude.m4
| From: | Sascha Schumann | Date: | Sun, 26 Sep 1999 15:38:59 +0000 |
| Subject: | cvs: /php4 acinclude.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-4931@lists.php.net to get a copy of this message | ||
sas Sun Sep 26 11:38:59 1999 EDT
Modified files:
/php4 acinclude.m4
Log:
Avoid specifying standard paths. This might result in compiler problems
(see #1937, #2367)
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.30 php4/acinclude.m4:1.31
--- php4/acinclude.m4:1.30 Sun Sep 26 05:12:55 1999
+++ php4/acinclude.m4 Sun Sep 26 11:38:58 1999
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.30 1999/09/26 09:12:55 sas Exp $
+dnl $Id: acinclude.m4,v 1.31 1999/09/26 15:38:58 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -35,11 +35,13 @@
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"
- PHP_RPATHS="$PHP_RPATHS $ai_p"
- ])
+ if test "$1" != "/usr/lib"; then
+ AC_EXPAND_PATH($1, ai_p)
+ AC_PHP_ONCE(LIBPATH, $ai_p, [
+ EXTRA_LIBS="$EXTRA_LIBS -L$ai_p"
+ PHP_RPATHS="$PHP_RPATHS $ai_p"
+ ])
+ fi
])
dnl
@@ -67,10 +69,12 @@
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"
- ])
+ if test "$1" != "/usr/include"; then
+ AC_EXPAND_PATH($1, ai_p)
+ AC_PHP_ONCE(INCLUDEPATH, $ai_p, [
+ INCLUDES="$INCLUDES -I$ai_p"
+ ])
+ fi
])
dnl