diff options
| author | foobar <sniper@php.net> | 2001-06-01 06:26:22 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-06-01 06:26:22 +0000 |
| commit | 3a1b61c07d152e93744de485a3b7e7ab5db22b12 (patch) | |
| tree | 349c431b5d9d0d840a1642e6b59ddba653ed8776 | |
| parent | 58d35ea7785c9f9a7008c6bce7b75e64bed979cc (diff) | |
| download | php-git-3a1b61c07d152e93744de485a3b7e7ab5db22b12.tar.gz | |
Fix bug: #9009.
| -rw-r--r-- | acinclude.m4 | 11 | ||||
| -rw-r--r-- | ext/odbc/config.m4 | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3d561c71d2..b25a35bd98 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -684,15 +684,20 @@ 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 path. +dnl if before is 1, add in the beginning of INCLUDES. 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 ]) diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index cad7c443bb..cb85553a3a 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -366,7 +366,7 @@ AC_ARG_WITH(iodbc, fi if test "$withval" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) - PHP_ADD_INCLUDE($withval/include) + PHP_ADD_INCLUDE($withval/include, 1) ODBC_TYPE=iodbc ODBC_INCLUDE=-I$withval/include ODBC_LFLAGS=-L$withval/lib |