moriyoshi Thu Aug 28 02:05:13 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/iconv config.m4
Log:
MFH(r-1.25): add further check for "#include MACRO" style syntax
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.19.2.3 php-src/ext/iconv/config.m4:1.19.2.4
--- php-src/ext/iconv/config.m4:1.19.2.3 Wed Jul 30 17:57:02 2003
+++ php-src/ext/iconv/config.m4 Thu Aug 28 02:05:13 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.19.2.3 2003/07/30 21:57:02 sniper Exp $
+dnl $Id: config.m4,v 1.19.2.4 2003/08/28 06:05:13 moriyoshi Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -114,13 +114,22 @@
AC_DEFINE([ICONV_SUPPORTS_ERRNO],0,[Whether iconv supports error no or not])
])
+ AC_MSG_CHECKING([if your cpp allows macro usage in include lines])
+ AC_TRY_COMPILE([
+#define FOO <$PHP_ICONV_H_PATH>
+#include FOO
+ ], [], [
+ AC_MSG_RESULT([yes])
+ PHP_DEFINE([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>])
+ AC_DEFINE_UNQUOTED([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>], [Path to iconv.h])
+ ], [
+ AC_MSG_RESULT([no])
+ ])
+
CFLAGS="$iconv_cflags_save"
LDFLAGS="$iconv_ldflags_save"
- PHP_DEFINE([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>])
- AC_DEFINE_UNQUOTED([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>], [Path to iconv.h])
-
- PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared)
+ PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,, [-I\"$PHP_ICONV_PREFIX/include\"])
PHP_SUBST(ICONV_SHARED_LIBADD)
else
AC_MSG_ERROR(Please reinstall the iconv library.)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
