build fixes: luatex for Solaris 8 (-lresolv), xindy

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

5 files changed, 115 insertions, 8 deletions

diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index e8f31f4a9cd..091d55dfb50 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18034,7 +18034,8 @@ _ACEOF
 
 fi
 # We may need additional libraries for luaTeX.
-# On Solaris -lnsl for gethostbyname() and -lrt for nanosleep().
+# On Solaris -lnsl for gethostbyname(), -lrt for nanosleep(),
+# and maybe -lresolv for inet_aton().
 lua_socketlibs=$socketlibs
 if test "x$kpse_cv_have_win32" = xno; then
   kpse_save_LIBS=$LIBS
@@ -18125,6 +18126,93 @@ if test "$ac_res" != no; then
 
 fi
 
+  { $as_echo "$as_me:$LINENO: checking for library containing inet_aton" >&5
+$as_echo_n "checking for library containing inet_aton... " >&6; }
+if test "${ac_cv_search_inet_aton+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 inet_aton ();
+int
+main ()
+{
+return inet_aton ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv; 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_inet_aton=$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_inet_aton+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_inet_aton+set}" = set; then
+  :
+else
+  ac_cv_search_inet_aton=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5
+$as_echo "$ac_cv_search_inet_aton" >&6; }
+ac_res=$ac_cv_search_inet_aton
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
   LIBS=$kpse_save_LIBS
   { $as_echo "$as_me:$LINENO: checking for library containing nanosleep" >&5
 $as_echo_n "checking for library containing nanosleep... " >&6; }
@@ -18214,6 +18302,17 @@ if test "$ac_res" != no; then
 fi
 
   LIBS=$kpse_save_LIBS
+  case $ac_cv_search_inet_aton in
+  "none required") : ;;
+  no) if test "x$enable_luatex" = xyes; then
+  { $as_echo "$as_me:$LINENO: WARNING: Sorry, no inet_aton(): can not build luaTeX" >&5
+$as_echo "$as_me: WARNING: Sorry, no inet_aton(): can not build luaTeX" >&2;}
+                        enable_luatex=no
+fi
+ ;;
+  *) lua_socketlibs="$lua_socketlibs $ac_cv_search_inet_aton" ;;
+esac
+
   case $ac_cv_search_gethostbyname in
   "none required") : ;;
   no) if test "x$enable_luatex" = xyes; then
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index fe560ea0419..573ff4b30c5 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -84,14 +84,22 @@ if test "x$enable_ipc" = xyes; then
    AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])
 fi
 # We may need additional libraries for luaTeX.
-# On Solaris -lnsl for gethostbyname() and -lrt for nanosleep().
+# On Solaris -lnsl for gethostbyname(), -lrt for nanosleep(),
+# and maybe -lresolv for inet_aton().
 lua_socketlibs=$socketlibs
 if test "x$kpse_cv_have_win32" = xno; then
   kpse_save_LIBS=$LIBS
   AC_SEARCH_LIBS([gethostbyname], [nsl])
+  AC_SEARCH_LIBS([inet_aton], [resolv])
   LIBS=$kpse_save_LIBS
   AC_SEARCH_LIBS([nanosleep], [rt])
   LIBS=$kpse_save_LIBS
+  AS_CASE([$ac_cv_search_inet_aton],
+          ["none required"], [],
+          [no], [AS_IF([test "x$enable_luatex" = xyes],
+                       [AC_MSG_WARN([Sorry, no inet_aton(): can not build luaTeX])
+                        enable_luatex=no])],
+              [lua_socketlibs="$lua_socketlibs $ac_cv_search_inet_aton"])
   AS_CASE([$ac_cv_search_gethostbyname],
           ["none required"], [],
           [no], [AS_IF([test "x$enable_luatex" = xyes],
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index ae92948f17d..ba0ab2c488f 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -3982,7 +3982,7 @@ $as_echo "$as_me: error: Unable to find a LaTeX application" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-;
+
 fi
 
 
@@ -4056,7 +4056,7 @@ $as_echo "$as_me: error: Unable to find a PDFLaTeX application" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-;
+
 fi
 
 
diff --git a/Build/source/utils/xindy/m4/ac_prog_latex.m4 b/Build/source/utils/xindy/m4/ac_prog_latex.m4
index 4dc20e9db70..3571f5833b0 100644
--- a/Build/source/utils/xindy/m4/ac_prog_latex.m4
+++ b/Build/source/utils/xindy/m4/ac_prog_latex.m4
@@ -9,11 +9,11 @@ dnl @version 2005-01-21
 dnl @license GPLWithACException
 
 AC_DEFUN([AC_PROG_LATEX],[
-AC_CHECK_PROGS(latex,[latex elatex lambda],no)
+AC_CHECK_PROGS([latex], [latex elatex lambda], [no])
 export latex;
 if test $latex = "no" ;
 then
-	TL_MSG_ERROR([Unable to find a LaTeX application]);
+	TL_MSG_ERROR([Unable to find a LaTeX application])
 fi
 AC_SUBST(latex)
 ])
diff --git a/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4 b/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
index c7e20b5c226..878dc7b3007 100644
--- a/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
+++ b/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
@@ -9,11 +9,11 @@ dnl @version 2005-01-21
 dnl @license GPLWithACException
 
 AC_DEFUN([AC_PROG_PDFLATEX],[
-AC_CHECK_PROGS(pdflatex,[pdflatex],no)
+AC_CHECK_PROGS([pdflatex], [pdflatex], [no])
 export pdflatex;
 if test $pdflatex = "no" ;
 then
-	TL_MSG_ERROR([Unable to find a PDFLaTeX application]);
+	TL_MSG_ERROR([Unable to find a PDFLaTeX application])
 fi
 AC_SUBST(pdflatex)
 ])