diff options
| author | foobar <sniper@php.net> | 2001-06-01 06:26:34 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-06-01 06:26:34 +0000 |
| commit | f56b195314f8d08240fad1f08dbce78b8b2339a0 (patch) | |
| tree | 85a95155d6bc8c42c342a798b3a2c3e6dc1d3336 | |
| parent | 8fd4280b4ad40935c6eec12bc0bb144896d22e8b (diff) | |
| download | php-git-f56b195314f8d08240fad1f08dbce78b8b2339a0.tar.gz | |
MFH
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | ext/odbc/config.m4 | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 51960ef2c5..328e2b5b43 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -589,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 ]) 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 |