more build fixes for Cygwin, Solaris, and probably others

git-svn-id: svn://tug.org/texlive/trunk@12868 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 131 insertions, 222 deletions

diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 06af77c9b5a..e2e53610b01 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18225,7 +18225,7 @@ $as_echo "$as_me: WARNING: Sorry, no gethostbyname(): can not build luaTeX" >&2;
                         enable_luatex=no
 fi
  ;;
-  *) lua_socketlibs="$lua_socketlibs ac_cv_search_gethostbyname" ;;
+  *) lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname" ;;
 esac
 
   case $ac_cv_search_nanosleep in
@@ -18236,7 +18236,7 @@ $as_echo "$as_me: WARNING: Sorry, no nanosleep(): can not build luaTeX" >&2;}
                         enable_luatex=no
 fi
  ;;
-  *) lua_socketlibs="$lua_socketlibs ac_cv_search_nanosleep" ;;
+  *) lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep" ;;
 esac
 
 fi
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 94a56c66719..9b7358e9b08 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -94,13 +94,13 @@ if test "x$kpse_cv_have_win32" = xno; then
           [no], [AS_IF([test "x$enable_luatex" = xyes],
                        [AC_MSG_WARN([Sorry, no gethostbyname(): can not build luaTeX])
                         enable_luatex=no])],
-          [lua_socketlibs="$lua_socketlibs ac_cv_search_gethostbyname"])
+          [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"])
   AS_CASE([$ac_cv_search_nanosleep],
           ["none required"], [],
           [no], [AS_IF([test "x$enable_luatex" = xyes],
                        [AC_MSG_WARN([Sorry, no nanosleep(): can not build luaTeX])
                         enable_luatex=no])],
-          [lua_socketlibs="$lua_socketlibs ac_cv_search_nanosleep"])
+          [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"])
 fi
 AC_SUBST([lua_socketlibs])
 AC_SUBST([ipc_socketlibs])
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 2bbf2f42115..9986dd1b236 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -19284,204 +19284,7 @@ case $with_iconv_libdir in
 esac
 
 xdvi_iconv_save_CPPFLAGS=$CPPFLAGS
-xdvi_iconv_save_LDFLAGS=$LDFLAGS
-xdvi_iconv_save_LIBS=$LIBS
 CPPFLAGS="$iconv_includes $CPPFLAGS"
-LDFLAGS="$iconv_libpath $LDFLAGS"
-# Check if -liconv or -lrecode is needed for iconv()
-{ $as_echo "$as_me:$LINENO: checking for library containing iconv" >&5
-$as_echo_n "checking for library containing iconv... " >&6; }
-if test "${ac_cv_search_iconv+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char iconv ();
-int
-main ()
-{
-return iconv ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' iconv recode; 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
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_iconv=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_iconv+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_iconv+set}" = set; then
-  :
-else
-  ac_cv_search_iconv=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_iconv" >&5
-$as_echo "$ac_cv_search_iconv" >&6; }
-ac_res=$ac_cv_search_iconv
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-case $ac_cv_search_iconv in
-  no | "none required") : ;;
-  *) iconv_libs=$ac_cv_search_iconv ;;
-esac
-
-
-for ac_func in iconv
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
 
 for ac_header in iconv.h
 do
@@ -19633,8 +19436,89 @@ fi
 
 done
 
-if test "x$ac_cv_func_iconv:$ac_cv_header_iconv_h" = xyes:yes; then
-  { $as_echo "$as_me:$LINENO: checking for iconv input type" >&5
+# Check if -liconv or -lrecode is needed for iconv()
+{ $as_echo "$as_me:$LINENO: checking for library containing iconv" >&5
+$as_echo_n "checking for library containing iconv... " >&6; }
+if test "${xdvi_cv_search_iconv+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+xdvi_iconv_save_LDFLAGS=$LDFLAGS
+xdvi_iconv_save_LIBS=$LIBS
+LDFLAGS="$iconv_libpath $LDFLAGS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+  ;
+  return 0;
+}
+_ACEOF
+xdvi_cv_search_iconv=no
+for xdvi_lib in "" -liconv -lrecode; do
+  LIBS="$xdvi_lib $xdvi_iconv_save_LIBS"
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  xdvi_cv_search_iconv=$xdvi_lib
+                  break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+done
+test "x$xdvi_cv_search_iconv" = x && xdvi_cv_search_iconv="none required"
+LDFLAGS=$xdvi_iconv_save_LDFLAGS
+LIBS=$xdvi_iconv_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $xdvi_cv_search_iconv" >&5
+$as_echo "$xdvi_cv_search_iconv" >&6; }
+
+if test "x$xdvi_cv_search_iconv" != xno; then
+  if test "x$xdvi_cv_search_iconv" = "xnone required"; then
+    iconv_libs=
+  else
+    iconv_libs=$xdvi_cv_search_iconv
+  fi
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ICONV 1
+_ACEOF
+
+  if test "x$ac_cv_header_iconv_h" = xyes; then
+    { $as_echo "$as_me:$LINENO: checking for iconv input type" >&5
 $as_echo_n "checking for iconv input type... " >&6; }
 if test "${xdvi_cv_iconv_char_pptr_type+set}" = set; then
   $as_echo_n "(cached) " >&6
