diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2001-06-10 19:52:56 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2001-06-10 19:52:56 +0000 |
| commit | c7aa37f52a88bc48650dba3c35c02490cfecfad4 (patch) | |
| tree | 5f4d65cece5afd551fdfc95aa5681837520ba55c | |
| parent | cf7259299c4ed028b3c17fe3ae683a03a5f4d01b (diff) | |
| download | php-git-c7aa37f52a88bc48650dba3c35c02490cfecfad4.tar.gz | |
Re-add Sascha's PHP_ADD_INCLUDE() second parameter patch - not sure how
that got yanked in my fix.
| -rw-r--r-- | acinclude.m4 | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 51c0ebe042..99ec07ff50 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -263,7 +263,8 @@ AC_MSG_RESULT($ext_output) dnl dnl PHP_ARG_WITH(arg-name, check message, help text[, default-val]) dnl Sets PHP_ARG_NAME either to the user value or to the default value. -dnl default-val defaults to no. +dnl default-val defaults to no. This will also set the variable ext_shared, +dnl and will overwrite any previous variable of that name. dnl AC_DEFUN(PHP_ARG_WITH,[ PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)) @@ -278,7 +279,8 @@ PHP_ARG_ANALYZE($5) dnl dnl PHP_ARG_ENABLE(arg-name, check message, help text[, default-val]) dnl Sets PHP_ARG_NAME either to the user value or to the default value. -dnl default-val defaults to no. +dnl default-val defaults to no. This will also set the variable ext_shared, +dnl and will overwrite any previous variable of that name. dnl AC_DEFUN(PHP_ARG_ENABLE,[ PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_)) @@ -587,15 +589,19 @@ AC_DEFUN(PHP_BUILD_RPATH,[ ]) dnl -dnl PHP_ADD_INCLUDE(path) +dnl PHP_ADD_INCLUDE(path [,before]) dnl -dnl add a include path +dnl add a include pat, if before is 1, add in front. dnl AC_DEFUN(PHP_ADD_INCLUDE,[ if test "$1" != "/usr/include"; then PHP_EXPAND_PATH($1, ai_p) AC_PHP_ONCE(INCLUDEPATH, $ai_p, [ - INCLUDES="$INCLUDES -I$ai_p" + if test "$2"; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" + fi ]) fi ]) |