diff options
| author | Derick Rethans <derick@php.net> | 2004-12-06 20:39:20 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2004-12-06 20:39:20 +0000 |
| commit | 48b118968fa7a13397bf0e97e0ca930d31a17c9d (patch) | |
| tree | eab639d23a4accc5a9aec30000b628c5ebfdd577 /acinclude.m4 | |
| parent | 2980ab0cdc95f2da6161e2343089a87a384f240a (diff) | |
| download | php-git-48b118968fa7a13397bf0e97e0ca930d31a17c9d.tar.gz | |
- MF43: Install the iconv extension headers to <installpath>/ext/iconv so that
external extensions can use them.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 93b7a54d1f..00712b14ee 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -21,12 +21,12 @@ AC_DEFUN(PHP_PROG_RE2C,[ ]) -dnl PHP_DEFINE(WHAT[, value]) +dnl PHP_DEFINE(WHAT[, value[, directory]]) dnl dnl Creates builddir/include/what.h and in there #define WHAT value dnl AC_DEFUN([PHP_DEFINE],[ - [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > include/php_]translit($1,A-Z,a-z)[.h] + [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > ]ifelse([$3],,[include],[$3])[/php_]translit($1,A-Z,a-z)[.h] ]) dnl PHP_INIT_BUILD_SYSTEM @@ -1692,16 +1692,19 @@ AC_DEFUN([PHP_SETUP_ICONV], [ found_iconv=no unset ICONV_DIR + echo > ext/iconv/php_have_libiconv.h + echo > ext/iconv/php_have_iconv.h + dnl dnl Check libc first if no path is provided in --with-iconv dnl if test "$PHP_ICONV" = "yes"; then AC_CHECK_FUNC(iconv, [ - PHP_DEFINE(HAVE_ICONV) + PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) found_iconv=yes ],[ AC_CHECK_FUNC(libiconv,[ - PHP_DEFINE(HAVE_LIBICONV) + PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) found_iconv=yes ]) ]) @@ -1734,11 +1737,11 @@ AC_DEFUN([PHP_SETUP_ICONV], [ then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes - PHP_DEFINE(HAVE_LIBICONV) + PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) ], [ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [ found_iconv=yes - PHP_DEFINE(HAVE_ICONV) + PHP_DEFINE(HAVE_ICONV,1,[ext/iconv]) ], [], [ -L$ICONV_DIR/$PHP_LIBDIR ]) |