--- aclocal.m4.orig	Fri Feb 25 18:59:44 2005
+++ aclocal.m4	Sun May 29 03:27:04 2005
@@ -563,74 +563,72 @@
     jm_cv_func_iconv="no"
     jm_cv_lib_iconv=""
     jm_cv_giconv=no
-    jm_save_LIBS="$LIBS"
-    LIBS="$LIBS -lbiconv"
+    dnl Check for include in funny place but no lib needed
     AC_TRY_LINK([#include <stdlib.h>
-#include <biconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
+#include <giconv.h>],
+      [iconv_t cd = iconv_open("","");
+	iconv(cd,NULL,NULL,NULL,NULL);
+        iconv_close(cd);],
       jm_cv_func_iconv=yes
-      jm_cv_biconv=yes
-      jm_cv_include="biconv.h"
-      jm_cv_lib_iconv="biconv")
-      LIBS="$jm_save_LIBS"
-
-    dnl Check for include in funny place but no lib needed
-    if test "$jm_cv_func_iconv" != yes; then 
+      jm_cv_include="giconv.h"
+      jm_cv_giconv="yes"
+      jm_cv_lib_iconv="")
+    dnl Standard iconv.h include, lib in glibc or libc ...
+    if test "$jm_cv_func_iconv" != yes; then
       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_func_iconv=yes
-         jm_cv_include="giconv.h"
-         jm_cv_giconv="yes"
-         jm_cv_lib_iconv="")
-
-      dnl Standard iconv.h include, lib in glibc or libc ...
-      if test "$jm_cv_func_iconv" != yes; then
-        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_include="iconv.h"
-           jm_cv_func_iconv=yes
-           jm_cv_lib_iconv="")
+	[iconv_t cd = iconv_open("","");
+          iconv(cd,NULL,NULL,NULL,NULL);
+          iconv_close(cd);],
+        jm_cv_include="iconv.h"
+        jm_cv_func_iconv=yes
+        jm_cv_lib_iconv="")
 
-          if test "$jm_cv_lib_iconv" != yes; then
-            jm_save_LIBS="$LIBS"
-            LIBS="$LIBS -lgiconv"
-            AC_TRY_LINK([#include <stdlib.h>
+      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_include="giconv.h"
-              jm_cv_giconv=yes
-              jm_cv_lib_iconv="giconv")
-
-           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>
+	  [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_include="giconv.h"
+          jm_cv_giconv=yes
+          jm_cv_lib_iconv="giconv")
+	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_include="iconv.h"
-            jm_cv_func_iconv=yes
-            jm_cv_lib_iconv="iconv")
-          LIBS="$jm_save_LIBS"
-        fi
+	    [iconv_t cd = iconv_open("","");
+	      iconv(cd,NULL,NULL,NULL,NULL);
+	      iconv_close(cd);],
+	    jm_cv_include="iconv.h"
+	    jm_cv_func_iconv=yes
+	    jm_cv_lib_iconv="iconv")
+	  LIBS="$jm_save_LIBS"
+	  
+	  if test "$jm_cv_func_iconv" != yes; then 
+	    jm_save_LIBS="$LIBS"
+	    LIBS="$LIBS -lbiconv"
+	    AC_TRY_LINK([#include <stdlib.h>
+#include <biconv.h>],
+	      [iconv_t cd = iconv_open("","");
+		iconv(cd,NULL,NULL,NULL,NULL);
+		iconv_close(cd);],
+	      jm_cv_func_iconv=yes
+	      jm_cv_biconv=yes
+	      jm_cv_include="biconv.h"
+	      jm_cv_lib_iconv="biconv")
+	    LIBS="$jm_save_LIBS"
+	  fi
+	fi
       fi
     fi
-  fi
   if test "$jm_cv_func_iconv" = yes; then
     if test "$jm_cv_giconv" = yes; then
       AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])