fixed check for iconv, rearranged some stuff

1 files changed, 23 insertions, 5 deletions

diff --git a/configure.in b/configure.in
index 79209f5..3bb27b2 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,20 @@ size_t x = strftime(s, 5, "%a", localtime(&t));
 ],
 [AC_MSG_RESULT(no)])
 
+AC_MSG_CHECKING([iconv])
+AC_TRY_COMPILE(
+[#include <iconv.h>],
+[iconv_t cd = iconv_open("", "")],
+HAVE_ICONV=yes, 
+HAVE_ICONV=no)
+
+if test x"$HAVE_ICONV" = x"yes"; then
+    AC_DEFINE(HAVE_ICONV, 1, "iconv")
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([no])
+fi
+
 AC_CHECK_LIB(nsl, t_open, LIBS="$LIBS -lnsl")
 AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 
@@ -88,6 +102,13 @@ AC_CHECK_LIB(X11, XOpenDisplay,
 
 LIBS="$LIBS $X_EXTRA_LIBS"
 
+AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
+
+AC_CHECK_PROGS(gencat_cmd, gencat)
+if test x$gencat_cmd = "x"; then
+  NLS=""
+fi
+
 Xext_lib=""
 
 dnl Check for XShape extension support and proper library files.
@@ -257,12 +278,9 @@ AC_ARG_ENABLE(nls,
 )
 AC_SUBST(NLS)
 
-AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
 
-AC_CHECK_PROGS(gencat_cmd, gencat)
-if test x$gencat_cmd = "x"; then
-  NLS=""
-fi
+
+
 
 
 dnl Check for new timed pixmap cache