M configure.in → configure.in

@@ -63,6 +63,20 @@ AC_MSG_RESULT(yes)
 ],
 [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")
 
@@ -87,6 +101,13 @@ AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
 )
 
 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=""
 
@@ -257,12 +278,9 @@ AC_MSG_RESULT([no])
 )
 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