@@ -19708,10 +19592,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+  fi
 fi
 CPPFLAGS=$xdvi_iconv_save_CPPFLAGS
-LDFLAGS=$xdvi_iconv_save_LDFLAGS
-LIBS=$xdvi_iconv_save_LIBS
 
 
 
diff --git a/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4
index bbe12f3cba0..4f86a763c52 100644
--- a/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4
@@ -24,36 +24,62 @@ AS_CASE([$with_iconv_libdir],
         [yes | no | ""], [iconv_libpath=],
         [iconv_libpath="-L$with_iconv_libdir"])
 xdvi_iconv_save_CPPFLAGS=$CPPFLAGS
-xdvi_iconv_save_LDFLAGS=$LDFLAGS
-xdvi_iconv_save_LIBS=$LIBS
 CPPFLAGS="$iconv_includes $CPPFLAGS"
-LDFLAGS="$iconv_libpath $LDFLAGS"
-# Check if -liconv or -lrecode is needed for iconv()
-AC_SEARCH_LIBS([iconv], [iconv recode])
-AS_CASE([$ac_cv_search_iconv],
-        [no | "none required"], [:],
-        [iconv_libs=$ac_cv_search_iconv])
-AC_CHECK_FUNCS([iconv])
 AC_CHECK_HEADERS([iconv.h])
-if test "x$ac_cv_func_iconv:$ac_cv_header_iconv_h" = xyes:yes; then
-  XDVI_ICONV_CHAR_PPTR_TYPE
+# Check if -liconv or -lrecode is needed for iconv()
+_XDVI_ICONV_LIB
+if test "x$xdvi_cv_search_iconv" != xno; then
+  if test "x$xdvi_cv_search_iconv" = "xnone required"; then
+    iconv_libs=
+  else
+    iconv_libs=$xdvi_cv_search_iconv
+  fi
+  AC_DEFINE([HAVE_ICONV], 1, [Define to 1 if you have the `iconv' function.])
+  if test "x$ac_cv_header_iconv_h" = xyes; then
+    _XDVI_ICONV_CHAR_PPTR_TYPE
+  fi
 fi
 CPPFLAGS=$xdvi_iconv_save_CPPFLAGS
-LDFLAGS=$xdvi_iconv_save_LDFLAGS
-LIBS=$xdvi_iconv_save_LIBS
 AC_SUBST([iconv_includes])
 AC_SUBST([iconv_libpath])
 AC_SUBST([iconv_libs])
 ]) # XDVI_CHECK_ICONV
 
-# XDVI_ICONV_CHAR_PPTR_TYPE
-# -------------------------
+# _XDVI_ICONV_LIB
+# ---------------
+# Check for library containing iconv(), could be -liconv or -lrecode.
+# Much like AC_SEARCH_LIBS([iconv], [iconv recode]),
+# but needs to '#include <iconv.h>'.
+m4_define([_XDVI_ICONV_LIB],
+[AC_CACHE_CHECK([for library containing iconv],
+                [xdvi_cv_search_iconv],
+[
+xdvi_iconv_save_LDFLAGS=$LDFLAGS
+xdvi_iconv_save_LIBS=$LIBS
+LDFLAGS="$iconv_libpath $LDFLAGS"
+AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#include <stdlib.h>
+#include <iconv.h>]],
+                                  [[iconv_t cd = iconv_open("","");]])])
+xdvi_cv_search_iconv=no
+for xdvi_lib in "" -liconv -lrecode; do
+  LIBS="$xdvi_lib $xdvi_iconv_save_LIBS"
+  AC_LINK_IFELSE([],
+                 [xdvi_cv_search_iconv=$xdvi_lib
+                  break])
+done
+test "x$xdvi_cv_search_iconv" = x && xdvi_cv_search_iconv="none required"
+LDFLAGS=$xdvi_iconv_save_LDFLAGS
+LIBS=$xdvi_iconv_save_LIBS])
+]) # _XDVI_ICONV_LIB
+
+# _XDVI_ICONV_CHAR_PPTR_TYPE
+# --------------------------
 # Check whether iconv takes a 'const char **' or a 'char **' input argument.
 # According to IEEE 1003.1, `char **' is correct, but e.g. librecode
 # uses `const char **'.
 # Inspired by Autoconf's AC_FUNC_SELECT_ARGTYPES we do this without the need
 # to run a test program or to use C++.
-m4_define([XDVI_ICONV_CHAR_PPTR_TYPE],
+m4_define([_XDVI_ICONV_CHAR_PPTR_TYPE],
 [AC_CACHE_CHECK([for iconv input type],
                 [xdvi_cv_iconv_char_pptr_type],
    [AC_COMPILE_IFELSE(
@@ -82,4 +108,4 @@ m4_define([XDVI_ICONV_CHAR_PPTR_TYPE],
       [xdvi_cv_iconv_char_pptr_type='const char **'])])
 AC_DEFINE_UNQUOTED([ICONV_CHAR_PPTR_TYPE], [$xdvi_cv_iconv_char_pptr_type],
                    [Define the type of the iconv input string (char ** or const char **)])
-]) # XDVI_ICONV_CHAR_PPTR_TYPE
+]) # _XDVI_ICONV_CHAR_PPTR_TYPE