--- aclocal.m4.orig	Sat Apr 15 17:33:51 2006
+++ aclocal.m4	Sun Apr 16 05:36:12 2006
@@ -229,7 +229,7 @@
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable libiconv installed).
   AC_MSG_CHECKING(for iconv in $1)
-    jm_cv_func_iconv="no"
+    jm_cv_func_iconv=no
     jm_cv_lib_iconv=no
     jm_cv_giconv=no
     AC_TRY_LINK([#include <stdlib.h>
@@ -246,55 +246,56 @@
         [iconv_t cd = iconv_open("","");
          iconv(cd,NULL,NULL,NULL,NULL);
          iconv_close(cd);],
-        jm_cv_func_iconv=yes)
-
-        if test "$jm_cv_lib_iconv" != yes; then
-          jm_save_LIBS="$LIBS"
-          LIBS="$LIBS -lgiconv"
-          AC_TRY_LINK([#include <stdlib.h>
-#include <giconv.h>],
-            [iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);],
-            jm_cv_lib_iconv=yes
-            jm_cv_func_iconv=yes
-            jm_cv_giconv=yes)
-          LIBS="$jm_save_LIBS"
+        jm_cv_func_iconv=yes
+	jm_cv_giconv=no)
+    fi
 
-      if test "$jm_cv_func_iconv" != yes; then
+    if test "$jm_cv_func_iconv" != yes; then
+      if test "$jm_cv_lib_iconv" != yes; then
         jm_save_LIBS="$LIBS"
-        LIBS="$LIBS -liconv"
+        LIBS="$LIBS -lgiconv"
         AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
           [iconv_t cd = iconv_open("","");
            iconv(cd,NULL,NULL,NULL,NULL);
            iconv_close(cd);],
-          jm_cv_lib_iconv=yes
-          jm_cv_func_iconv=yes)
-        LIBS="$jm_save_LIBS"
+           jm_cv_lib_iconv=yes
+           jm_cv_func_iconv=yes
+           jm_cv_giconv=yes)
+	LIBS="$jm_save_LIBS"
+
+	if test "$jm_cv_func_iconv" != yes; then
+	  jm_save_LIBS="$LIBS"
+	  LIBS="$LIBS -liconv"
+	  AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+	    [iconv_t cd = iconv_open("","");
+	     iconv(cd,NULL,NULL,NULL,NULL);
+	     iconv_close(cd);],
+	     jm_cv_lib_iconv=yes
+	     jm_cv_func_iconv=yes
+	     jm_cv_giconv=no)
+	  LIBS="$jm_save_LIBS"
         fi
       fi
     fi
 
   if test "$jm_cv_func_iconv" = yes; then
+    ICONV_FOUND=yes
     if test "$jm_cv_giconv" = yes; then
       AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
-      AC_MSG_RESULT(yes)
-      ICONV_FOUND=yes
+      if test "$jm_cv_lib_iconv" = yes; then
+	LIBS="$LIBS -lgiconv"
+      fi
     else
       AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
-      AC_MSG_RESULT(yes)
-      ICONV_FOUND=yes
+      if test "$jm_cv_lib_iconv" = yes; then
+	LIBS="$LIBS -liconv"
+      fi
     fi
+    AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
-  fi
-  if test "$jm_cv_lib_iconv" = yes; then
-    if test "$jm_cv_giconv" = yes; then
-      LIBS="$LIBS -lgiconv"
-    else
-      LIBS="$LIBS -liconv"
-    fi
   fi
 ])