diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-29 14:34:22 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-29 14:34:22 +0000 |
| commit | 6be9f4dc7c015da2a94183970394935fd6ae72a2 (patch) | |
| tree | e0e54cc331861f34533d6a240400f9cef789a287 /Build | |
| parent | 5d10ffc76a7d39e7523819add5a8cd46542b672f (diff) | |
fix Cygwin and Solaris build problems
git-svn-id: svn://tug.org/texlive/trunk@12856 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
26 files changed, 507 insertions, 339 deletions
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am b/Build/source/texk/dvipdfmx/src/Makefile.am index bb4f85fe58a..269794671b9 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.am +++ b/Build/source/texk/dvipdfmx/src/Makefile.am @@ -41,11 +41,14 @@ LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) @ZLIB_RULE@ install-exec-hook: - cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb - cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb + cd $(DESTDIR)$(bindir) && \ + rm -f ebb$(EXEEXT) extractbb$(EXEEXT) && \ + $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \ + $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) uninstall-hook: - rm -f $(DESTDIR)$(bindir)/ebb $(DESTDIR)$(bindir)/extractbb + rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT) ## Eventually delete these files ## diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in index ec4bf4e415a..dded26e67c5 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.in +++ b/Build/source/texk/dvipdfmx/src/Makefile.in @@ -605,11 +605,14 @@ uninstall-am: uninstall-binPROGRAMS @ZLIB_RULE@ install-exec-hook: - cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb - cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb + cd $(DESTDIR)$(bindir) && \ + rm -f ebb$(EXEEXT) extractbb$(EXEEXT) && \ + $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \ + $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) uninstall-hook: - rm -f $(DESTDIR)$(bindir)/ebb $(DESTDIR)$(bindir)/extractbb + rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index ea8b86f8fba..71a72ba252a 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -111,13 +111,18 @@ dist_noinst_SCRIPTS = texi2pod.pl if have_gif install-exec-hook: - cd $(DESTDIR)/$(bindir) && rm -f dvigif && $(LN_S) dvipng dvigif + cd $(DESTDIR)$(bindir) && \ + rm -f dvigif$(EXEEXT) && \ + $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) install-data-hook: - cd $(DESTDIR)/$(man1dir) && rm -f dvigif.1 && $(LN_S) dvipng.1 dvigif.1 + cd $(DESTDIR)$(man1dir) && \ + rm -f dvigif.1 && \ + $(LN_S) dvipng.1 dvigif.1 uninstall-hook: - rm -f $(DESTDIR)/$(bindir)/dvigif $(DESTDIR)/$(man1dir)/dvigif.1 + rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) + rm -f $(DESTDIR)$(man1dir)/dvigif.1 endif have_gif diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 9139836c718..610f1f5d6dd 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -1058,13 +1058,18 @@ README: readme.texi -o $@ $< @have_gif_TRUE@install-exec-hook: -@have_gif_TRUE@ cd $(DESTDIR)/$(bindir) && rm -f dvigif && $(LN_S) dvipng dvigif +@have_gif_TRUE@ cd $(DESTDIR)$(bindir) && \ +@have_gif_TRUE@ rm -f dvigif$(EXEEXT) && \ +@have_gif_TRUE@ $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) @have_gif_TRUE@install-data-hook: -@have_gif_TRUE@ cd $(DESTDIR)/$(man1dir) && rm -f dvigif.1 && $(LN_S) dvipng.1 dvigif.1 +@have_gif_TRUE@ cd $(DESTDIR)$(man1dir) && \ +@have_gif_TRUE@ rm -f dvigif.1 && \ +@have_gif_TRUE@ $(LN_S) dvipng.1 dvigif.1 @have_gif_TRUE@uninstall-hook: -@have_gif_TRUE@ rm -f $(DESTDIR)/$(bindir)/dvigif $(DESTDIR)/$(man1dir)/dvigif.1 +@have_gif_TRUE@ rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) +@have_gif_TRUE@ rm -f $(DESTDIR)$(man1dir)/dvigif.1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am index 5ca62ec01b6..6c5d1c88130 100644 --- a/Build/source/texk/dvipsk/Makefile.am +++ b/Build/source/texk/dvipsk/Makefile.am @@ -109,15 +109,17 @@ CLEANFILES = $(prologues) texc.lpro install-data-hook: cd $(DESTDIR)$(man1dir) && \ - rm -f odvips.1 && $(LN_S) dvips.1 odvips.1 + rm -f odvips.1 && \ + $(LN_S) dvips.1 odvips.1 install-exec-hook: cd $(DESTDIR)$(bindir) && \ - rm -f odvips && $(LN_S) dvips odvips + rm -f odvips && \ + $(LN_S) dvips$(EXEEXT) odvips$(EXEEXT) uninstall-hook: rm -f $(DESTDIR)$(man1dir)/odvips.1 - rm -f $(DESTDIR)$(bindir)/odvips + rm -f $(DESTDIR)$(bindir)/odvips$(EXEEXT) ## Not yet used ## diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in index 9a5e7b1c020..377feb3bb37 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -1192,15 +1192,17 @@ squeeze/stamp-squeeze: install-data-hook: cd $(DESTDIR)$(man1dir) && \ - rm -f odvips.1 && $(LN_S) dvips.1 odvips.1 + rm -f odvips.1 && \ + $(LN_S) dvips.1 odvips.1 install-exec-hook: cd $(DESTDIR)$(bindir) && \ - rm -f odvips && $(LN_S) dvips odvips + rm -f odvips && \ + $(LN_S) dvips$(EXEEXT) odvips$(EXEEXT) uninstall-hook: rm -f $(DESTDIR)$(man1dir)/odvips.1 - rm -f $(DESTDIR)$(bindir)/odvips + rm -f $(DESTDIR)$(bindir)/odvips$(EXEEXT) # in case of an SVN repository dist-hook: diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 0cb786f5bdd..aa121eccef0 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -940,6 +940,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -949,7 +950,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ @@ -1351,7 +1351,7 @@ luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \ luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a \ libluasocket.a liblua51.a $(LIBPNG_LIBS) $(ZLIB_LIBS) \ $(XPDF_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a -luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs) +luatex_LDADD = $(luatex_ldadd) $(LDADD) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) libluatex.a $(LIBPNG_DEPEND) \ $(ZLIB_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a \ libmplib.a diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 0f8d5db0a57..06af77c9b5a 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -893,7 +893,7 @@ XETEX_MACOSX_TRUE FONTCONFIG_LIBS FONTCONFIG_INCLUDES ipc_socketlibs -socketlibs +lua_socketlibs MINGW32_FALSE MINGW32_TRUE WIN32_FALSE @@ -18036,9 +18036,99 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi -# On Solaris we may need -lrt for nanosleep in luaTeX. +# We may need additional libraries for luaTeX. +# On Solaris -lnsl for gethostbyname() and -lrt for nanosleep(). +lua_socketlibs=$socketlibs if test "x$kpse_cv_have_win32" = xno; then kpse_save_LIBS=$LIBS + { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5 +$as_echo_n "checking for library containing gethostbyname... " >&6; } +if test "${ac_cv_search_gethostbyname+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 gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +for ac_lib in '' nsl; 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_gethostbyname=$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_gethostbyname+set}" = set; then + break +fi +done +if test "${ac_cv_search_gethostbyname+set}" = set; then + : +else + ac_cv_search_gethostbyname=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 +$as_echo "$ac_cv_search_gethostbyname" >&6; } +ac_res=$ac_cv_search_gethostbyname +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; } if test "${ac_cv_search_nanosleep+set}" = set; then @@ -18127,15 +18217,26 @@ if test "$ac_res" != no; then fi LIBS=$kpse_save_LIBS + case $ac_cv_search_gethostbyname in + "none required") : ;; + no) if test "x$enable_luatex" = xyes; then + { $as_echo "$as_me:$LINENO: WARNING: Sorry, no gethostbyname(): can not build luaTeX" >&5 +$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" ;; +esac + case $ac_cv_search_nanosleep in "none required") : ;; no) if test "x$enable_luatex" = xyes; then - { $as_echo "$as_me:$LINENO: WARNING: Sorry, no nanosleep: can not build luaTeX" >&5 -$as_echo "$as_me: WARNING: Sorry, no nanosleep: can not build luaTeX" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Sorry, no nanosleep(): can not build luaTeX" >&5 +$as_echo "$as_me: WARNING: Sorry, no nanosleep(): can not build luaTeX" >&2;} enable_luatex=no fi ;; - *) socketlibs="$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 56e0fa4c8b2..94a56c66719 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -80,19 +80,29 @@ if test "x$enable_ipc" = xyes; then ipc_socketlibs=$socketlibs AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.]) fi -# On Solaris we may need -lrt for nanosleep in luaTeX. +# We may need additional libraries for luaTeX. +# On Solaris -lnsl for gethostbyname() and -lrt for nanosleep(). +lua_socketlibs=$socketlibs if test "x$kpse_cv_have_win32" = xno; then kpse_save_LIBS=$LIBS + AC_SEARCH_LIBS([gethostbyname], [nsl]) + LIBS=$kpse_save_LIBS AC_SEARCH_LIBS([nanosleep], [rt]) LIBS=$kpse_save_LIBS + AS_CASE([$ac_cv_search_gethostbyname], + ["none required"], [], + [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"]) 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]) + [AC_MSG_WARN([Sorry, no nanosleep(): can not build luaTeX]) enable_luatex=no])], - [socketlibs="$socketlibs ac_cv_search_nanosleep"]) + [lua_socketlibs="$lua_socketlibs ac_cv_search_nanosleep"]) fi -AC_SUBST([socketlibs]) +AC_SUBST([lua_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 88b37dfb66b..76ea945b884 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -242,6 +242,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -251,7 +252,6 @@ 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 9a6800de692..cd7144dcdd9 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -247,6 +247,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -256,7 +257,6 @@ 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/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index e3f179f5c96..769f443a41e 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -24,7 +24,7 @@ luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a libluasocket.a liblua5 luatex_ldadd += $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a -luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs) +luatex_LDADD = $(luatex_ldadd) $(LDADD) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index c238f0bda1a..ce6a5c98df5 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -237,6 +237,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -246,7 +247,6 @@ 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 4e95ffc7ede..772a196a659 100644 --- a/Build/source/texk/web2c/mpware/Makefile.in +++ b/Build/source/texk/web2c/mpware/Makefile.in @@ -257,6 +257,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -266,7 +267,6 @@ 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.am b/Build/source/texk/web2c/omegafonts/Makefile.am index 7f7c549aac0..7f27bca4274 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.am +++ b/Build/source/texk/web2c/omegafonts/Makefile.am @@ -63,13 +63,15 @@ DISTCLEANFILES = pl-parser.output linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf install-exec-hook: - cd $(DESTDIR)$(bindir) && for f in $(linked_programs); do \ - rm -f $$f && $(LN_S) omfonts $$f || exit 1; \ - done + cd $(DESTDIR)$(bindir) && \ + for f in $(linked_programs); do \ + rm -f $$f$(EXEEXT) && \ + $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \ + done unistall-hook: for f in $(linked_programs); do \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \ done ## ###### diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index e6f250633fc..34b9b617ee6 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -263,6 +263,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -272,7 +273,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -socketlibs = @socketlibs@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ @@ -642,13 +642,15 @@ $(proglib): $(KPATHSEA_DEPEND) ${top_srcdir}/lib/*.c @KPATHSEA_RULE@ install-exec-hook: - cd $(DESTDIR)$(bindir) && for f in $(linked_programs); do \ - rm -f $$f && $(LN_S) omfonts $$f || exit 1; \ - done + cd $(DESTDIR)$(bindir) && \ + for f in $(linked_programs); do \ + rm -f $$f$(EXEEXT) && \ + $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \ + done unistall-hook: for f in $(linked_programs); do \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 444be45f025..82dc41ed35d 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -265,6 +265,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -274,7 +275,6 @@ 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 d09dbcc5dae..d95efbe477b 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -252,6 +252,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ lt_ECHO = @lt_ECHO@ +lua_socketlibs = @lua_socketlibs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -261,7 +262,6 @@ 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/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL index a6b82ec8956..b9ed8c16d1c 100644 --- a/Build/source/texk/xdvik/ChangeLog.TL +++ b/Build/source/texk/xdvik/ChangeLog.TL @@ -1,6 +1,12 @@ -ChangeLog.TL: Changes for xdvik (teTeX / TeX Live) +ChangeLog.TL: Changes for xdvik (TeX Live) ================================================== +2009-04-88 Peter Breitenlohner <peb@mppmu.mpg.de> + + * xdvi.h: guard typedef of iconv_char_pptrT by '#if HAVE_ICONV_H'. + + * squeeze/squeeze.c: add '#include <string.h>'. + 2009-04-18 Peter Breitenlohner <peb@mppmu.mpg.de> * CHANGES: fixed version/relase-date such that mksedscript can diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index 887eef3be39..2bbf2f42115 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -1636,7 +1636,9 @@ Optional Packages: --with-xpm-libdir=DIR Specify the location of Xpm libraries --with-motif-include=DIR Specify the location of Motif include files + motif_include=$withval --with-motif-libdir=DIR Specify the location of Motif libraries + motif_libdir=$withval --with-system-kpathsea use installed kpathsea headers and library --with-kpathsea-includes=DIR kpathsea headers installed in DIR @@ -4243,13 +4245,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4246: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4248: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4249: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4251: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4252: output\"" >&5) + (eval echo "\"\$as_me:4254: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5455,7 +5457,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5458 "configure"' > conftest.$ac_ext + echo '#line 5460 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7502,11 +7504,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7505: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7507: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7509: \$? = $ac_status" >&5 + echo "$as_me:7511: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7841,11 +7843,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7844: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7846: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7848: \$? = $ac_status" >&5 + echo "$as_me:7850: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7946,11 +7948,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7949: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7951: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7953: \$? = $ac_status" >&5 + echo "$as_me:7955: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8001,11 +8003,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8004: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8006: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8008: \$? = $ac_status" >&5 + echo "$as_me:8010: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10801,7 +10803,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10804 "configure" +#line 10806 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10897,7 +10899,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10900 "configure" +#line 10902 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18485,6 +18487,7 @@ fi +# Check for `--allow-multiple-definition' linker flag { $as_echo "$as_me:$LINENO: checking if linker supports multiple definitions and for required flags" >&5 $as_echo_n "checking if linker supports multiple definitions and for required flags... " >&6; } if test "${xdvi_cv_linker_multiple_defns+set}" = set; then @@ -19100,6 +19103,8 @@ fi done +# <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c. +# regex.h is needed for regexp support in DVI search. @@ -20032,6 +20037,7 @@ fi fi +# Check X11 headers. xdvi_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" @@ -20188,6 +20194,7 @@ fi done +# For editres, we need to check both the header and define a linker option. for ac_header in X11/Xmu/Editres.h X11/Xmu/Xmu.h @@ -20308,13 +20315,13 @@ fi # Check whether --with-xpm-includes was given. if test "${with_xpm_includes+set}" = set; then - withval=$with_xpm_includes; xpm_includes="$withval" + withval=$with_xpm_includes; xpm_includes=$withval fi # Check whether --with-xpm-libraries was given. if test "${with_xpm_libraries+set}" = set; then - withval=$with_xpm_libraries; xpm_libraries="$withval" + withval=$with_xpm_libraries; xpm_libraries=$withval fi if test "x$with_xpm" = xno; then @@ -20330,15 +20337,11 @@ if test "x$xpm_includes" = x; then if test "${xdvi_cv_xpm_includes+set}" = set; then $as_echo_n "(cached) " >&6 else - xdvi_xpm_save_LIBS=$LIBS -xdvi_xpm_save_CFLAGS=$CFLAGS + xdvi_xpm_save_CFLAGS=$CFLAGS xdvi_xpm_save_CPPFLAGS=$CPPFLAGS -xdvi_xpm_save_LDFLAGS=$LDFLAGS # -LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS" CFLAGS="$X_CFLAGS $CFLAGS" CPPFLAGS="$X_CFLAGS $CPPFLAGS" -LDFLAGS="$X_LIBS $LDFLAGS" # cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20409,10 +20412,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # -LIBS=$xdvi_xpm_save_LIBS CFLAGS=$xdvi_xpm_save_CFLAGS CPPFLAGS=$xdvi_xpm_save_CPPFLAGS -LDFLAGS=$xdvi_xpm_save_LDFLAGS fi # @@ -20541,14 +20542,14 @@ fi # # Add Xpm definitions to X flags # -if test "x$xpm_includes" != "xdefault" && test "$xpm_includes" != "" \ - && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no" +if test "x$xpm_includes" != xdefault && test "x$xpm_includes" != x \ + && test "x$xpm_includes" != "x$x_includes" && test "x$xpm_includes" != xno then X_CFLAGS="-I$xpm_includes $X_CFLAGS" fi # -if test "x$xpm_libraries" != "xdefault" && test "$xpm_libraries" != "" \ - && test "$xpm_libraries" != "$x_libraries" && test "$xpm_libraries" != "no" +if test "x$xpm_libraries" != xdefault && test "x$xpm_libraries" != x \ + && test "x$xpm_libraries" != "x$x_libraries" && test "x$xpm_libraries" != xno then case "$X_LIBS" in *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";; @@ -20570,7 +20571,7 @@ x_xpm_libs="-lXpm" xpm_libraries_result=$xpm_libraries if test "x$xpm_libraries_result" = xdefault ; then xpm_libraries_result="in default path" -elif test "$xpm_libraries_result" = no || test "x$xpm_libraries_result" = "x"; then +elif test "x$xpm_libraries_result" = xno || test "x$xpm_libraries_result" = x; then xpm_libraries_result="(none)" cat >>confdefs.h <<\_ACEOF #define USE_XPM 0 @@ -20581,9 +20582,9 @@ fi # xpm_includes_result=$xpm_includes -if test "x$xpm_includes_result" = "xdefault"; then +if test "x$xpm_includes_result" = xdefault; then xpm_includes_result="in default path" -elif test "$xpm_includes_result" = no || test "x$xpm_includes_result" = "x"; then +elif test "x$xpm_includes_result" = xno || test "x$xpm_includes_result" = x; then cat >>confdefs.h <<\_ACEOF #define USE_XPM 0 _ACEOF @@ -20595,7 +20596,13 @@ fi $as_echo "libraries $xpm_libraries_result, headers $xpm_includes_result" >&6; } - +# Check for libXext and libXp. +# Although libXp is now defunct (no longer part of XOrg), older versions +# of libXm may need to include libXp. Same for the equally defunct libXaw8. +# We certainly don't want to include libXp unless necessay,this would just +# perpetuate the need to keep libXp.so around. Moreover for ELF shared +# libraries the need for libXp is probably encoded into libXm.so and/or +# libXaw.so and need not to be specified explicitly. if test -n "$x_libraries"; then XLFLAG="-L$x_libraries" else @@ -20603,13 +20610,13 @@ else fi if test -z "$x_ext_lib"; then # allow envvar override - { $as_echo "$as_me:$LINENO: checking for XpQueryVersion in -lXp" >&5 -$as_echo_n "checking for XpQueryVersion in -lXp... " >&6; } -if test "${ac_cv_lib_Xp_XpQueryVersion+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for XextCreateExtension in -lXext" >&5 +$as_echo_n "checking for XextCreateExtension in -lXext... " >&6; } +if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXp -lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" +LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20623,11 +20630,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char XpQueryVersion (); +char XextCreateExtension (); int main () { -return XpQueryVersion (); +return XextCreateExtension (); ; return 0; } @@ -20653,12 +20660,12 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_Xp_XpQueryVersion=yes + ac_cv_lib_Xext_XextCreateExtension=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xp_XpQueryVersion=no + ac_cv_lib_Xext_XextCreateExtension=no fi rm -rf conftest.dSYM @@ -20666,21 +20673,19 @@ 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_Xp_XpQueryVersion" >&5 -$as_echo "$ac_cv_lib_Xp_XpQueryVersion" >&6; } -if test "x$ac_cv_lib_Xp_XpQueryVersion" = x""yes; then - x_ext_lib_with_Xp='-lXp -lXext' -else - : +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +$as_echo "$ac_cv_lib_Xext_XextCreateExtension" >&6; } +if test "x$ac_cv_lib_Xext_XextCreateExtension" = x""yes; then + x_ext_lib='-lXext' fi - { $as_echo "$as_me:$LINENO: checking for XextCreateExtension in -lXext" >&5 -$as_echo_n "checking for XextCreateExtension in -lXext... " >&6; } -if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for XpQueryVersion in -lXp" >&5 +$as_echo_n "checking for XpQueryVersion in -lXp... " >&6; } +if test "${ac_cv_lib_Xp_XpQueryVersion+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" +LIBS="-lXp $x_ext_lib -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20694,11 +20699,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char XextCreateExtension (); +char XpQueryVersion (); int main () { -return XextCreateExtension (); +return XpQueryVersion (); ; return 0; } @@ -20724,12 +20729,12 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_Xext_XextCreateExtension=yes + ac_cv_lib_Xp_XpQueryVersion=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xext_XextCreateExtension=no + ac_cv_lib_Xp_XpQueryVersion=no fi rm -rf conftest.dSYM @@ -20737,18 +20742,16 @@ 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_Xext_XextCreateExtension" >&5 -$as_echo "$ac_cv_lib_Xext_XextCreateExtension" >&6; } -if test "x$ac_cv_lib_Xext_XextCreateExtension" = x""yes; then - x_ext_lib='-lXext' -else - : +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpQueryVersion" >&5 +$as_echo "$ac_cv_lib_Xp_XpQueryVersion" >&6; } +if test "x$ac_cv_lib_Xp_XpQueryVersion" = x""yes; then + x_xp_lib='-lXp' fi fi - +# Check which toolkit was specified case $with_xdvi_x_toolkit in next | nextaw | neXtaw) val=neXtaw ;; xaw3d) val=xaw3d ;; @@ -20771,11 +20774,11 @@ elif test "x$with_xdvi_x_toolkit" = xneXtaw; then prog_extension="nextaw" x_tool_libs="-lneXtaw" else - # Check for Xaw + # Check for Xaw headers save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" -{ $as_echo "$as_me:$LINENO: checking for Xaw library" >&5 -$as_echo_n "checking for Xaw library... " >&6; } +{ $as_echo "$as_me:$LINENO: checking for Xaw headers" >&5 +$as_echo_n "checking for Xaw headers... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20787,7 +20790,6 @@ cat >>conftest.$ac_ext <<_ACEOF #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xos.h> - #include <X11/Xfuncs.h> #include <X11/Intrinsic.h> #include <X11/Xaw/Form.h> @@ -20830,10 +20832,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext $as_echo "$xdvi_have_xaw" >&6; } # if test "x$xdvi_have_xaw" = xyes; then - -save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -{ $as_echo "$as_me:$LINENO: checking for SimpleClassPart.extension" >&5 + { $as_echo "$as_me:$LINENO: checking for SimpleClassPart.extension" >&5 $as_echo_n "checking for SimpleClassPart.extension... " >&6; } if test "${ac_cv_member_SimpleClassPart_extension+set}" = set; then $as_echo_n "(cached) " >&6 @@ -20952,22 +20951,21 @@ _ACEOF fi -CPPFLAGS=$save_CPPFLAGS fi CPPFLAGS=$save_CPPFLAGS if test "x$with_xdvi_x_toolkit" != xxaw; then - # Requested motiv (possibly with xaw as fallback) if test "x$with_xdvi_x_toolkit" = xmotif; then + # Requested motiv default_toolkit=none else + # Requested motiv with Xaw as fallback default_toolkit=Xaw fi -{ $as_echo "$as_me:$LINENO: checking for Motif" >&5 -$as_echo_n "checking for Motif... " >&6; } -# +motif_include= +motif_libdir= # Check whether --with-motif-include was given. if test "${with_motif_include+set}" = set; then @@ -20980,11 +20978,13 @@ if test "${with_motif_libdir+set}" = set; then withval=$with_motif_libdir; fi +{ $as_echo "$as_me:$LINENO: checking for Motif" >&5 +$as_echo_n "checking for Motif... " >&6; } # # Search the include files. # if test "$motif_include" = ""; then -if test "${xdvi_cv_motif_include+set}" = set; then + if test "${xdvi_cv_motif_include+set}" = set; then $as_echo_n "(cached) " >&6 else @@ -21076,13 +21076,13 @@ LDFLAGS="$xdvi_motif_save_LDFLAGS" fi motif_include="$xdvi_cv_motif_include" + fi # -# # Now for the libraries. # if test "$motif_libdir" = ""; then -if test "${xdvi_cv_motif_libdir+set}" = set; then + if test "${xdvi_cv_motif_libdir+set}" = set; then $as_echo_n "(cached) " >&6 else @@ -21186,6 +21186,7 @@ fi # motif_libdir="$xdvi_cv_motif_libdir" + fi # Add Motif definitions to X flags # @@ -21232,32 +21233,32 @@ if test "$motif_include_result" = "no"; then fi if test "$motif_include_result" != "" && test "$motif_libdir_result" != ""; then - { $as_echo "$as_me:$LINENO: result: libraries $motif_libdir_result, headers $motif_include_result" >&5 + { $as_echo "$as_me:$LINENO: result: libraries $motif_libdir_result, headers $motif_include_result" >&5 $as_echo "libraries $motif_libdir_result, headers $motif_include_result" >&6; } - prog_extension="motif" - cat >>confdefs.h <<\_ACEOF + prog_extension="motif" + cat >>confdefs.h <<\_ACEOF #define MOTIF 1 _ACEOF - x_tool_libs="-lXm" - # now warn if we're using LessTif (see LESSTIF-BUGS for why ...) - { $as_echo "$as_me:$LINENO: checking for LessTif" >&5 + x_tool_libs="-lXm" + # now warn if we're using LessTif (see LESSTIF-BUGS for why ...) + { $as_echo "$as_me:$LINENO: checking for LessTif" >&5 $as_echo_n "checking for LessTif... " >&6; } - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/Xos.h> - #include <X11/Intrinsic.h> - #include <Xm/Xm.h> +#include <X11/X.h> +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/Xos.h> +#include <X11/Intrinsic.h> +#include <Xm/Xm.h> int main () { @@ -21286,10 +21287,10 @@ $as_echo "$ac_try_echo") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then - # yes, we're running LessTif - { $as_echo "$as_me:$LINENO: result: yes" >&5 +# yes, we're running LessTif +{ $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: WARNING: LessTif header detected. +{ $as_echo "$as_me:$LINENO: WARNING: LessTif header detected. ***************************************************************** * Warning: You are using LessTif instead of OpenMotif. * * Some GUI elements might be broken; please see the file * @@ -21313,23 +21314,19 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - # no, not running LessTif - { $as_echo "$as_me:$LINENO: result: no" >&5 +# no, not running LessTif +{ $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - { $as_echo "$as_me:$LINENO: result: not found, using Xaw" >&5 -$as_echo "not found, using Xaw" >&6; } - with_xdvi_x_toolkit="xaw" -fi +CPPFLAGS=$save_CPPFLAGS -# -{ $as_echo "$as_me:$LINENO: checking whether to compile in panner (requires Xaw)" >&5 + # Check whether to compile for Motif with Xaw Panner. + { $as_echo "$as_me:$LINENO: checking whether to compile in panner (requires Xaw)" >&5 $as_echo_n "checking whether to compile in panner (requires Xaw)... " >&6; } -save_CPPFLAGS="$CPPFLAGS" +save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -21342,17 +21339,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xos.h> - #include <X11/Xfuncs.h> #include <X11/Intrinsic.h> - #include <X11/Xaw/Reports.h> - int main () { - ; return 0; } @@ -21381,39 +21374,48 @@ else sed 's/^/| /' conftest.$ac_ext >&5 xdvi_use_xaw_panner=no - fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$save_CPPFLAGS -if test $xdvi_use_xaw_panner = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: $xdvi_use_xaw_panner" >&5 +$as_echo "$xdvi_use_xaw_panner" >&6; } +if test "x$xdvi_use_xaw_panner" = xyes; then cat >>confdefs.h <<\_ACEOF #define USE_XAW_PANNER 1 _ACEOF +fi + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: not found, using Xaw" >&5 +$as_echo "not found, using Xaw" >&6; } + with_xdvi_x_toolkit="xaw" fi + fi if test "x$with_xdvi_x_toolkit" = xxaw; then - # Requested or defaulted to Xaw - if test "x$xdvi_have_xaw" = xno; then - { { $as_echo "$as_me:$LINENO: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&5 -$as_echo "$as_me: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&2;} - { (exit 1); exit 1; }; } - fi - prog_extension="xaw" - x_tool_libs="-lXaw" + # Requested or fallback to Xaw, check for library + +if test "x$xdvi_have_xaw" = xyes; then + : +fi +if test "x$xdvi_have_xaw" = xyes; then + prog_extension="xaw" + x_tool_libs="-lXaw" cat >>confdefs.h <<\_ACEOF #define XAW 1 _ACEOF +else + { { $as_echo "$as_me:$LINENO: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&5 +$as_echo "$as_me: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&2;} + { (exit 1); exit 1; }; } +fi + fi fi @@ -21424,6 +21426,8 @@ program_transform_name="'s,xdvi-bin,$final_exec_name,'" +# If we're on Solaris and we want DPS, then add the extra compilation stuff +# to get it. if echo "$PS_DEF" | grep PS_DPS >/dev/null; then if test "`(uname) 2>/dev/null`" = SunOS \ && uname -r | grep '^5' >/dev/null; then diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac index cebd5476c2f..7ee579d0554 100644 --- a/Build/source/texk/xdvik/configure.ac +++ b/Build/source/texk/xdvik/configure.ac @@ -103,7 +103,7 @@ dnl COMPILER_WARNINGS dnl ####### -dnl SU: for `--allow-multiple-definition' linker flag on Cygwin +# Check for `--allow-multiple-definition' linker flag XDVI_LINKER_MULTIPLE_DEFNS AC_CHECK_HEADERS([stdint.h inttypes.h]) @@ -116,8 +116,8 @@ AC_CHECK_FUNCS([mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr fchdir getcwd getpwnam getuid getpwuid \ lstat ftruncate snprintf vsnprintf realpath]) -dnl <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c. -dnl regex.h is needed for regexp support in DVI search. +# <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c. +# regex.h is needed for regexp support in DVI search. AC_CHECK_HEADERS([netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h]) # Checks for iconv @@ -126,11 +126,11 @@ XDVI_CHECK_ICONV # Checks for langinfo XDVI_CHECK_LANGINFO -dnl Check X11 headers. +# Check X11 headers. xdvi_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADERS([X11/Intrinsic.h X11/Xosdefs.h X11/xpm.h Xm/XpmP.h]) -dnl For editres, we need to check both the header and define a linker option. +# For editres, we need to check both the header and define a linker option. AC_CHECK_HEADERS([X11/Xmu/Editres.h X11/Xmu/Xmu.h], [x_xmu_lib=-lXmu], [x_xmu_lib=], @@ -171,31 +171,27 @@ fi # Check whether -lXpm can be used XDVI_FIND_XPM -dnl ####### - -dnl First, check for libXp and libXext. -dnl We certainly don't want to include the now defunct libXp unless necessay, -dnl this would just perpetuate the need to keep libXp.so around. Moreover, -dnl for ELF shared libraries, the need for libXp is probably encoded into -dnl libXm.so and/or libXaw.so and need not to be specified explicitly. -dnl +# Check for libXext and libXp. +# Although libXp is now defunct (no longer part of XOrg), older versions +# of libXm may need to include libXp. Same for the equally defunct libXaw8. +# We certainly don't want to include libXp unless necessay,this would just +# perpetuate the need to keep libXp.so around. Moreover for ELF shared +# libraries the need for libXp is probably encoded into libXm.so and/or +# libXaw.so and need not to be specified explicitly. AS_IF([test -n "$x_libraries"], [XLFLAG="-L$x_libraries"], [XLFLAG=]) if test -z "$x_ext_lib"; then # allow envvar override - AC_CHECK_LIB([Xp], [XpQueryVersion], - [x_ext_lib_with_Xp='-lXp -lXext'], - [:], - [-lXext -lX11 $X_EXTRA_LIBS $XLFLAG]) AC_CHECK_LIB([Xext], [XextCreateExtension], - [x_ext_lib='-lXext'], - [:], + [x_ext_lib='-lXext'], [], [-lX11 $X_EXTRA_LIBS $XLFLAG]) + AC_CHECK_LIB([Xp], [XpQueryVersion], + [x_xp_lib='-lXp'], [], + [$x_ext_lib -lX11 $X_EXTRA_LIBS $XLFLAG]) fi AC_SUBST([x_ext_lib]) -dnl ####### - +# Check which toolkit was specified AS_CASE([$with_xdvi_x_toolkit], [next | nextaw | neXtaw], [val=neXtaw], [xaw3d], [val=xaw3d], @@ -214,25 +210,21 @@ elif test "x$with_xdvi_x_toolkit" = xneXtaw; then prog_extension="nextaw" x_tool_libs="-lneXtaw" else - # Check for Xaw - XDVI_CHECK_XAW + # Check for Xaw headers + XDVI_CHECK_XAW_HEADERS if test "x$with_xdvi_x_toolkit" != xxaw; then - # Requested motiv (possibly with xaw as fallback) if test "x$with_xdvi_x_toolkit" = xmotif; then + # Requested motiv default_toolkit=none else + # Requested motiv with Xaw as fallback default_toolkit=Xaw fi XDVI_FIND_MOTIF fi if test "x$with_xdvi_x_toolkit" = xxaw; then - # Requested or defaulted to Xaw - if test "x$xdvi_have_xaw" = xno; then - AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.]) - fi - prog_extension="xaw" - x_tool_libs="-lXaw" - AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.]) + # Requested or fallback to Xaw, check for library + XDVI_CHECK_XAW_LIBRARY fi fi AC_SUBST([x_tool_libs]) @@ -246,8 +238,8 @@ dnl $program_transform_name replacement dnl ####### -dnl If we're on Solaris and we want DPS, then add the extra compilation stuff -dnl to get it. +# If we're on Solaris and we want DPS, then add the extra compilation stuff +# to get it. if echo "$PS_DEF" | grep PS_DPS >/dev/null; then if test "`(uname) 2>/dev/null`" = SunOS \ && uname -r | grep '^5' >/dev/null; then diff --git a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 index fe56f6616f9..a1421cd3141 100644 --- a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 @@ -6,24 +6,18 @@ # give unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -## - -dnl ### Check for Xaw version -AC_DEFUN([XDVI_CHECK_XAW], [_XDVI_CHECK_XAW_HEADERS]) - -# _XDVI_CHECK_XAW_HEADERS -# ----------------------- -# Check for Xaw headers. -m4_define([_XDVI_CHECK_XAW_HEADERS], +# XDVI_CHECK_XAW_HEADERS +# ---------------------- +# Check for Xaw headers and library version. +AC_DEFUN([XDVI_CHECK_XAW_HEADERS], [save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_MSG_CHECKING([for Xaw library]) +AC_MSG_CHECKING([for Xaw headers]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <X11/X.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xos.h> - #include <X11/Xfuncs.h> #include <X11/Intrinsic.h> #include <X11/Xaw/Form.h>]])], @@ -35,25 +29,39 @@ if test "x$xdvi_have_xaw" = xyes; then _XDVI_CHECK_XAW_VERSION fi CPPFLAGS=$save_CPPFLAGS -]) # _XDVI_CHECK_XAW_HEADERS +]) # XDVI_CHECK_XAW_HEADERS # _XDVI_CHECK_XAW_VERSION # ----------------------- # Check Xaw version. m4_define([_XDVI_CHECK_XAW_VERSION], -[ -save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_CHECK_MEMBER([SimpleClassPart.extension], - [], - [AC_DEFINE([HAVE_OLD_XAW], 1, - [Define if you have an old version of the Xaw library])], - [[ +[AC_CHECK_MEMBER([SimpleClassPart.extension], + [], + [AC_DEFINE([HAVE_OLD_XAW], 1, + [Define if you have an old version of the Xaw library])], + [[ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Intrinsic.h> #include <X11/StringDefs.h> #include <X11/Xos.h> #include <X11/Xaw/SimpleP.h>]]) -CPPFLAGS=$save_CPPFLAGS ]) # _XDVI_CHECK_XAW_VERSION + +# XDVI_CHECK_XAW_LIBRARY +# ---------------------- +# Check for Xaw library. +# If found, set prog_extension and x_tool_libs, and define XAW. +AC_DEFUN([XDVI_CHECK_XAW_LIBRARY], +[AC_REQUIRE([XDVI_CHECK_XAW_HEADERS]) +if test "x$xdvi_have_xaw" = xyes; then + : +fi +if test "x$xdvi_have_xaw" = xyes; then + prog_extension="xaw" + x_tool_libs="-lXaw" + AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.]) +else + AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.]) +fi +]) # XDVI_CHECK_XAW_LIBRARY diff --git a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 index c9d2d136e69..160f43e18d7 100644 --- a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 @@ -6,26 +6,96 @@ # give unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -dnl ### Check for Motif libraries and headers -dnl Put Motif include directory in motif_include, -dnl put Motif library directory in motif_libdir, -dnl and add appropriate flags to X_CFLAGS and X_LIBS. -dnl If default_toolkit is not `none', use Xaw as default toolkit if Motif isn't found. +# XDVI_FIND_MOTIF +# --------------- +# Check for Motif libraries and headers. +# Put Motif include directory in motif_include, +# put Motif library directory in motif_libdir, +# and add appropriate flags to X_CFLAGS and X_LIBS. +# If default_toolkit is not `none', use Xaw as toolkit if Motif isn't found. AC_DEFUN([XDVI_FIND_MOTIF], [AC_REQUIRE([AC_PATH_XTRA]) -AC_MSG_CHECKING([for Motif]) -# +motif_include= +motif_libdir= AC_ARG_WITH([motif-include], AS_HELP_STRING([--with-motif-include=DIR], - [Specify the location of Motif include files])) + [Specify the location of Motif include files]) + [motif_include=$withval]) AC_ARG_WITH([motif-libdir], AS_HELP_STRING([--with-motif-libdir=DIR], - [Specify the location of Motif libraries])) + [Specify the location of Motif libraries]) + [motif_libdir=$withval]) +AC_MSG_CHECKING([for Motif]) # # Search the include files. # if test "$motif_include" = ""; then -AC_CACHE_VAL(xdvi_cv_motif_include, + _XDVI_FIND_MOTIF_INCLUDES +fi +# +# Now for the libraries. +# +if test "$motif_libdir" = ""; then + _XDVI_FIND_MOTIF_LIBRARIES +fi +# Add Motif definitions to X flags +# +if test "$motif_include" != "" && test "$motif_include" != "$x_includes" && test "$motif_include" != "no" +then +X_CFLAGS="-I$motif_include $X_CFLAGS" +fi +if test "$motif_libdir" != "" && test "$motif_libdir" != "$x_libraries" && test "$motif_libdir" != "no" +then +case "$X_LIBS" in + *-R\ *) X_LIBS="-L$motif_libdir -R $motif_libdir $X_LIBS";; + *-R*) X_LIBS="-L$motif_libdir -R$motif_libdir $X_LIBS";; + *) X_LIBS="-L$motif_libdir $X_LIBS";; +esac +fi +# +# +motif_libdir_result="$motif_libdir" +motif_include_result="$motif_include" +test "$motif_libdir_result" = "" && + motif_libdir_result="in default path" && AC_DEFINE([MOTIF], 1, [Define to use the Motif toolkit.]) +test "$motif_include_result" = "" && + motif_include_result="in default path" && AC_DEFINE([MOTIF], 1) +if test "$motif_libdir_result" = "no"; then + if test "$default_toolkit" = "none"; then + motif_libdir_result="(none)" + else + motif_libdir_result="" + fi +fi +if test "$motif_include_result" = "no"; then + if test "$default_toolkit" = "none"; then + motif_include_result="(none)" + else + motif_include_result="" + fi +fi + +if test "$motif_include_result" != "" && test "$motif_libdir_result" != ""; then + AC_MSG_RESULT([libraries $motif_libdir_result, headers $motif_include_result]) + prog_extension="motif" + AC_DEFINE([MOTIF], 1) + x_tool_libs="-lXm" + # now warn if we're using LessTif (see LESSTIF-BUGS for why ...) + _XDVI_CHECK_LESSTIF + # Check whether to compile for Motif with Xaw Panner. + _XDVI_CHECK_PANNER +else + AC_MSG_RESULT([not found, using Xaw]) + with_xdvi_x_toolkit="xaw" +fi + +]) # XDVI_FIND_MOTIF + +# _XDVI_FIND_MOTIF_INCLUDES +# ------------------------- +# Search the Xm include files. +m4_define([_XDVI_FIND_MOTIF_INCLUDES], +[AC_CACHE_VAL([xdvi_cv_motif_include], [ xdvi_motif_save_LIBS="$LIBS" xdvi_motif_save_CFLAGS="$CFLAGS" @@ -74,13 +144,13 @@ CPPFLAGS="$xdvi_motif_save_CPPFLAGS" LDFLAGS="$xdvi_motif_save_LDFLAGS" ]) motif_include="$xdvi_cv_motif_include" -fi -# -# -# Now for the libraries. -# -if test "$motif_libdir" = ""; then -AC_CACHE_VAL(xdvi_cv_motif_libdir, +]) # _XDVI_FIND_MOTIF_INCLUDES + +# _XDVI_FIND_MOTIF_LIBRARIES +# -------------------------- +# Search the Xm library. +m4_define([_XDVI_FIND_MOTIF_LIBRARIES], +[AC_CACHE_VAL([xdvi_cv_motif_libdir], [ xdvi_motif_save_LIBS="$LIBS" xdvi_motif_save_CFLAGS="$CFLAGS" @@ -137,64 +207,26 @@ LDFLAGS="$xdvi_motif_save_LDFLAGS" ]) # motif_libdir="$xdvi_cv_motif_libdir" -fi -# Add Motif definitions to X flags -# -if test "$motif_include" != "" && test "$motif_include" != "$x_includes" && test "$motif_include" != "no" -then -X_CFLAGS="-I$motif_include $X_CFLAGS" -fi -if test "$motif_libdir" != "" && test "$motif_libdir" != "$x_libraries" && test "$motif_libdir" != "no" -then -case "$X_LIBS" in - *-R\ *) X_LIBS="-L$motif_libdir -R $motif_libdir $X_LIBS";; - *-R*) X_LIBS="-L$motif_libdir -R$motif_libdir $X_LIBS";; - *) X_LIBS="-L$motif_libdir $X_LIBS";; -esac -fi -# -# -motif_libdir_result="$motif_libdir" -motif_include_result="$motif_include" -test "$motif_libdir_result" = "" && - motif_libdir_result="in default path" && AC_DEFINE([MOTIF], 1, [Define to use the Motif toolkit.]) -test "$motif_include_result" = "" && - motif_include_result="in default path" && AC_DEFINE([MOTIF], 1) -if test "$motif_libdir_result" = "no"; then - if test "$default_toolkit" = "none"; then - motif_libdir_result="(none)" - else - motif_libdir_result="" - fi -fi -if test "$motif_include_result" = "no"; then - if test "$default_toolkit" = "none"; then - motif_include_result="(none)" - else - motif_include_result="" - fi -fi +]) # _XDVI_FIND_MOTIF_LIBRARIES -if test "$motif_include_result" != "" && test "$motif_libdir_result" != ""; then - AC_MSG_RESULT([libraries $motif_libdir_result, headers $motif_include_result]) - prog_extension="motif" - AC_DEFINE([MOTIF], 1) - x_tool_libs="-lXm" - # now warn if we're using LessTif (see LESSTIF-BUGS for why ...) - AC_MSG_CHECKING(for LessTif) - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_TRY_COMPILE([ - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/Xos.h> - #include <X11/Intrinsic.h> - #include <Xm/Xm.h>],[const char *p = LesstifVERSION_STRING; - ],[ - # yes, we're running LessTif - AC_MSG_RESULT(yes) - AC_MSG_WARN([LessTif header detected. +# _XDVI_CHECK_LESSTIF +# ------------------- +# Check if using LessTif and warn if so. +m4_define([_XDVI_CHECK_LESSTIF], +[AC_MSG_CHECKING([for LessTif]) +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +AC_TRY_COMPILE([ +#include <X11/X.h> +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/Xos.h> +#include <X11/Intrinsic.h> +#include <Xm/Xm.h>],[const char *p = LesstifVERSION_STRING; +],[ +# yes, we're running LessTif +AC_MSG_RESULT([yes]) +AC_MSG_WARN([LessTif header detected. ***************************************************************** * Warning: You are using LessTif instead of OpenMotif. * * Some GUI elements might be broken; please see the file * @@ -203,39 +235,33 @@ if test "$motif_include_result" != "" && test "$motif_libdir_result" != ""; then * * * for more information. * *****************************************************************]) - ],[ - # no, not running LessTif - AC_MSG_RESULT([no]) - ]) -else - AC_MSG_RESULT([not found, using Xaw]) - with_xdvi_x_toolkit="xaw" -fi +],[ +# no, not running LessTif +AC_MSG_RESULT([no]) +]) +CPPFLAGS=$save_CPPFLAGS +]) # _XDVI_CHECK_LESSTIF -# -AC_MSG_CHECKING(whether to compile in panner (requires Xaw)) -save_CPPFLAGS="$CPPFLAGS" +# _XDVI_CHECK_PANNER +# ------------------ +# Check whether to compile for Motif with Xaw Panner. +m4_define([_XDVI_CHECK_PANNER], +[AC_MSG_CHECKING([whether to compile in panner (requires Xaw)]) +save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <X11/X.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xos.h> - #include <X11/Xfuncs.h> #include <X11/Intrinsic.h> - -#include <X11/Xaw/Reports.h> -],[ -], -xdvi_use_xaw_panner=yes, xdvi_use_xaw_panner=no -) +#include <X11/Xaw/Reports.h>]])], + [xdvi_use_xaw_panner=yes], + [xdvi_use_xaw_panner=no]) CPPFLAGS=$save_CPPFLAGS -if test $xdvi_use_xaw_panner = yes; then - AC_MSG_RESULT(yes) - AC_DEFINE([USE_XAW_PANNER], 1, [Define to use Xaw panner.]) -else - AC_MSG_RESULT(no) +AC_MSG_RESULT([$xdvi_use_xaw_panner]) +if test "x$xdvi_use_xaw_panner" = xyes; then + AC_DEFINE([USE_XAW_PANNER], 1, [Define to use Xaw panner.]) fi -])dnl - +]) # _XDVI_CHECK_PANNER diff --git a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 index fce20f51464..4a12e0c2e20 100644 --- a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 @@ -22,11 +22,11 @@ AC_ARG_WITH([xpm], AC_ARG_WITH([xpm-includes], AS_HELP_STRING([--with-xpm-include=DIR], [Specify the location of Xpm include files]), - [xpm_includes="$withval"]) + [xpm_includes=$withval]) AC_ARG_WITH([xpm-libraries], AS_HELP_STRING([--with-xpm-libdir=DIR], [Specify the location of Xpm libraries]), - [xpm_libraries="$withval"]) + [xpm_libraries=$withval]) dnl Treat --without-xpm like dnl --without-xpm-includes --without-xpm-libraries. if test "x$with_xpm" = xno; then @@ -59,14 +59,14 @@ fi # # Add Xpm definitions to X flags # -if test "x$xpm_includes" != "xdefault" && test "$xpm_includes" != "" \ - && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no" +if test "x$xpm_includes" != xdefault && test "x$xpm_includes" != x \ + && test "x$xpm_includes" != "x$x_includes" && test "x$xpm_includes" != xno then X_CFLAGS="-I$xpm_includes $X_CFLAGS" fi # -if test "x$xpm_libraries" != "xdefault" && test "$xpm_libraries" != "" \ - && test "$xpm_libraries" != "$x_libraries" && test "$xpm_libraries" != "no" +if test "x$xpm_libraries" != xdefault && test "x$xpm_libraries" != x \ + && test "x$xpm_libraries" != "x$x_libraries" && test "x$xpm_libraries" != xno then case "$X_LIBS" in *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";; @@ -84,7 +84,7 @@ x_xpm_libs="-lXpm" xpm_libraries_result=$xpm_libraries if test "x$xpm_libraries_result" = xdefault ; then xpm_libraries_result="in default path" -elif test "$xpm_libraries_result" = no || test "x$xpm_libraries_result" = "x"; then +elif test "x$xpm_libraries_result" = xno || test "x$xpm_libraries_result" = x; then xpm_libraries_result="(none)" AC_DEFINE([USE_XPM], 0) x_xpm_libs="" @@ -92,9 +92,9 @@ fi AC_SUBST([x_xpm_libs]) # xpm_includes_result=$xpm_includes -if test "x$xpm_includes_result" = "xdefault"; then +if test "x$xpm_includes_result" = xdefault; then xpm_includes_result="in default path" -elif test "$xpm_includes_result" = no || test "x$xpm_includes_result" = "x"; then +elif test "x$xpm_includes_result" = xno || test "x$xpm_includes_result" = x; then AC_DEFINE([USE_XPM], 0) xpm_includes_result="(none)" fi @@ -110,15 +110,11 @@ AC_MSG_RESULT([libraries $xpm_libraries_result, headers $xpm_includes_result]) # or in <xpm.h> if installed locally; this is what this test is for. m4_define([_XDVI_FIND_XPM_INCLUDES], [AC_CACHE_VAL([xdvi_cv_xpm_includes], -[xdvi_xpm_save_LIBS=$LIBS -xdvi_xpm_save_CFLAGS=$CFLAGS +[xdvi_xpm_save_CFLAGS=$CFLAGS xdvi_xpm_save_CPPFLAGS=$CPPFLAGS -xdvi_xpm_save_LDFLAGS=$LDFLAGS # -LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS" CFLAGS="$X_CFLAGS $CFLAGS" CPPFLAGS="$X_CFLAGS $CPPFLAGS" -LDFLAGS="$X_LIBS $LDFLAGS" # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/xpm.h>]], [[int a;]])], @@ -151,10 +147,8 @@ do fi done]) # -LIBS=$xdvi_xpm_save_LIBS CFLAGS=$xdvi_xpm_save_CFLAGS -CPPFLAGS=$xdvi_xpm_save_CPPFLAGS -LDFLAGS=$xdvi_xpm_save_LDFLAGS]) +CPPFLAGS=$xdvi_xpm_save_CPPFLAGS]) # xpm_includes=$xdvi_cv_xpm_includes ]) # _XDVI_FIND_XPM_INCLUDES diff --git a/Build/source/texk/xdvik/squeeze/squeeze.c b/Build/source/texk/xdvik/squeeze/squeeze.c index f6cec3f62dd..58ede78a120 100644 --- a/Build/source/texk/xdvik/squeeze/squeeze.c +++ b/Build/source/texk/xdvik/squeeze/squeeze.c @@ -36,6 +36,7 @@ Used with permission. */ #include <stdio.h> #include <stdlib.h> +#include <string.h> #ifndef EXIT_SUCCESS #define EXIT_SUCCESS 0 diff --git a/Build/source/texk/xdvik/xdvi.h b/Build/source/texk/xdvik/xdvi.h index e7d8c2e198e..7c21bd90f46 100644 --- a/Build/source/texk/xdvik/xdvi.h +++ b/Build/source/texk/xdvik/xdvi.h @@ -1185,7 +1185,9 @@ extern void motif_translations_hack(void); #define iconv libiconv #endif /* 0 */ +#if HAVE_ICONV_H typedef ICONV_CHAR_PPTR_TYPE iconv_char_pptrT; +#endif /* HAVE_ICONV_H */ #define DEVEL_MODE 0 |