sniper Thu Apr 7 16:39:03 2005 EDT
Modified files:
/php-src acinclude.m4
Log:
- Cleanup a bit. And make use of shtool mkdir
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.297&r2=1.298&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.297 php-src/acinclude.m4:1.298
--- php-src/acinclude.m4:1.297 Thu Mar 10 17:35:18 2005
+++ php-src/acinclude.m4 Thu Apr 7 16:39:02 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.297 2005/03/10 22:35:18 rrichards Exp $
+dnl $Id: acinclude.m4,v 1.298 2005/04/07 20:39:02 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2205,8 +2205,7 @@
unset ICONV_DIR
# Create the directories for a VPATH build:
- test -d ext || mkdir ext
- test -d ext/iconv || mkdir ext/iconv
+ $php_shtool mkdir -p ext/iconv
echo > ext/iconv/php_have_bsd_iconv.h
echo > ext/iconv/php_have_glibc_iconv.h
@@ -2221,11 +2220,11 @@
dnl
if test "$PHP_ICONV" = "yes"; then
AC_CHECK_FUNC(iconv, [
- PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
found_iconv=yes
],[
AC_CHECK_FUNC(libiconv,[
PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
+ AC_DEFINE(HAVE_LIBICONV, 1, [ ])
found_iconv=yes
])
])
@@ -2259,10 +2258,10 @@
PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
found_iconv=yes
PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
+ AC_DEFINE(HAVE_LIBICONV,1,[ ])
], [
PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
found_iconv=yes
- PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
], [], [
-L$ICONV_DIR/$PHP_LIBDIR
])
@@ -2273,8 +2272,9 @@
fi
if test "$found_iconv" = "yes"; then
+ PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
+ AC_DEFINE(HAVE_ICONV,1,[ ])
if test -n "$ICONV_DIR"; then
- AC_DEFINE(HAVE_ICONV, 1, [ ])
PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1)
PHP_ADD_INCLUDE($ICONV_DIR/include)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
