From 7468d1fc0386500862f9f28c9be0002728281517 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sat, 25 Aug 2007 13:21:44 +0000
Subject: [PATCH] Changed iconv search

---
 configure    | 62 +++++++++++++++++++---------------------------------
 configure.ac | 18 ++++++++-------
 2 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/configure b/configure
index 632c42b2..0045dcf7 100755
--- a/configure
+++ b/configure
@@ -5660,6 +5660,7 @@ fi
 #
 # Support for iconv, check libc first.
 #
+result="no"
 { echo "$as_me:$LINENO: checking for iconv_open" >&5
 echo $ECHO_N "checking for iconv_open... $ECHO_C" >&6; }
 if test "${ac_cv_func_iconv_open+set}" = set; then
@@ -5744,12 +5745,14 @@ echo "${ECHO_T}$ac_cv_func_iconv_open" >&6; }
 if test $ac_cv_func_iconv_open = yes; then
   result=yes
 else
-  { echo "$as_me:$LINENO: checking for library containing iconv_open" >&5
-echo $ECHO_N "checking for library containing iconv_open... $ECHO_C" >&6; }
-if test "${ac_cv_search_iconv_open+set}" = set; then
+  #  AC_SEARCH_LIBS(iconv_open,iconv,result=yes,result=no)
+  { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
+echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
+if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_func_search_save_LIBS=$LIBS
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-liconv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5772,14 +5775,7 @@ return iconv_open ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' iconv; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -5797,41 +5793,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_search_iconv_open=$ac_res
+  ac_cv_lib_iconv_iconv_open=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
+	ac_cv_lib_iconv_iconv_open=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_iconv_open+set}" = set; then
-  break
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-done
-if test "${ac_cv_search_iconv_open+set}" = set; then
-  :
-else
-  ac_cv_search_iconv_open=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_iconv_open" >&5
-echo "${ECHO_T}$ac_cv_search_iconv_open" >&6; }
-ac_res=$ac_cv_search_iconv_open
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
+echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6; }
+if test $ac_cv_lib_iconv_iconv_open = yes; then
   result=yes
 else
   result=no
 fi
 
-#  AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
   if test "$result" = "yes"; then
-#    LIBS="$LIBS -liconv"
+    LIBS="$LIBS -liconv"
+  fi
+
+fi
+
+if test "$result" = "yes"; then
 
 for ac_header in iconv.h
 do
@@ -5928,9 +5916,7 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no:
-fi
-
+  yes:no: )
     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
@@ -5974,9 +5960,7 @@ fi
 
 done
 
-  fi
-)
-
+fi
 
 #
 # Checks for header files.
diff --git a/configure.ac b/configure.ac
index 4d91ed34..a589b22f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,15 +196,17 @@ fi
 #
 # Support for iconv, check libc first.
 #
-AC_CHECK_HEADERS(iconv.h)
-AC_CHECK_FUNC(iconv_open,,
-  AC_SEARCH_LIBS(iconv_open, iconv)
-#  AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
-#  if test "$result" = "yes"; then
-#    LIBS="$LIBS -liconv"
-#  fi
+result="no"
+AC_CHECK_FUNC(iconv_open,result=yes,
+#  AC_SEARCH_LIBS(iconv_open,iconv,result=yes,result=no)
+  AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
+  if test "$result" = "yes"; then
+    LIBS="$LIBS -liconv"
+  fi
 )
-
+if test "$result" = "yes"; then
+  AC_CHECK_HEADERS(iconv.h)
+fi
 
 #
 # Checks for header files.