moriyoshi Sun Jul 6 13:51:46 2003 EDT
Modified files:
/php-src/ext/iconv config.m4
Log:
Simplified config scripts
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.19 php-src/ext/iconv/config.m4:1.20
--- php-src/ext/iconv/config.m4:1.19 Thu Oct 31 15:23:53 2002
+++ php-src/ext/iconv/config.m4 Sun Jul 6 13:51:46 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.19 2002/10/31 20:23:53 moriyoshi Exp $
+dnl $Id: config.m4,v 1.20 2003/07/06 17:51:46 moriyoshi Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -16,24 +16,18 @@
if test "$iconv_avail" != "no"; then
iconv_cflags_save="$CFLAGS"
CFLAGS="$CFLAGS $INCLUDES"
+ if test "$PHP_ICONV" != "yes" -a -d "$PHP_ICONV/include"; then
+ CFLAGS="$CFLAGS -I$PHP_ICONV/include"
+ fi
AC_MSG_CHECKING([if iconv supports errno])
AC_TRY_RUN([
#define LIBICONV_PLUG
#include <iconv.h>
#include <errno.h>
-#if defined(_LIBICONV_H)
-#define icv_open(a, b) libiconv_open(a, b)
-#define icv_close(a) libiconv_close(a)
-#define icv(a, b, c, d, e) libiconv(a, b, c, d, e)
-#else
-#define icv_open(a, b) iconv_open(a, b)
-#define icv_close(a) iconv_close(a)
-#define icv(a, b, c, d, e) iconv(a, b, c, d, e)
-#endif
int main() {
iconv_t cd;
- cd = icv_open( "*blahblah*", "*blahblah*" );
+ cd = iconv_open( "*blahblah*", "*blahblah*" );
if( cd == (iconv_t)(-1) ) {
if( errno == EINVAL ) {
return 0;
@@ -41,7 +35,7 @@
return 1;
}
}
- icv_close( cd );
+ iconv_close( cd );
return 2;
}
],[
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
