From 101b3db9c6d85296fe23c92c4def3793b6580b70 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 22 Apr 2009 11:22:16 +0000 Subject: fix for luatex mingw32 cross build git-svn-id: svn://tug.org/texlive/trunk@12788 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/Makefile.in | 2 +- Build/source/texk/web2c/configure | 6 +----- Build/source/texk/web2c/configure.ac | 4 +--- Build/source/texk/web2c/doc/Makefile.in | 2 +- Build/source/texk/web2c/lib/Makefile.in | 2 +- Build/source/texk/web2c/man/Makefile.in | 2 +- Build/source/texk/web2c/mpware/Makefile.in | 2 +- Build/source/texk/web2c/omegafonts/Makefile.in | 2 +- Build/source/texk/web2c/otps/Makefile.in | 2 +- Build/source/texk/web2c/window/Makefile.in | 2 +- 10 files changed, 10 insertions(+), 16 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 01f95c07c05..fff4c930327 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -939,7 +939,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -949,6 +948,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 3c59d28c423..fe0ad37648d 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -892,7 +892,7 @@ XETEX_MACOSX_TRUE FONTCONFIG_LIBS FONTCONFIG_INCLUDES ipc_socketlibs -lua_socketlibs +socketlibs MINGW32_FALSE MINGW32_TRUE WIN32_FALSE @@ -18032,10 +18032,6 @@ esac fi -if test "x$enable_luatex" = xyes; then - lua_socketlibs=$socketlibs -fi - if test "x$enable_ipc" = xyes; then ipc_socketlibs=$socketlibs diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 29f1e28b273..b21340b117b 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -76,12 +76,10 @@ AS_IF([test "x$enable_luatex:$enable_ipc" != xno:no], [AC_MSG_WARN([no socket library: disabling ipc]) enable_ipc=no])], [socketlibs="-l$ac_cv_search_connect"])]) -AS_IF([test "x$enable_luatex" = xyes], - [lua_socketlibs=$socketlibs]) AS_IF([test "x$enable_ipc" = xyes], [ipc_socketlibs=$socketlibs AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])]) -AC_SUBST([lua_socketlibs]) +AC_SUBST([socketlibs]) AC_SUBST([ipc_socketlibs]) KPSE_CHECK_FRAMEWORK([Carbon], [ATSUStyle style]) diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index d8c78308f50..20a787d481e 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -241,7 +241,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -251,6 +250,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 16bdcf1cdd6..c47c893cffd 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -246,7 +246,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -256,6 +255,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index 6c35f62656f..8d0979871db 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -236,7 +236,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -246,6 +245,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/Build/source/texk/web2c/mpware/Makefile.in b/Build/source/texk/web2c/mpware/Makefile.in index bff25a6a7bf..bdeeb1a74b4 100644 --- a/Build/source/texk/web2c/mpware/Makefile.in +++ b/Build/source/texk/web2c/mpware/Makefile.in @@ -256,7 +256,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -266,6 +265,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index b223bc30a0f..65766345166 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -262,7 +262,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -272,6 +271,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 93d016d7e78..8bfd5e4ece8 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -264,7 +264,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -274,6 +273,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index 4b954acd3b3..f157e292a89 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -251,7 +251,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ -lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -261,6 +260,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ -- cgit v1.2.3