diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-31 07:37:05 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-31 07:37:05 +0000 |
commit | 8357a9ca3414c62c3d1a0e6d48c90d6fe2152e61 (patch) | |
tree | 6b3692bd3e1a7bb6331541e3212e1a5abeedae86 /Build/source/texk/web2c | |
parent | f5dc0cfcd8ce5671cc439c6b5786ad8f394a6834 (diff) |
new build system: handling of socketlibs, prepare for texk/texlive/
git-svn-id: svn://tug.org/texlive/trunk@12583 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/aclocal.m4 | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/c-auto.in | 14 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 116 | ||||
-rw-r--r-- | Build/source/texk/web2c/configure.ac | 34 | ||||
-rw-r--r-- | Build/source/texk/web2c/doc/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/ChangeLog | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/man/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/mpware/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/otps/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/window/Makefile.in | 1 |
13 files changed, 125 insertions, 50 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index d8936ce70aa..8662f31840a 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4 index faf0e3d5dd3..b74dce3a433 100644 --- a/Build/source/texk/web2c/aclocal.m4 +++ b/Build/source/texk/web2c/aclocal.m4 @@ -1022,6 +1022,7 @@ m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-lex.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) m4_include([../../m4/kpse-obsdcompat-flags.m4]) +m4_include([../../m4/kpse-socket-libs.m4]) m4_include([../../m4/kpse-web2c.m4]) m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/kpse-xpdf-flags.m4]) diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in index 0990d54a279..82438d1d59b 100644 --- a/Build/source/texk/web2c/c-auto.in +++ b/Build/source/texk/web2c/c-auto.in @@ -40,9 +40,15 @@ /* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */ #undef FUNNY_CORE_DUMP +/* Define to 1 if you have the `access' function. */ +#undef HAVE_ACCESS + /* Define to 1 if you have the <assert.h> header file. */ #undef HAVE_ASSERT_H +/* Define to 1 if you have the `atoi' function. */ +#undef HAVE_ATOI + /* Define to 1 if you have the `bcmp' function. */ #undef HAVE_BCMP @@ -83,7 +89,7 @@ /* Define to 1 if you have the <iostream> header file. */ #undef HAVE_IOSTREAM -/* Define to 1 if you have the <langinfo_h> header file. */ +/* Define to 1 if you have the <langinfo.h> header file. */ #undef HAVE_LANGINFO_H /* Define to 1 if you have the `posix' library (-lposix). */ @@ -173,9 +179,15 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H +/* Define to 1 if you have the <sys/timeb.h> header file. */ +#undef HAVE_SYS_TIMEB_H + /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the <sys/wait.h> header file. */ +#undef HAVE_SYS_WAIT_H + /* Define to 1 if you have the <time.h> header file. */ #undef HAVE_TIME_H diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index c5153d02e20..67984200eb3 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -17812,12 +17812,10 @@ else fi -# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too? -# See ac_path_xtra. -if test "x$enable_ipc:$enable_luatex" != xno:no; then -kpse_save_LIBS=$LIBS -{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 +if test "x$kpse_cv_have_win32" = xno; then + kpse_save_LIBS=$LIBS + { $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 $as_echo_n "checking for library containing connect... " >&6; } if test "${ac_cv_search_connect+set}" = set; then $as_echo_n "(cached) " >&6 @@ -17845,7 +17843,7 @@ return connect (); return 0; } _ACEOF -for ac_lib in '' socket nsl wsock32; do +for ac_lib in '' socket nsl; do if test -z "$ac_lib"; then ac_res="none required" else @@ -17904,8 +17902,78 @@ if test "$ac_res" != no; then fi -LIBS=$kpse_save_LIBS -case $ac_cv_search_connect in + LIBS=$kpse_save_LIBS +else + { $as_echo "$as_me:$LINENO: checking for main in -lwsock32" >&5 +$as_echo_n "checking for main in -lwsock32... " >&6; } +if test "${ac_cv_lib_wsock32_main+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lwsock32 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + 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 + ac_cv_lib_wsock32_main=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_wsock32_main=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wsock32_main" >&5 +$as_echo "$ac_cv_lib_wsock32_main" >&6; } +if test "x$ac_cv_lib_wsock32_main" = x""yes; then + ac_cv_search_connect=wsock32 +else + ac_cv_search_connect=no +fi + +fi + + +if test "x$enable_ipc:$enable_luatex" != xno:no; then + case $ac_cv_search_connect in "none required") : ;; no) if test "x$enable_luatex" = xyes; then { { $as_echo "$as_me:$LINENO: error: Sorry, no socket library: can not build luaTeX" >&5 @@ -17914,12 +17982,14 @@ $as_echo "$as_me: error: Sorry, no socket library: can not build luaTeX" >&2;} else { $as_echo "$as_me:$LINENO: WARNING: no socket library: disabling ipc" >&5 $as_echo "$as_me: WARNING: no socket library: disabling ipc" >&2;} - enable_ipc=no + enable_ipc=no fi ;; *) socketlibs="-l$ac_cv_search_connect" ;; esac +fi + if test "x$enable_ipc" = xyes; then cat >>confdefs.h <<\_ACEOF @@ -17929,9 +17999,6 @@ _ACEOF fi -fi - - if test "x$enable_tex" = xyes; then TEX_TRUE= @@ -18017,13 +18084,7 @@ else XETEX_SYNCTEX_TRUE='#' XETEX_SYNCTEX_FALSE= fi - if false; then - TEX_SYNCTEX_TRUE= - TEX_SYNCTEX_FALSE='#' -else - TEX_SYNCTEX_TRUE='#' - TEX_SYNCTEX_FALSE= -fi + if test "x$enable_aleph:$enable_xetex" = xno:no; then enable_otangle=no else @@ -20722,7 +20783,9 @@ _ACEOF -for ac_func in strerror + + +for ac_func in access atoi strerror do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -20823,7 +20886,9 @@ fi done -for ac_header in errno.h + + +for ac_header in errno.h sys/timeb.h sys/wait.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -22991,7 +23056,7 @@ if test "x$enable_luatex" = xyes; then ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-config.in" -for ac_header in langinfo_h +for ac_header in langinfo.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -24062,13 +24127,6 @@ $as_echo "$as_me: error: conditional \"XETEX_SYNCTEX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${TEX_SYNCTEX_TRUE}" && test -z "${TEX_SYNCTEX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"TEX_SYNCTEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"TEX_SYNCTEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${OTANGLE_TRUE}" && test -z "${OTANGLE_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"OTANGLE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 614c01c8470..5f1a67ffd2f 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -67,30 +67,24 @@ KPSE_CHECK_WIN32 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32]) -# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too? -# See ac_path_xtra. -AS_IF([test "x$enable_ipc:$enable_luatex" != xno:no], [ -kpse_save_LIBS=$LIBS -AC_SEARCH_LIBS([connect], [socket nsl wsock32]) -LIBS=$kpse_save_LIBS -AS_CASE([$ac_cv_search_connect], - ["none required"], [], - [no], [AS_IF([test "x$enable_luatex" = xyes], - [AC_MSG_ERROR([Sorry, no socket library: can not build luaTeX])], - [AC_MSG_WARN([no socket library: disabling ipc]) - enable_ipc=no])], - [socketlibs="-l$ac_cv_search_connect"]) +KPSE_CHECK_SOCKET_LIBS +AS_IF([test "x$enable_ipc:$enable_luatex" != xno:no], + [AS_CASE([$ac_cv_search_connect], + ["none required"], [], + [no], [AS_IF([test "x$enable_luatex" = xyes], + [AC_MSG_ERROR([Sorry, no socket library: can not build luaTeX])], + [AC_MSG_WARN([no socket library: disabling ipc]) + enable_ipc=no])], + [socketlibs="-l$ac_cv_search_connect"])]) AS_IF([test "x$enable_ipc" = xyes], [AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])]) -]) AC_SUBST([socketlibs]) dnl Generate *TEX and ALEPH conditionals. m4_foreach([Kpse_Prog], [kpse_tex_progs], [m4_ifset([Kpse_Prog], [KPSE_XTEX_COND(Kpse_Prog)])])[]dnl -dnl Disable SyncTeX support for TeX. -AM_CONDITIONAL([TEX_SYNCTEX], [false])[]dnl + AS_IF([test "x$enable_aleph:$enable_xetex" = xno:no], [enable_otangle=no], [enable_otangle=yes]) @@ -180,8 +174,8 @@ fi AC_CHECK_SIZEOF([int]) AC_CHECK_SIZEOF([long]) -AC_CHECK_FUNCS([strerror]) -AC_CHECK_HEADERS([errno.h]) +AC_CHECK_FUNCS([access atoi strerror]) +AC_CHECK_HEADERS([errno.h sys/timeb.h sys/wait.h]) dnl FIXME: needed for libpdf -> xpdf ? AC_CHECK_HEADERS([time.h]) @@ -228,9 +222,11 @@ AH_TOP([/* c-auto.h: defines for web2c, as determined by configure. #define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"]) AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) +dnl FIXME: luaTeX requires <unistd.h>, access, and atoi +dnl AS_IF([test "x$enable_luatex" = xyes], [AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in]) -AC_CHECK_HEADERS([langinfo_h]) +AC_CHECK_HEADERS([langinfo.h]) AC_TYPE_LONG_DOUBLE AC_TYPE_LONG_LONG_INT ]) diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 4d661ebc460..85153e6041f 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 2756349bd56..9cca22d70c3 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -7,7 +7,7 @@ * texmfmp.c (mk_shellcmdlist, shell_cmd_is_allowed): not static, so luatex can access. From Taco. -2009-03-27 Taco Hoekwater <taco@luatex.org> +2009-03-27 Taco Hoekwater <taco@luatex.org> * texmfmp.c (parse_options): add #ifndef luaTeX guard for --src-specials, because luaTeX does not implement it. diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 7d6192a5934..b33937ddb54 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index ef20c5baf84..af58e162c75 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ diff --git a/Build/source/texk/web2c/mpware/Makefile.in b/Build/source/texk/web2c/mpware/Makefile.in index dcda668250f..ba5fc514656 100644 --- a/Build/source/texk/web2c/mpware/Makefile.in +++ b/Build/source/texk/web2c/mpware/Makefile.in @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 7f1e581bb44..e5322590687 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 89eeaf37e24..1049d75ea8d 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index 5fc0c8748b6..950c78a2101 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-web2c.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ |