- MFH iconv fix

- Configure Fix for vpopmail

diff --git a/acinclude.m4 b/acinclude.m4
index db2ffe0c807c7c2f011955f09187e5350ce0c2a3..854f4e2abfd58ded794502a39a968ce31167b6ec 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1198,47 +1198,57 @@ dnl Common setup macro for iconv
 dnl
 AC_DEFUN(PHP_SETUP_ICONV, [
   found_iconv=no
-  
-  AC_CHECK_FUNCS(iconv libiconv, [
+  unset ICONV_DIR
+
+  AC_CHECK_FUNC(iconv, [
     AC_DEFINE(HAVE_ICONV, 1, [ ])
     found_iconv=yes
-  ], [
+  ],[
+    AC_CHECK_FUNC(libiconv,[
+      AC_DEFINE(HAVE_LIBICONV, 1, [ ])
+      found_iconv=yes
+  ],[
 
-    iconv_lib_name=iconv
     for i in $PHP_ICONV /usr/local /usr; do
-      if test -r $i/include/giconv.h || test -r $i/include/iconv.h; then
+      if test -r $i/include/giconv.h; then
         ICONV_DIR=$i
-        if test -r $i/include/giconv.h; then
-          iconv_lib_name=giconv
-        fi
+        iconv_lib_name=giconv
         break
-      fi
+      elif test -r $i/include/iconv.h; then
+        ICONV_DIR=$i
+        iconv_lib_name=iconv
+        break
+         fi
     done
 
     if test -z "$ICONV_DIR"; then
-      AC_MSG_ERROR(Please specify the location of iconv with --with-iconv)
+      AC_MSG_ERROR([Please specify the location of iconv with --with-iconv])
     fi
   
-    if test -f $ICONV_DIR/lib/lib${iconv_lib_name}.a ||
-       test -f $ICONV_DIR/lib/lib${iconv_lib_name}.$SHLIB_SUFFIX_NAME
+    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
       PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
         found_iconv=yes
-        PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
-        AC_DEFINE(HAVE_ICONV, 1, [ ])
         AC_DEFINE(HAVE_LIBICONV, 1, [ ])
       ], [
-        found_iconv=no
+        PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
+          found_iconv=yes
+          AC_DEFINE(HAVE_ICONV, 1, [ ])
+        ])
       ], [
         -L$ICONV_DIR/lib
       ])
     fi
   ])
+  ])
 
-  if test "$found_iconv" = "no"; then
-    $3
-  else
+  if test "$found_iconv" = "yes"; then
+    if test -n "$ICONV_DIR"; then
+      PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
+      PHP_ADD_INCLUDE($ICONV_DIR/include)
+    fi
     $2
-    PHP_ADD_INCLUDE($ICONV_DIR/include)
+ifelse([$3],[],,[else $3])
   fi
 ])

diff --git a/ext/vpopmail/config.m4 b/ext/vpopmail/config.m4
index fbfec2e3cae95ba3f70af72015d25780e6795429..adb050f4e4e9ec8e1588815f908e529376f4f9c9 100644 (file)
--- a/ext/vpopmail/config.m4
+++ b/ext/vpopmail/config.m4
@@ -90,5 +90,5 @@ Use ./configure --with-vpopmail=<vpopmail-home-dir> if necessary)
        fi
        AC_DEFINE_UNQUOTED(HAVE_VPOPMAIL_API,$vpopmail_internal_api,[Interal definition for vpopmail API changes])
 
-       PHP_NEW_EXTENSION(vpopmail, php_vpopmail.c, $ext_shared)
+       PHP_EXTENSION(vpopmail, $ext_shared)
 fi