diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/WARNING | 3 | ||||
| -rwxr-xr-x | Build/source/configure | 20 | ||||
| -rw-r--r-- | Build/source/configure.ac | 2 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/Makefile.am | 118 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/Makefile.in | 202 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/aclocal.m4 | 3 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/c-auto.in | 52 | ||||
| -rwxr-xr-x | Build/source/texk/xdvik/configure | 1884 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/configure.ac | 111 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/configure.in.work | 105 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/gui/Makefile.am | 76 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/gui/Makefile.in | 663 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/m4/acinclude.m4 | 643 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/m4/xdvi-find-motif.m4 | 231 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 | 217 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/m4/xdvi-old-xaw.m4 | 170 | ||||
| -rw-r--r-- | Build/source/texk/xdvik/withenable.ac.work | 41 |
17 files changed, 3524 insertions, 1017 deletions
diff --git a/Build/source/WARNING b/Build/source/WARNING index d051ea2a0a4..8d9b67abe6a 100644 --- a/Build/source/WARNING +++ b/Build/source/WARNING @@ -9,10 +9,9 @@ Please inform me of any failures! The new build system is nearly complete, except for the directories - texk/xdvik texk/web2c/xetexdir utils/xindy and a few features not yet available. -Peter Breitenlohner 2009-04-02 14:00 UTC +Peter Breitenlohner 2009-04-08 14:00 UTC diff --git a/Build/source/configure b/Build/source/configure index cd01f067a89..1d7c9e8921f 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for TeX Live 2009test-1.6. +# Generated by GNU Autoconf 2.63 for TeX Live 2009-04-08. # # Report bugs to <tex-k@tug.org>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2009test-1.6' -PACKAGE_STRING='TeX Live 2009test-1.6' +PACKAGE_VERSION='2009-04-08' +PACKAGE_STRING='TeX Live 2009-04-08' PACKAGE_BUGREPORT='tex-k@tug.org' ac_unique_file="m4/kpse-pkgs.m4" @@ -1606,7 +1606,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live 2009test-1.6 to adapt to many kinds of systems. +\`configure' configures TeX Live 2009-04-08 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1680,7 +1680,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2009test-1.6:";; + short | recursive ) echo "Configuration of TeX Live 2009-04-08:";; esac cat <<\_ACEOF @@ -1924,7 +1924,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2009test-1.6 +TeX Live configure 2009-04-08 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1938,7 +1938,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live $as_me 2009test-1.6, which was +It was created by TeX Live $as_me 2009-04-08, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -8501,7 +8501,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2009test-1.6' + VERSION='2009-04-08' cat >>confdefs.h <<_ACEOF @@ -23112,7 +23112,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live $as_me 2009test-1.6, which was +This file was extended by TeX Live $as_me 2009-04-08, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23166,7 +23166,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -TeX Live config.status 2009test-1.6 +TeX Live config.status 2009-04-08 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 48dec5fed29..fef643c78d1 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([TeX Live], [2009test-1.6], [tex-k@tug.org]) +AC_INIT([TeX Live], [2009-04-08], [tex-k@tug.org]) AC_PREREQ([2.63]) AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am index 363188e365d..3946ec9e04a 100644 --- a/Build/source/texk/xdvik/Makefile.am +++ b/Build/source/texk/xdvik/Makefile.am @@ -1,21 +1,20 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -SUBDIRS = squeeze +SUBDIRS = squeeze gui -INCLUDES = $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) -I$(srcdir)/gui $(PS_DEF) +INCLUDES = -I$(srcdir)/gui +INCLUDES += $(PS_DEF) +INCLUDES += $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) +INCLUDES += $(X_CFLAGS) -## building without t1lib not supported -INCLUDES += -DT1LIB +bin_SCRIPTS = xdvi -## building without GREY or COLOR not supported -INCLUDES += -DGREY -DCOLOR +bin_PROGRAMS = xdvi-bin -## For testing: either noinst_LIBRARIES or EXTRA_LIBRARIES! -noinst_LIBRARIES = libxdvi.a -## EXTRA_LIBRARIES = libxdvi.a +nodist_xdvi_bin_SOURCES = psheader.c -libxdvi_a_SOURCES = \ +xdvi_bin_SOURCES = \ alloc-debug.h \ browser.c \ browser.h \ @@ -81,22 +80,40 @@ libxdvi_a_SOURCES = \ vf.c \ x_util.c \ x_util.h \ + xdvi-config.h \ + xdvi-debug.h \ xdvi.c \ xdvi.h \ xserver-info.c \ xserver-info.h -## dvips_DEPENDENCIES = $(KPATHSEA_DEPEND) +xdvi_bin_DEPENDENCIES = gui/libgui.a $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) + +# Make `#include <X11/...>' and `-lX...' work. +# This matches web2c (needed only for Metafont). +## x_cppflags=@X_CFLAGS@ @iconv_includes@ +## x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@ +## x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@ + +# Follow the library order used in X11R6 itself. +# It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put +# x_xpm_libs after the tool_libs -- but before -lX11, since on MacOSX it +# uses XGrabServer and XUngrabServer, which would otherwise be +# unresolved with static libraries. +# Xmu needs to come before Xt and after the toolkit libs. +xdvi_x_libs = $(X_LIBS) $(x_tool_libs) $(x_xmu_lib) -lXt $(X_PRE_LIBS) +xdvi_x_libs += $(x_ext_lib) $(x_xpm_libs) -lX11 $(X_EXTRA_LIBS) -## LDADD = $(KPATHSEA_LIBS) +LDADD = gui/libgui.a $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) + +gui/libgui.a: + cd gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a ## Rebuild libkpathsea @KPATHSEA_RULE@ ## Rebuild libt1 @T1LIB_RULE@ -nodist_libxdvi_a_SOURCES = psheader.c - psheader.c: psheader.txt squeeze/squeeze$(EXEEXT) squeeze/squeeze $(srcdir)/psheader.txt $@ @@ -138,73 +155,6 @@ EXTRA_DIST += \ LESSTIF-BUGS \ README.t1fonts \ README.t1mapper \ - gui/Makefile.in \ - gui/Panner.c \ - gui/Panner.h \ - gui/PannerP.h \ - gui/Tip.c \ - gui/Tip.h \ - gui/TipP.h \ - gui/help-window.c \ - gui/help-window.h \ - gui/mag.c \ - gui/mag.h \ - gui/menu.c \ - gui/menu.h \ - gui/message-window.c \ - gui/message-window.h \ - gui/pagesel.c \ - gui/pagesel.h \ - gui/print-dialog.c \ - gui/print-dialog.h \ - gui/print-log.c \ - gui/print-log.h \ - gui/search-dialog.c \ - gui/search-dialog.h \ - gui/selection.c \ - gui/selection.h \ - gui/sfDir.c \ - gui/sfDir.h \ - gui/sfDraw.c \ - gui/sfDraw.h \ - gui/sfPath.c \ - gui/sfPath.h \ - gui/sfSelFile.c \ - gui/sfSelFile.h \ - gui/sfinternal.h \ - gui/statusline.c \ - gui/statusline.h \ - gui/topic-window.c \ - gui/topic-window.h \ - gui/xaw_bitmaps.c \ - gui/xaw_bitmaps.h \ - gui/xaw_menu.c \ - gui/xaw_menu.h \ - gui/xicon.c \ - gui/xicon.h \ - gui/xlwradio.c \ - gui/xlwradio.h \ - gui/xlwradioP.h \ - gui/xm_colorsel.c \ - gui/xm_colorsel.h \ - gui/xm_filesel.c \ - gui/xm_menu.c \ - gui/xm_menu.h \ - gui/xm_prefs.c \ - gui/xm_prefs.h \ - gui/xm_prefsP.h \ - gui/xm_prefs_appearance.c \ - gui/xm_prefs_appearance.h \ - gui/xm_prefs_fonts.c \ - gui/xm_prefs_fonts.h \ - gui/xm_prefs_helpers.c \ - gui/xm_prefs_helpers.h \ - gui/xm_prefs_page.c \ - gui/xm_prefs_page.h \ - gui/xm_prefs_scroll.c \ - gui/xm_prefs_scroll.h \ - gui/xm_toolbar.c \ - gui/xm_toolbar.h \ m4/acinclude.m4 \ mksedscript \ pixmaps/drag_horiz.xbm \ @@ -242,10 +192,7 @@ EXTRA_DIST += \ texmf-alt/xdvi.cfg \ texmf-alt/xdvifont.map \ texmf-alt/xypic.map \ - xdvi-config.h \ - xdvi-debug.h \ xdvi-search.el \ - xdvi-sh.in \ xdvi.1.in \ xdvi.icon \ xdvizilla \ @@ -284,5 +231,6 @@ EXTRA_DIST += \ gui/Makefile.in.orig \ kpathsea.ac.orig \ tests/Makefile.in.orig \ - withenable.ac.orig + withenable.ac.orig \ + withenable.ac.work diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in index 8178615f16d..261fb60e109 100644 --- a/Build/source/texk/xdvik/Makefile.in +++ b/Build/source/texk/xdvik/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,6 +34,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +bin_PROGRAMS = xdvi-bin$(EXEEXT) subdir = . DIST_COMMON = $(am__configure_deps) $(dist_noinst_DATA) \ $(dist_pixmap_DATA) $(dist_xdvi_DATA) \ @@ -42,7 +44,7 @@ DIST_COMMON = $(am__configure_deps) $(dist_noinst_DATA) \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/c-auto.in \ + $(srcdir)/Makefile.in $(srcdir)/c-auto.in $(srcdir)/xdvi-sh.in \ $(top_srcdir)/configure ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ @@ -52,12 +54,15 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-arg-string.m4 \ $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \ $(top_srcdir)/m4/xdvi-cc-concat.m4 \ + $(top_srcdir)/m4/xdvi-find-motif.m4 \ + $(top_srcdir)/m4/xdvi-find-xpm.m4 \ $(top_srcdir)/m4/xdvi-func-memicmp.m4 \ $(top_srcdir)/m4/xdvi-func-poll.m4 \ $(top_srcdir)/m4/xdvi-func-setsid-in-fork.m4 \ $(top_srcdir)/m4/xdvi-func-working-vsnprintf.m4 \ $(top_srcdir)/m4/xdvi-iconv-char-pptr-type.m4 \ $(top_srcdir)/m4/xdvi-linker-multiple-defns.m4 \ + $(top_srcdir)/m4/xdvi-old-xaw.m4 \ $(top_srcdir)/m4/xdvi-sys-old-linux.m4 \ $(top_srcdir)/m4/xdvi-sys-streams.m4 \ $(top_srcdir)/m4/xdvi-sys-sunos4.m4 \ @@ -76,12 +81,12 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = c-auto.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libxdvi_a_AR = $(AR) $(ARFLAGS) -libxdvi_a_LIBADD = -am_libxdvi_a_OBJECTS = browser.$(OBJEXT) dl_list.$(OBJEXT) \ +CONFIG_CLEAN_FILES = xdvi +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_xdvi_bin_OBJECTS = browser.$(OBJEXT) dl_list.$(OBJEXT) \ dvi-draw.$(OBJEXT) dvi-init.$(OBJEXT) dvisel.$(OBJEXT) \ encodings.$(OBJEXT) events.$(OBJEXT) exit-handlers.$(OBJEXT) \ filehist.$(OBJEXT) font-open.$(OBJEXT) gf.$(OBJEXT) \ @@ -93,9 +98,15 @@ am_libxdvi_a_OBJECTS = browser.$(OBJEXT) dl_list.$(OBJEXT) \ special.$(OBJEXT) string-utils.$(OBJEXT) string_list.$(OBJEXT) \ tfmload.$(OBJEXT) util.$(OBJEXT) vf.$(OBJEXT) x_util.$(OBJEXT) \ xdvi.$(OBJEXT) xserver-info.$(OBJEXT) -nodist_libxdvi_a_OBJECTS = psheader.$(OBJEXT) -libxdvi_a_OBJECTS = $(am_libxdvi_a_OBJECTS) \ - $(nodist_libxdvi_a_OBJECTS) +nodist_xdvi_bin_OBJECTS = psheader.$(OBJEXT) +xdvi_bin_OBJECTS = $(am_xdvi_bin_OBJECTS) $(nodist_xdvi_bin_OBJECTS) +xdvi_bin_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -108,8 +119,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libxdvi_a_SOURCES) $(nodist_libxdvi_a_SOURCES) -DIST_SOURCES = $(libxdvi_a_SOURCES) +SOURCES = $(xdvi_bin_SOURCES) $(nodist_xdvi_bin_SOURCES) +DIST_SOURCES = $(xdvi_bin_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -123,7 +134,6 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)" dist_pixmapDATA_INSTALL = $(INSTALL_DATA) dist_xdviDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_noinst_DATA) $(dist_pixmap_DATA) $(dist_xdvi_DATA) @@ -244,6 +254,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +final_exec_name = @final_exec_name@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -278,12 +289,16 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ x_linker_options = @x_linker_options@ +x_tool_libs = @x_tool_libs@ +x_xmu_lib = @x_xmu_lib@ +x_xpm_libs = @x_xpm_libs@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -SUBDIRS = squeeze -INCLUDES = $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) -I$(srcdir)/gui \ - $(PS_DEF) -DT1LIB -DGREY -DCOLOR -noinst_LIBRARIES = libxdvi.a -libxdvi_a_SOURCES = \ +SUBDIRS = squeeze gui +INCLUDES = -I$(srcdir)/gui $(PS_DEF) $(KPATHSEA_INCLUDES) \ + $(T1LIB_INCLUDES) $(X_CFLAGS) +bin_SCRIPTS = xdvi +nodist_xdvi_bin_SOURCES = psheader.c +xdvi_bin_SOURCES = \ alloc-debug.h \ browser.c \ browser.h \ @@ -349,35 +364,29 @@ libxdvi_a_SOURCES = \ vf.c \ x_util.c \ x_util.h \ + xdvi-config.h \ + xdvi-debug.h \ xdvi.c \ xdvi.h \ xserver-info.c \ xserver-info.h -nodist_libxdvi_a_SOURCES = psheader.c +xdvi_bin_DEPENDENCIES = gui/libgui.a $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) + +# Make `#include <X11/...>' and `-lX...' work. +# This matches web2c (needed only for Metafont). + +# Follow the library order used in X11R6 itself. +# It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put +# x_xpm_libs after the tool_libs -- but before -lX11, since on MacOSX it +# uses XGrabServer and XUngrabServer, which would otherwise be +# unresolved with static libraries. +# Xmu needs to come before Xt and after the toolkit libs. +xdvi_x_libs = $(X_LIBS) $(x_tool_libs) $(x_xmu_lib) -lXt $(X_PRE_LIBS) \ + $(x_ext_lib) $(x_xpm_libs) -lX11 $(X_EXTRA_LIBS) +LDADD = gui/libgui.a $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) EXTRA_DIST = psheader.txt BUGS CHANGES ChangeLog.TL FAQ LESSTIF-BUGS \ - README.t1fonts README.t1mapper gui/Makefile.in gui/Panner.c \ - gui/Panner.h gui/PannerP.h gui/Tip.c gui/Tip.h gui/TipP.h \ - gui/help-window.c gui/help-window.h gui/mag.c gui/mag.h \ - gui/menu.c gui/menu.h gui/message-window.c \ - gui/message-window.h gui/pagesel.c gui/pagesel.h \ - gui/print-dialog.c gui/print-dialog.h gui/print-log.c \ - gui/print-log.h gui/search-dialog.c gui/search-dialog.h \ - gui/selection.c gui/selection.h gui/sfDir.c gui/sfDir.h \ - gui/sfDraw.c gui/sfDraw.h gui/sfPath.c gui/sfPath.h \ - gui/sfSelFile.c gui/sfSelFile.h gui/sfinternal.h \ - gui/statusline.c gui/statusline.h gui/topic-window.c \ - gui/topic-window.h gui/xaw_bitmaps.c gui/xaw_bitmaps.h \ - gui/xaw_menu.c gui/xaw_menu.h gui/xicon.c gui/xicon.h \ - gui/xlwradio.c gui/xlwradio.h gui/xlwradioP.h \ - gui/xm_colorsel.c gui/xm_colorsel.h gui/xm_filesel.c \ - gui/xm_menu.c gui/xm_menu.h gui/xm_prefs.c gui/xm_prefs.h \ - gui/xm_prefsP.h gui/xm_prefs_appearance.c \ - gui/xm_prefs_appearance.h gui/xm_prefs_fonts.c \ - gui/xm_prefs_fonts.h gui/xm_prefs_helpers.c \ - gui/xm_prefs_helpers.h gui/xm_prefs_page.c gui/xm_prefs_page.h \ - gui/xm_prefs_scroll.c gui/xm_prefs_scroll.h gui/xm_toolbar.c \ - gui/xm_toolbar.h m4/acinclude.m4 mksedscript \ + README.t1fonts README.t1mapper m4/acinclude.m4 mksedscript \ pixmaps/drag_horiz.xbm pixmaps/drag_horiz_mask.xbm \ pixmaps/drag_omni.xbm pixmaps/drag_omni_mask.xbm \ pixmaps/drag_vert.xbm pixmaps/drag_vert_mask.xbm \ @@ -391,10 +400,9 @@ EXTRA_DIST = psheader.txt BUGS CHANGES ChangeLog.TL FAQ LESSTIF-BUGS \ tests/test_string_list.c tests/test_string_utils.c \ tests/test_util.c texmf-alt/README texmf-alt/charter2.map \ texmf-alt/lucida.map texmf-alt/marvosym.map texmf-alt/xdvi.cfg \ - texmf-alt/xdvifont.map texmf-alt/xypic.map xdvi-config.h \ - xdvi-debug.h xdvi-search.el xdvi-sh.in xdvi.1.in xdvi.icon \ - xdvizilla xdvizilla.1 Makefile.in-22.84.14 acconfig.h-22.84.14 \ - acinclude.m4-22.84.14 aclocal.m4-22.84.14 \ + texmf-alt/xdvifont.map texmf-alt/xypic.map xdvi-search.el \ + xdvi.1.in xdvi.icon xdvizilla xdvizilla.1 Makefile.in-22.84.14 \ + acconfig.h-22.84.14 acinclude.m4-22.84.14 aclocal.m4-22.84.14 \ configure.in-22.84.14 kpathsea.ac-22.84.14 \ withenable.ac-22.84.14 Makefile.in-22.84.15 \ acconfig.h-22.84.15 aclocal.m4-22.84.15 configure.in-22.84.15 \ @@ -402,7 +410,7 @@ EXTRA_DIST = psheader.txt BUGS CHANGES ChangeLog.TL FAQ LESSTIF-BUGS \ tests/Makefile.in-22.84.15 withenable.ac-22.84.15 \ Makefile.in.orig Makefile.in.work configure.in.orig \ configure.in.work gui/Makefile.in.orig kpathsea.ac.orig \ - tests/Makefile.in.orig withenable.ac.orig + tests/Makefile.in.orig withenable.ac.orig withenable.ac.work CLEANFILES = psheader.c xdvidir = ${prefix}/texmf/xdvi dist_xdvi_DATA = texmf/XDvi @@ -464,13 +472,58 @@ $(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f c-auto.h stamp-h1 +xdvi: $(top_builddir)/config.status $(srcdir)/xdvi-sh.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libxdvi.a: $(libxdvi_a_OBJECTS) $(libxdvi_a_DEPENDENCIES) - -rm -f libxdvi.a - $(libxdvi_a_AR) libxdvi.a $(libxdvi_a_OBJECTS) $(libxdvi_a_LIBADD) - $(RANLIB) libxdvi.a +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +xdvi-bin$(EXEEXT): $(xdvi_bin_OBJECTS) $(xdvi_bin_DEPENDENCIES) + @rm -f xdvi-bin$(EXEEXT) + $(LINK) $(xdvi_bin_OBJECTS) $(xdvi_bin_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -858,10 +911,10 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(LIBRARIES) $(DATA) c-auto.h +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) c-auto.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -891,8 +944,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -917,7 +969,7 @@ install-data-am: install-dist_pixmapDATA install-dist_xdviDATA install-dvi: install-dvi-recursive -install-exec-am: +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-html: install-html-recursive @@ -951,7 +1003,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_pixmapDATA uninstall-dist_xdviDATA +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-dist_pixmapDATA uninstall-dist_xdviDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook @@ -959,25 +1012,30 @@ uninstall-am: uninstall-dist_pixmapDATA uninstall-dist_xdviDATA install-data-am install-strip uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags ctags-recursive dist \ + all all-am am--refresh check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags ctags-recursive dist \ dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook \ - install-dist_pixmapDATA install-dist_xdviDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-dist_pixmapDATA \ - uninstall-dist_xdviDATA uninstall-hook - + install-binPROGRAMS install-binSCRIPTS install-data \ + install-data-am install-data-hook install-dist_pixmapDATA \ + install-dist_xdviDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-dist_pixmapDATA uninstall-dist_xdviDATA \ + uninstall-hook + + +gui/libgui.a: + cd gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a @KPATHSEA_RULE@ @T1LIB_RULE@ diff --git a/Build/source/texk/xdvik/aclocal.m4 b/Build/source/texk/xdvik/aclocal.m4 index 691c799247e..11918b73fde 100644 --- a/Build/source/texk/xdvik/aclocal.m4 +++ b/Build/source/texk/xdvik/aclocal.m4 @@ -907,12 +907,15 @@ AC_SUBST([am__untar]) m4_include([m4/xdvi-arg-string.m4]) m4_include([m4/xdvi-c-bitmap-type.m4]) m4_include([m4/xdvi-cc-concat.m4]) +m4_include([m4/xdvi-find-motif.m4]) +m4_include([m4/xdvi-find-xpm.m4]) m4_include([m4/xdvi-func-memicmp.m4]) m4_include([m4/xdvi-func-poll.m4]) m4_include([m4/xdvi-func-setsid-in-fork.m4]) m4_include([m4/xdvi-func-working-vsnprintf.m4]) m4_include([m4/xdvi-iconv-char-pptr-type.m4]) m4_include([m4/xdvi-linker-multiple-defns.m4]) +m4_include([m4/xdvi-old-xaw.m4]) m4_include([m4/xdvi-sys-old-linux.m4]) m4_include([m4/xdvi-sys-streams.m4]) m4_include([m4/xdvi-sys-sunos4.m4]) diff --git a/Build/source/texk/xdvik/c-auto.in b/Build/source/texk/xdvik/c-auto.in index 704791ac0d3..4e7ffe41bb5 100644 --- a/Build/source/texk/xdvik/c-auto.in +++ b/Build/source/texk/xdvik/c-auto.in @@ -1,5 +1,8 @@ /* c-auto.in. Generated from configure.ac by autoheader. */ +/* Define to use A4 as the default paper size. */ +#undef A4 + /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -13,6 +16,9 @@ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID +/* Define to enable support for color specials. */ +#undef COLOR + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -31,6 +37,9 @@ necessary. */ #undef FLAKY_SIGPOLL +/* Define to enable greyscale anti-aliasing for shrunken bitmaps. */ +#undef GREY + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -144,6 +153,9 @@ /* Define to 1 if you have the `nl_langinfo' function. */ #undef HAVE_NL_LANGINFO +/* Define if you have an old version of the Xaw library */ +#undef HAVE_OLD_XAW + /* Define if your system has <poll.h> and poll(). */ #undef HAVE_POLL @@ -273,9 +285,34 @@ /* Define to 1 if `fork' works. */ #undef HAVE_WORKING_FORK +/* Define if the CODESET argument to nl_langinfo works. */ +#undef HAVE_WORKING_NL_LANGINFO_CODESET + /* Define to 1 if `vfork' works. */ #undef HAVE_WORKING_VFORK +/* Define to 1 if you have the <X11/Intrinsic.h> header file. */ +#undef HAVE_X11_INTRINSIC_H + +/* Define to 1 if you have the <X11/Xmu/Editres.h> header file. */ +#undef HAVE_X11_XMU_EDITRES_H + +/* Define to 1 if you have the <X11/Xmu/Xmu.h> header file. */ +#undef HAVE_X11_XMU_XMU_H + +/* Define to 1 if you have the <X11/Xosdefs.h> header file. */ +#undef HAVE_X11_XOSDEFS_H + +/* Define if you have the <X11/xpm.h> header file. */ +#undef HAVE_X11_XPM_H + +/* Define to 1 if you have the <Xm/XpmP.h> header file. */ +#undef HAVE_XM_XPMP_H + +/* Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8). + */ +#undef HAVE_XPM_H + /* Define the type of the iconv input string (char ** or const char **) */ #undef ICONV_CHAR_PPTR_TYPE @@ -286,6 +323,9 @@ */ #undef LT_OBJDIR +/* Define to use the Motif toolkit. */ +#undef MOTIF + /* Name of package */ #undef PACKAGE @@ -321,6 +361,15 @@ /* Define if you are using SunOS 4.x. */ #undef SUNOS4 +/* Define to compile in t1lib. */ +#undef T1LIB + +/* Define to use Xaw panner. */ +#undef USE_XAW_PANNER + +/* Define if you want to use the Xpm library */ +#undef USE_XPM + /* Version number of package */ #undef VERSION @@ -336,6 +385,9 @@ # endif #endif +/* Define to use the Xaw toolkit. */ +#undef XAW + /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index b6f3513f859..5bd78dbf029 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -801,6 +801,10 @@ KPATHSEA_INCLUDES iconv_includes iconv_libs iconv_libpath +final_exec_name +x_tool_libs +x_xpm_libs +x_xmu_lib x_linker_options X_EXTRA_LIBS X_LIBS @@ -938,7 +942,14 @@ enable_libtool_lock enable_largefile with_xdvi_x_toolkit with_ps +enable_a4 +enable_magick with_x +with_xpm +with_xpm_includes +with_xpm_libraries +with_motif_include +with_motif_libdir with_iconv_libdir with_iconv_include with_system_kpathsea @@ -1609,6 +1620,10 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files + --disable-a4 Set default paper size to letter and default unit to + inch + --enable-magick Use ImageMagick to load/render image files. + EXPERIMENTAL - DO NOT USE! Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1621,6 +1636,14 @@ Optional Packages: [default: Motif if available, else Xaw] --with-ps=PS Use PostScript (PS=no/yes/gs/dps/news, default gs) --with-x use the X Window System + --without-xpm Do not use the Xpm library (will disable the toolbar) + --with-xpm-include=DIR + Specify the location of Xpm include files + --with-xpm-libdir=DIR + Specify the location of Xpm libraries + --with-motif-include=DIR + Specify the location of Motif include files + --with-motif-libdir=DIR Specify the location of Motif libraries --with-iconv-libdir=DIR Specify the location of iconv library (librecode.so) --with-iconv-include=DIR @@ -4234,13 +4257,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:4237: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4260: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4240: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4263: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4243: output\"" >&5) + (eval echo "\"\$as_me:4266: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5446,7 +5469,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5449 "configure"' > conftest.$ac_ext + echo '#line 5472 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7493,11 +7516,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:7496: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7519: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7500: \$? = $ac_status" >&5 + echo "$as_me:7523: \$? = $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. @@ -7832,11 +7855,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:7835: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7858: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7839: \$? = $ac_status" >&5 + echo "$as_me:7862: \$? = $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. @@ -7937,11 +7960,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:7940: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7963: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7944: \$? = $ac_status" >&5 + echo "$as_me:7967: \$? = $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 @@ -7992,11 +8015,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:7995: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8018: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7999: \$? = $ac_status" >&5 + echo "$as_me:8022: \$? = $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 @@ -10792,7 +10815,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10795 "configure" +#line 10818 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10888,7 +10911,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10891 "configure" +#line 10914 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12933,6 +12956,50 @@ esac + +cat >>confdefs.h <<\_ACEOF +#define GREY 1 +_ACEOF + + + +cat >>confdefs.h <<\_ACEOF +#define COLOR 1 +_ACEOF + + + + + +cat >>confdefs.h <<\_ACEOF +#define T1LIB 1 +_ACEOF + + + +# Check whether --enable-a4 was given. +if test "${enable_a4+set}" = set; then + enableval=$enable_a4; +fi + +if test "x$enable_a4" = xno; then + { $as_echo "$as_me:$LINENO: Disabled a4/cm, using letter/in instead" >&5 +$as_echo "$as_me: Disabled a4/cm, using letter/in instead" >&6;} +else + +cat >>confdefs.h <<\_ACEOF +#define A4 1 +_ACEOF + +fi + + +# Check whether --enable-magick was given. +if test "${enable_magick+set}" = set; then + enableval=$enable_magick; +fi + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -15944,11 +16011,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:15947: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16014: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15951: \$? = $ac_status" >&5 + echo "$as_me:16018: \$? = $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. @@ -16043,11 +16110,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:16046: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16113: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16050: \$? = $ac_status" >&5 + echo "$as_me:16117: \$? = $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 @@ -16095,11 +16162,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:16098: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16165: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16102: \$? = $ac_status" >&5 + echo "$as_me:16169: \$? = $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 @@ -21104,6 +21171,8 @@ done fi + + { $as_echo "$as_me:$LINENO: checking whether linker supports the --allow-multiple-definition flag" >&5 $as_echo_n "checking whether linker supports the --allow-multiple-definition flag... " >&6; } if test "${xdvi_cv_linker_multiple_defns+set}" = set; then @@ -21902,6 +21971,1773 @@ fi done +xdvi_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + + + +for ac_header in X11/Intrinsic.h X11/Xosdefs.h X11/xpm.h Xm/XpmP.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 + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ---------------------------- ## +## Report this to tex-k@tug.org ## +## ---------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_header in X11/Xmu/Editres.h X11/Xmu/Xmu.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; 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. */ +#ifdef HAVE_X11_INTRINSIC_H +# include <X11/Intrinsic.h> +#endif + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + eval "$as_ac_Header=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $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_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + x_xmu_lib=-lXmu +else + x_xmu_lib= +fi + +done + + +CPPFLAGS=$xdvi_save_CPPFLAGS + + +if test "${with_xdvi_x_toolkit}" = xaw; then + { $as_echo "$as_me:$LINENO: checking for Xaw library" >&5 +$as_echo_n "checking for Xaw library... " >&6; } + 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/Xfuncs.h> +#include <X11/Intrinsic.h> +#include <X11/Xaw/Form.h> + +int +main () +{ + + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + xdvi_have_xaw=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xdvi_have_xaw=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$save_CPPFLAGS + if test $xdvi_have_xaw = yes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: not found" >&5 +$as_echo "not found" >&6; } + { { $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 + + { $as_echo "$as_me:$LINENO: checking version of Xaw library" >&5 +$as_echo_n "checking version of Xaw library... " >&6; } + 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/IntrinsicP.h> +#include <X11/StringDefs.h> +#include <X11/Intrinsic.h> +#include <X11/StringDefs.h> +#include <X11/Xos.h> +#include <X11/Xaw/Text.h> +#include <X11/Xaw/AsciiText.h> +#include <X11/Xaw/ToggleP.h> + typedef void (*XawDiamondProc) (Widget); + + /* New fields for the Radio widget class record */ + typedef struct _RadioClass { + Dimension dsize; /* diamond size */ + XawDiamondProc drawDiamond; + /* pixmaps for the button */ + Pixmap sel_radio; /* selected state */ + Pixmap unsel_radio; /* unselected state */ + Pixmap sel_menu; /* selected state */ + Pixmap unsel_menu; /* unselected state */ + /* TODO: 3-d and xaw-xpm features? */ + XtPointer extension; + } RadioClassPart; + + /* Full class record declaration */ + typedef struct _RadioClassRec { + CoreClassPart core_class; + SimpleClassPart simple_class; + LabelClassPart label_class; + CommandClassPart command_class; + ToggleClassPart toggle_class; + RadioClassPart radio_class; + } RadioClassRec; + /* New fields for the Radio widget record */ + typedef struct { + /* resources */ + Boolean isRadio; /* radio if True, checkbox else */ + /* TODO: 3-d and xaw-xpm features? */ + + /* private data */ + XtPointer extension; + } RadioPart; + + /* Full widget declaration */ + typedef struct _RadioRec { + CorePart core; + SimplePart simple; +#ifdef _ThreeDP_h + ThreeDPart threeD; +#endif + LabelPart label; + CommandPart command; + TogglePart toggle; + RadioPart radio; + } RadioRec; + + + /* The actions table from Toggle is almost perfect, but we need + * to override Highlight, Set, and Unset. + */ + +#define SuperClass ((ToggleWidgetClass)&toggleClassRec) + +#define BOX_SIZE 16 +#define PIXMAP_OFFSET 2 /* additional space between pixmap and label */ + +int +main () +{ + + RadioClassRec radioClassRec = { + { + (WidgetClass) SuperClass, /* superclass */ + "Radio", /* class_name */ + sizeof(RadioRec), /* size */ + NULL, /* class_initialize */ + NULL, /* class_part_initialize */ + FALSE, /* class_inited */ + NULL, /* initialize */ + NULL, /* initialize_hook */ + XtInheritRealize, /* realize */ + NULL, /* actions */ + 0, /* num_actions */ + NULL, /* resources */ + 0, /* resource_count */ + NULLQUARK, /* xrm_class */ + TRUE, /* compress_motion */ + TRUE, /* compress_exposure */ + TRUE, /* compress_enterleave */ + FALSE, /* visible_interest */ + NULL, /* destroy */ + NULL, /* resize */ + NULL, /* expose */ + NULL, /* set_values */ + NULL, /* set_values_hook */ + XtInheritSetValuesAlmost, /* set_values_almost */ + NULL, /* get_values_hook */ + NULL, /* accept_focus */ + XtVersion, /* version */ + NULL, /* callback_private */ + XtInheritTranslations, /* tm_table */ + NULL, /* query_geometry */ + XtInheritDisplayAccelerator, /* display_accelerator */ + NULL /* extension */ + }, /* CoreClass fields initialization */ + { + XtInheritChangeSensitive, /* change_sensitive */ + NULL + }, /* SimpleClass fields initialization */ + { + 0 /* field not used */ + }, /* LabelClass fields initialization */ + { + 0 /* field not used */ + }, /* CommandClass fields initialization */ + { + NULL, /* Set Procedure. */ + NULL, /* Unset Procedure. */ + NULL /* extension. */ + }, /* ToggleClass fields initialization */ + { + BOX_SIZE, + NULL, /* draw procedure */ + None, /* selected radiobutton */ + None, /* unselected radiobutton */ + None, /* selected menubutton */ + None, /* unselected menubutton */ + NULL /* extension. */ + } /* RadioClass fields initialization */ + }; + (void)radioClassRec; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + xdvi_old_xaw=no +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xdvi_old_xaw=yes + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$save_CPPFLAGS +if test $xdvi_old_xaw = yes; then + { $as_echo "$as_me:$LINENO: result: old" >&5 +$as_echo "old" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OLD_XAW 1 +_ACEOF + +else + { $as_echo "$as_me:$LINENO: result: current" >&5 +$as_echo "current" >&6; } +fi +fi + + +{ $as_echo "$as_me:$LINENO: checking if nl_langinfo(CODESET) is working" >&5 +$as_echo_n "checking if nl_langinfo(CODESET) is working... " >&6; } +if test "${xdvi_cv_nl_langinfo_codeset+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. */ +#include <langinfo.h> +int +main () +{ +char* cs = nl_langinfo(CODESET); + ; + 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 + xdvi_cv_nl_langinfo_codeset=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + xdvi_cv_nl_langinfo_codeset=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 +{ $as_echo "$as_me:$LINENO: result: $xdvi_cv_nl_langinfo_codeset" >&5 +$as_echo "$xdvi_cv_nl_langinfo_codeset" >&6; } +if test "x$xdvi_cv_nl_langinfo_codeset" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WORKING_NL_LANGINFO_CODESET 1 +_ACEOF + +fi + + + + + + + +xpm_includes= +xpm_libraries= + +# Check whether --with-xpm was given. +if test "${with_xpm+set}" = set; then + withval=$with_xpm; +fi + +if test "$with_xpm" = "no" +then +xpm_includes=no +xpm_libraries=no +fi + +# Check whether --with-xpm-includes was given. +if test "${with_xpm_includes+set}" = set; then + 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" +fi + +{ $as_echo "$as_me:$LINENO: checking for Xpm" >&5 +$as_echo_n "checking for Xpm... " >&6; } +# +# +# Search the include files. XPM can either be in <X11/xpm.h> (as in X11R6), +# which is dealt with by AC_CHECK_HEADERS(X11/xpm.h), or in <xpm.h> if installed locally; +# this is what this test is for. +# +if test "$xpm_includes" = ""; 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_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. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <X11/xpm.h> + +int +main () +{ +int a; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + +# X11/xpm.h is in the standard search path. +xdvi_cv_xpm_includes="default" + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +# X11/xpm.h is not in the standard search path. +# Locate it and put its directory in `xpm_includes' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Xaw). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Xaw). +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/X11/include /usr/X11R5/include /usr/X11R6/include \ + /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ + /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/* +do + if test -f "$dir/X11/xpm.h"; then + xdvi_cv_xpm_includes="$dir" + break + elif test -f "$dir/xpm.h"; then + xdvi_cv_xpm_includes="$dir" + break + fi +done + +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 + +xpm_includes="$xdvi_cv_xpm_includes" +fi + +if test "x$xpm_includes" != x; then + if test "x$xpm_includes" = xdefault; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_X11_XPM_H 1 +_ACEOF + + elif test -f "$xpm_includes/X11/xpm.h"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_X11_XPM_H 1 +_ACEOF + + elif test -f "$xpm_includes/xpm.h"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XPM_H 1 +_ACEOF + + fi +fi + +# +# +# Now for the libraries. +# +if test "$xpm_libraries" = ""; then +if test "${xdvi_cv_xpm_libraries+set}" = set; then + $as_echo_n "(cached) " >&6 +else + +xdvi_xpm_save_LIBS="$LIBS" +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" +xdvi_cv_xpm_libraries= +# +# +# We use XtToolkitInitialize() here since it takes no arguments +# and thus also works with a C++ compiler. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <X11/Intrinsic.h> +#include <X11/xpm.h> + +int +main () +{ +XtToolkitInitialize(); + ; + 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 + +# libxpm.a is in the standard search path. +xdvi_cv_xpm_libraries="default" + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +# libXpm.a is not in the standard search path. +# Locate it and put its directory in `xpm_libraries' +# +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Xpm). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Xpm). +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ + /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/* +do + if test -d "$dir" && test "`ls $dir/libXpm.* 2> /dev/null`" != ""; then + xdvi_cv_xpm_libraries="$dir" + break + fi +done + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +# +LIBS="$xdvi_xpm_save_LIBS" +CFLAGS="$xdvi_xpm_save_CFLAGS" +CPPFLAGS="$xdvi_xpm_save_CPPFLAGS" +LDFLAGS="$xdvi_xpm_save_LDFLAGS" + +fi + +# +xpm_libraries="$xdvi_cv_xpm_libraries" +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" +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" +then +case "$X_LIBS" in + *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";; + *-R*) X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";; + *) X_LIBS="-L$xpm_libraries $X_LIBS";; +esac +fi + +# +# +x_xpm_libs="-lXpm" +# +# Now check the results of headers and libraries and set USE_XPM to 0 +# if one of them hadn't been found. +# + +cat >>confdefs.h <<\_ACEOF +#define USE_XPM 1 +_ACEOF + +xpm_libraries_result="$xpm_libraries" +xpm_includes_result="$xpm_includes" +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 + xpm_libraries_result="(none)" + cat >>confdefs.h <<\_ACEOF +#define USE_XPM 0 +_ACEOF + + x_xpm_libs="" +fi + +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 + cat >>confdefs.h <<\_ACEOF +#define USE_XPM 0 +_ACEOF + + xpm_includes_result="(none)" +fi + + +{ $as_echo "$as_me:$LINENO: result: libraries $xpm_libraries_result, headers $xpm_includes_result" >&5 +$as_echo "libraries $xpm_libraries_result, headers $xpm_includes_result" >&6; } + + + +# Check whether --with-motif-include was given. +if test "${with_motif_include+set}" = set; then + withval=$with_motif_include; +fi + + +# Check whether --with-motif-libdir was given. +if test "${with_motif_libdir+set}" = set; then + withval=$with_motif_libdir; +fi + + +case $with_xdvi_x_toolkit in + xaw3d) prog_extension="xaw3d"; x_tool_libs="-lXaw3d" ;; + neXtaw) prog_extension="nextaw"; x_tool_libs="-lneXtaw" ;; + xaw) prog_extension="xaw"; x_tool_libs="-lXaw" + +cat >>confdefs.h <<\_ACEOF +#define XAW 1 +_ACEOF + ;; + motif) +default_toolkit="none" + +{ $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 + $as_echo_n "(cached) " >&6 +else + +xdvi_motif_save_LIBS="$LIBS" +xdvi_motif_save_CFLAGS="$CFLAGS" +xdvi_motif_save_CPPFLAGS="$CPPFLAGS" +xdvi_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -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. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <Xm/Xm.h> +int +main () +{ +int a; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + +# Xm/Xm.h is in the standard search path. +xdvi_cv_motif_include= + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +# Xm/Xm.h is not in the standard search path. +# Locate it and put its directory in `motif_include' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ + /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/*; do + if test -f "$dir/Xm/Xm.h"; then + xdvi_cv_motif_include="$dir" + break + fi +done +if test "$xdvi_cv_motif_include" = ""; then +xdvi_cv_motif_include=no +fi + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# +LIBS="$xdvi_motif_save_LIBS" +CFLAGS="$xdvi_motif_save_CFLAGS" +CPPFLAGS="$xdvi_motif_save_CPPFLAGS" +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 + $as_echo_n "(cached) " >&6 +else + +xdvi_motif_save_LIBS="$LIBS" +xdvi_motif_save_CFLAGS="$CFLAGS" +xdvi_motif_save_CPPFLAGS="$CPPFLAGS" +xdvi_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +# We use XtToolkitInitialize() here since it takes no arguments +# and thus also works with a C++ compiler. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <X11/Intrinsic.h> +#include <Xm/Xm.h> + +int +main () +{ +XtToolkitInitialize(); + ; + 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 + +# libXm.a is in the standard search path. +xdvi_cv_motif_libdir= + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +# libXm.a is not in the standard search path. +# Locate it and put its directory in `motif_libdir' +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/lesstif is used on Linux (Lesstif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ + /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + /usr/lesstif*/lib /usr/lib/Lesstif* \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do + if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then + xdvi_cv_motif_libdir="$dir" + break + fi +done +if test "$xdvi_cv_motif_libdir" = ""; then +xdvi_cv_motif_libdir=no +fi + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +# +LIBS="$xdvi_motif_save_LIBS" +CFLAGS="$xdvi_motif_save_CFLAGS" +CPPFLAGS="$xdvi_motif_save_CPPFLAGS" +LDFLAGS="$xdvi_motif_save_LDFLAGS" + +fi + +# +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" && +cat >>confdefs.h <<\_ACEOF +#define MOTIF 1 +_ACEOF + +test "$motif_include_result" = "" && + motif_include_result="in default path" && cat >>confdefs.h <<\_ACEOF +#define MOTIF 1 +_ACEOF + +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 + { $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 +#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 +$as_echo_n "checking for LessTif... " >&6; } + 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> +int +main () +{ +const char *p = LesstifVERSION_STRING; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + + # 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. + ***************************************************************** + * Warning: You are using LessTif instead of OpenMotif. * + * Some GUI elements might be broken; please see the file * + * * + * texk/xdvik/LESSTIF-BUGS * + * * + * for more information. * + *****************************************************************" >&5 +$as_echo "$as_me: WARNING: LessTif header detected. + ***************************************************************** + * Warning: You are using LessTif instead of OpenMotif. * + * Some GUI elements might be broken; please see the file * + * * + * texk/xdvik/LESSTIF-BUGS * + * * + * for more information. * + *****************************************************************" >&2;} + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&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; } + prog_extension="xaw" + cat >>confdefs.h <<\_ACEOF +#define XAW 1 +_ACEOF + + x_tool_libs="-lXaw" +fi + +# +{ $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" +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/Xfuncs.h> +#include <X11/Intrinsic.h> + +#include <X11/Xaw/Reports.h> + +int +main () +{ + + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + xdvi_use_xaw_panner=yes +else + $as_echo "$as_me: failed program was:" >&5 +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; } + +cat >>confdefs.h <<\_ACEOF +#define USE_XAW_PANNER 1 +_ACEOF + +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + ;; + *) +default_toolkit="Xaw" + +{ $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 + $as_echo_n "(cached) " >&6 +else + +xdvi_motif_save_LIBS="$LIBS" +xdvi_motif_save_CFLAGS="$CFLAGS" +xdvi_motif_save_CPPFLAGS="$CPPFLAGS" +xdvi_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -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. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <Xm/Xm.h> +int +main () +{ +int a; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + +# Xm/Xm.h is in the standard search path. +xdvi_cv_motif_include= + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +# Xm/Xm.h is not in the standard search path. +# Locate it and put its directory in `motif_include' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ + /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/*; do + if test -f "$dir/Xm/Xm.h"; then + xdvi_cv_motif_include="$dir" + break + fi +done +if test "$xdvi_cv_motif_include" = ""; then +xdvi_cv_motif_include=no +fi + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# +LIBS="$xdvi_motif_save_LIBS" +CFLAGS="$xdvi_motif_save_CFLAGS" +CPPFLAGS="$xdvi_motif_save_CPPFLAGS" +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 + $as_echo_n "(cached) " >&6 +else + +xdvi_motif_save_LIBS="$LIBS" +xdvi_motif_save_CFLAGS="$CFLAGS" +xdvi_motif_save_CPPFLAGS="$CPPFLAGS" +xdvi_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +# We use XtToolkitInitialize() here since it takes no arguments +# and thus also works with a C++ compiler. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <X11/Intrinsic.h> +#include <Xm/Xm.h> + +int +main () +{ +XtToolkitInitialize(); + ; + 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 + +# libXm.a is in the standard search path. +xdvi_cv_motif_libdir= + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +# libXm.a is not in the standard search path. +# Locate it and put its directory in `motif_libdir' +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/lesstif is used on Linux (Lesstif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ + /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + /usr/lesstif*/lib /usr/lib/Lesstif* \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do + if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then + xdvi_cv_motif_libdir="$dir" + break + fi +done +if test "$xdvi_cv_motif_libdir" = ""; then +xdvi_cv_motif_libdir=no +fi + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +# +LIBS="$xdvi_motif_save_LIBS" +CFLAGS="$xdvi_motif_save_CFLAGS" +CPPFLAGS="$xdvi_motif_save_CPPFLAGS" +LDFLAGS="$xdvi_motif_save_LDFLAGS" + +fi + +# +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" && +cat >>confdefs.h <<\_ACEOF +#define MOTIF 1 +_ACEOF + +test "$motif_include_result" = "" && + motif_include_result="in default path" && cat >>confdefs.h <<\_ACEOF +#define MOTIF 1 +_ACEOF + +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 + { $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 +#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 +$as_echo_n "checking for LessTif... " >&6; } + 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> +int +main () +{ +const char *p = LesstifVERSION_STRING; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + + # 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. + ***************************************************************** + * Warning: You are using LessTif instead of OpenMotif. * + * Some GUI elements might be broken; please see the file * + * * + * texk/xdvik/LESSTIF-BUGS * + * * + * for more information. * + *****************************************************************" >&5 +$as_echo "$as_me: WARNING: LessTif header detected. + ***************************************************************** + * Warning: You are using LessTif instead of OpenMotif. * + * Some GUI elements might be broken; please see the file * + * * + * texk/xdvik/LESSTIF-BUGS * + * * + * for more information. * + *****************************************************************" >&2;} + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&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; } + prog_extension="xaw" + cat >>confdefs.h <<\_ACEOF +#define XAW 1 +_ACEOF + + x_tool_libs="-lXaw" +fi + +# +{ $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" +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/Xfuncs.h> +#include <X11/Intrinsic.h> + +#include <X11/Xaw/Reports.h> + +int +main () +{ + + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + xdvi_use_xaw_panner=yes +else + $as_echo "$as_me: failed program was:" >&5 +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; } + +cat >>confdefs.h <<\_ACEOF +#define USE_XAW_PANNER 1 +_ACEOF + +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + ;; +esac + + +final_exec_name="xdvi-$prog_extension" +program_transform_name="'s,xdvi-bin,$final_exec_name,'" + + # Check whether --with-iconv-libdir was given. @@ -24020,7 +25856,10 @@ XDVIK_VERSION=22.84.15 subdirs="$subdirs squeeze" -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile gui/Makefile" + + +ac_config_files="$ac_config_files xdvi:xdvi-sh.in" @@ -25022,6 +26861,8 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;; + "xdvi") CONFIG_FILES="$CONFIG_FILES xdvi:xdvi-sh.in" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -26611,6 +28452,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX _LT_EOF ;; + "xdvi":F) chmod +x xdvi ;; esac done # for ac_tag diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac index 0d438144784..c7a6b5a06df 100644 --- a/Build/source/texk/xdvik/configure.ac +++ b/Build/source/texk/xdvik/configure.ac @@ -39,6 +39,51 @@ AS_CASE([$with_ps], PS_DEF=-DPS_GS]) AC_SUBST([PS_DEF]) +dnl Required, not optional. +dnl AC_ARG_ENABLE([grey], +dnl AS_HELP_STRING([--disable-grey], +dnl [Disable greyscale anti-aliasing for shrunken bitmaps])) +AC_DEFINE([GREY], 1, [Define to enable greyscale anti-aliasing for shrunken bitmaps.]) + +dnl Required, not optional. +dnl AC_ARG_ENABLE([color], +dnl AS_HELP_STRING([--disable-color], +dnl [Disable support for color specials])) +AC_DEFINE([COLOR], 1, [Define to enable support for color specials.]) + +dnl OBSOLETE AC_ARG_ENABLE([buttons], +dnl OBSOLETE AS_HELP_STRING([--disable-buttons], +dnl OBSOLETE [Disable buttons on the side of the window])) +dnl OBSOLETE AC_DEFINE([BUTTONS], 1, [Define to enable buttons on the side of the window.]) + +dnl OBSOLETE AC_ARG_ENABLE([statusline], +dnl OBSOLETE AS_HELP_STRING([--disable-statusline], +dnl OBSOLETE [Disable statusline at bottom of window])) +dnl OBSOLETE AC_DEFINE([STATUSLINE], 1, [Define to enable statusline at bottom of window.]) + +dnl Required, not optional. +dnl AC_ARG_ENABLE([t1lib], +dnl AS_HELP_STRING([--disable-t1lib], +dnl [Do not use T1lib (direct rendering of Type1 fonts)])) +AC_DEFINE([T1LIB], 1, [Define to compile in t1lib.]) + +dnl OBSOLETE AC_ARG_ENABLE([gf], +dnl OBSOLETE AS_HELP_STRING([--enable-gf], +dnl OBSOLETE [Enable gf format pixel files (in addition to pk)])) +dnl OBSOLETE AC_DEFINE([USE_GF], 1, [Define to enable gf format files (in addition to pk format).]) + +AC_ARG_ENABLE([a4], + AS_HELP_STRING([--disable-a4], + [Set default paper size to letter and default unit to inch])) +AS_IF([test "x$enable_a4" = xno], + [AC_MSG_NOTICE([Disabled a4/cm, using letter/in instead])], + [AC_DEFINE([A4], 1, [Define to use A4 as the default paper size.])]) + +AC_ARG_ENABLE([magick], + AS_HELP_STRING([--enable-magick], + [Use ImageMagick to load/render image files. + EXPERIMENTAL - DO NOT USE!])) + AC_PROG_CXX AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) @@ -67,6 +112,10 @@ XDVI_FUNC_POLL dnl ####### +dnl COMPILER_WARNINGS + +dnl ####### + dnl SU: for `--allow-multiple-definition' linker flag on Cygwin XDVI_LINKER_MULTIPLE_DEFNS @@ -84,7 +133,63 @@ AC_CHECK_FUNCS([mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr 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. AC_CHECK_HEADERS([netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h iconv.h langinfo.h]) - + +dnl 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. +AC_CHECK_HEADERS([X11/Xmu/Editres.h X11/Xmu/Xmu.h], + [x_xmu_lib=-lXmu], + [x_xmu_lib=], + [#ifdef HAVE_X11_INTRINSIC_H +# include <X11/Intrinsic.h> +#endif]) +AC_SUBST([x_xmu_lib]) +CPPFLAGS=$xdvi_save_CPPFLAGS + +dnl check for Xaw version +XDVI_OLD_XAW + +dnl nl_langinfo checks +AC_CACHE_CHECK([if nl_langinfo(CODESET) is working], + [xdvi_cv_nl_langinfo_codeset], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], + [[char* cs = nl_langinfo(CODESET);]])], + [xdvi_cv_nl_langinfo_codeset=yes], + [xdvi_cv_nl_langinfo_codeset=no])]) +AS_IF([test "x$xdvi_cv_nl_langinfo_codeset" = xyes], + [AC_DEFINE([HAVE_WORKING_NL_LANGINFO_CODESET], 1, + [Define if the CODESET argument to nl_langinfo works.])]) + +dnl ####### + +dnl First, check for libXp and libXext + +dnl ####### + +dnl Check whether -lXpm can be used +XDVI_FIND_XPM + +AC_ARG_WITH([motif-include], + AS_HELP_STRING([--with-motif-include=DIR], + [Specify the location of Motif include files])) +AC_ARG_WITH([motif-libdir], + AS_HELP_STRING([--with-motif-libdir=DIR], + [Specify the location of Motif libraries])) + +AS_CASE([$with_xdvi_x_toolkit], + [xaw3d], [prog_extension="xaw3d"; x_tool_libs="-lXaw3d"], + [neXtaw], [prog_extension="nextaw"; x_tool_libs="-lneXtaw"], + [xaw], [prog_extension="xaw"; x_tool_libs="-lXaw" + AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.])], + [motif], [XDVI_FIND_MOTIF([none])], + [XDVI_FIND_MOTIF([Xaw])]) +AC_SUBST([x_tool_libs]) +final_exec_name="xdvi-$prog_extension" +program_transform_name="'s,xdvi-bin,$final_exec_name,'" +AC_SUBST([final_exec_name]) + dnl ####### AC_ARG_WITH([iconv-libdir], @@ -148,7 +253,9 @@ AC_SUBST([XDVIK_VERSION]) AC_CONFIG_SUBDIRS([squeeze]) -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile gui/Makefile]) + +AC_CONFIG_FILES([xdvi:xdvi-sh.in], [chmod +x xdvi]) dnl The subdirectory squeeze must be configured for the build system. dnl Can not share the cache file with the subdirectory! diff --git a/Build/source/texk/xdvik/configure.in.work b/Build/source/texk/xdvik/configure.in.work index cae81c7ed30..c362b30ba7f 100644 --- a/Build/source/texk/xdvik/configure.in.work +++ b/Build/source/texk/xdvik/configure.in.work @@ -1,30 +1,3 @@ -dnl allow for --program-suffix -AC_ARG_PROGRAM - -sinclude(../kpathsea/withenable.ac) -sinclude(../../withenable.ac) -sinclude(kpathsea.ac) - -if test "x$with_mktexpk_default" = "xno"; then - AC_MSG_WARN(Xdvik doesn't implement the --without-mktexpk-default option!) -fi - -if test "x$with_mktexmf_default" = "xno"; then - AC_MSG_WARN(Xdvik doesn't implement the --without-mktexmf-default option!) -fi - -if test "x$with_mktextfm_default" = "xno"; then - AC_MSG_WARN(Xdvik doesn't implement the --without-mktextfm-default option!) -fi - -if test "x$with_mkocp_default" = "xno"; then - AC_MSG_WARN(Xdvik doesn't implement the --without-mkocp-default option!) -fi - -if test "x$with_mkofm_default" = "xno"; then - AC_MSG_WARN(Xdvik doesn't implement the --without-mkofm-default option!) -fi - dnl ########## @@ -33,43 +6,6 @@ COMPILER_WARNINGS dnl ########## -cppflags_save=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_CHECK_HEADERS(X11/Intrinsic.h X11/Xosdefs.h X11/xpm.h Xm/XpmP.h) -CPPFLAGS=$cppflags_save - -dnl For editres, we need to check both the header and define a linker option. -cppflags_save=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_CHECK_HEADERS(X11/Xmu/Editres.h X11/Xmu/Xmu.h, x_xmu_lib=-lXmu, x_xmu_lib=, -[ -#ifdef HAVE_X11_INTRINSIC_H -# include <X11/Intrinsic.h> -#endif -]) -AC_SUBST(x_xmu_lib) -CPPFLAGS=$cppflags_save - -dnl For the bitmap size. -- I think this is in XDVI_C_BITMAP_TYPE now -janl -dnl AC_CHECK_SIZEOF(long) - -sinclude(../kpathsea/xt.ac) -sinclude(withenable.ac) -sinclude(../../libs/t1lib/withenable.ac) -sinclude(../../libs/t1lib/t1lib.ac) - -dnl check for Xaw version -XDVI_OLD_XAW - -dnl nl_langinfo checks -AC_MSG_CHECKING(if nl_langinfo(CODESET) is working) -AC_TRY_LINK([#include <langinfo.h>], [char* cs = nl_langinfo(CODESET);], - [AC_DEFINE([HAVE_WORKING_NL_LANGINFO_CODESET], 1, - [Define if the CODESET argument to nl_langinfo works.]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)] -) - dnl First, check for libXp and libXext: if test -z "$x_ext_lib"; then # allow envvar override if test -n "$x_libraries"; then @@ -94,47 +30,6 @@ if test -z "$x_ext_lib"; then # previous test unsuccessful, or envvar override fi AC_SUBST(x_ext_lib) -dnl For --with-x-toolkit. Must be Xaw at least. If no --with-x-toolkit is given, -dnl we try to check if Motif is available, and if yes, use it; else, -dnl we use Xaw (--with-x-toolkit=xaw can be used to override this default). - -dnl Check whether -lXpm can be used -XDVI_FIND_XPM - -dnl Check which X toolkit to use -prog_extension="xaw" -motif_include= -motif_libdir= -AC_ARG_WITH([motif-include], -[ --with-motif-include=DIR - Specify the location of Motif include files], -[motif_include="$withval"]) -AC_ARG_WITH([motif-libdir], -[ --with-motif-libdir=DIR - Specify the location of Motif libraries], -[motif_libdir="$withval"]) - -if test "x$with_xdvi_x_toolkit" = xxaw3d; then - prog_extension="xaw3d" - x_tool_libs="-lXaw3d" -elif test "x$with_xdvi_x_toolkit" = xneXtaw; then - prog_extension="nextaw" - x_tool_libs="-lneXtaw" -elif test "x$with_xdvi_x_toolkit" = xmotif; then -dnl Motif with no fallback -dnl XDVI_FIND_MOTIF also defines $prog_extension, AC_DEFINE(toolkit) and $x_tool_libs - XDVI_FIND_MOTIF(none, "$motif_include", "$motif_libdir") -elif test "x$with_xdvi_x_toolkit" = xxaw; then - prog_extension="xaw" - AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.]) - x_tool_libs="-lXaw" -else -dnl Motif with xaw as fallback -dnl XDVI_FIND_MOTIF also defines $prog_extension, AC_DEFINE(toolkit) and $x_tool_libs - XDVI_FIND_MOTIF(Xaw, "$motif_include", "$motif_libdir") -fi -AC_SUBST(x_tool_libs) - dnl ########## dnl We try to perform the $program_transform_name replacement already diff --git a/Build/source/texk/xdvik/gui/Makefile.am b/Build/source/texk/xdvik/gui/Makefile.am new file mode 100644 index 00000000000..ce61f2c0832 --- /dev/null +++ b/Build/source/texk/xdvik/gui/Makefile.am @@ -0,0 +1,76 @@ +## +INCLUDES = -I$(top_srcdir) +INCLUDES += $(PS_DEF) +INCLUDES += $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) +INCLUDES += $(X_CFLAGS) + +noinst_LIBRARIES = libgui.a + +libgui_a_SOURCES = \ + Panner.c \ + Panner.h \ + PannerP.h \ + Tip.c \ + Tip.h \ + TipP.h \ + help-window.c \ + help-window.h \ + mag.c \ + mag.h \ + menu.c \ + menu.h \ + message-window.c \ + message-window.h \ + pagesel.c \ + pagesel.h \ + print-dialog.c \ + print-dialog.h \ + print-log.c \ + print-log.h \ + search-dialog.c \ + search-dialog.h \ + selection.c \ + selection.h \ + sfDir.c \ + sfDir.h \ + sfDraw.c \ + sfDraw.h \ + sfPath.c \ + sfPath.h \ + sfSelFile.c \ + sfSelFile.h \ + sfinternal.h \ + statusline.c \ + statusline.h \ + topic-window.c \ + topic-window.h \ + xaw_bitmaps.c \ + xaw_bitmaps.h \ + xaw_menu.c \ + xaw_menu.h \ + xicon.c \ + xicon.h \ + xlwradio.c \ + xlwradio.h \ + xlwradioP.h \ + xm_colorsel.c \ + xm_colorsel.h \ + xm_filesel.c \ + xm_menu.c \ + xm_menu.h \ + xm_prefs.c \ + xm_prefs.h \ + xm_prefsP.h \ + xm_prefs_appearance.c \ + xm_prefs_appearance.h \ + xm_prefs_fonts.c \ + xm_prefs_fonts.h \ + xm_prefs_helpers.c \ + xm_prefs_helpers.h \ + xm_prefs_page.c \ + xm_prefs_page.h \ + xm_prefs_scroll.c \ + xm_prefs_scroll.h \ + xm_toolbar.c \ + xm_toolbar.h + diff --git a/Build/source/texk/xdvik/gui/Makefile.in b/Build/source/texk/xdvik/gui/Makefile.in index 125e595dfcb..3762e6649c7 100644 --- a/Build/source/texk/xdvik/gui/Makefile.in +++ b/Build/source/texk/xdvik/gui/Makefile.in @@ -1,84 +1,595 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ -# Makefile for xdvik -# -# - 1999/05/08: janl: Removed submakes for libwww and kpathsea. That's what -# the top makefile is for! -# +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -### NOTE: kpse_include paths must be relative to texk/xdvik, since that -### is from where the configure is run! -kpse_include ../make/paths.mk -kpse_include ../make/library.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -kpathsea_parent = ../.. - -# additional flags for kpathsea -LIBKPATHSEACPPFLAGS=@LIBKPATHSEACPPFLAGS@ +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = gui +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-arg-string.m4 \ + $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \ + $(top_srcdir)/m4/xdvi-cc-concat.m4 \ + $(top_srcdir)/m4/xdvi-find-motif.m4 \ + $(top_srcdir)/m4/xdvi-find-xpm.m4 \ + $(top_srcdir)/m4/xdvi-func-memicmp.m4 \ + $(top_srcdir)/m4/xdvi-func-poll.m4 \ + $(top_srcdir)/m4/xdvi-func-setsid-in-fork.m4 \ + $(top_srcdir)/m4/xdvi-func-working-vsnprintf.m4 \ + $(top_srcdir)/m4/xdvi-iconv-char-pptr-type.m4 \ + $(top_srcdir)/m4/xdvi-linker-multiple-defns.m4 \ + $(top_srcdir)/m4/xdvi-old-xaw.m4 \ + $(top_srcdir)/m4/xdvi-sys-old-linux.m4 \ + $(top_srcdir)/m4/xdvi-sys-streams.m4 \ + $(top_srcdir)/m4/xdvi-sys-sunos4.m4 \ + $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \ + $(top_srcdir)/../../m4/libtool.m4 \ + $(top_srcdir)/../../m4/ltoptions.m4 \ + $(top_srcdir)/../../m4/ltsugar.m4 \ + $(top_srcdir)/../../m4/ltversion.m4 \ + $(top_srcdir)/../../m4/lt~obsolete.m4 \ + $(top_srcdir)/ac/xdvik.ac $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/c-auto.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +libgui_a_AR = $(AR) $(ARFLAGS) +libgui_a_LIBADD = +am_libgui_a_OBJECTS = Panner.$(OBJEXT) Tip.$(OBJEXT) \ + help-window.$(OBJEXT) mag.$(OBJEXT) menu.$(OBJEXT) \ + message-window.$(OBJEXT) pagesel.$(OBJEXT) \ + print-dialog.$(OBJEXT) print-log.$(OBJEXT) \ + search-dialog.$(OBJEXT) selection.$(OBJEXT) sfDir.$(OBJEXT) \ + sfDraw.$(OBJEXT) sfPath.$(OBJEXT) sfSelFile.$(OBJEXT) \ + statusline.$(OBJEXT) topic-window.$(OBJEXT) \ + xaw_bitmaps.$(OBJEXT) xaw_menu.$(OBJEXT) xicon.$(OBJEXT) \ + xlwradio.$(OBJEXT) xm_colorsel.$(OBJEXT) xm_filesel.$(OBJEXT) \ + xm_menu.$(OBJEXT) xm_prefs.$(OBJEXT) \ + xm_prefs_appearance.$(OBJEXT) xm_prefs_fonts.$(OBJEXT) \ + xm_prefs_helpers.$(OBJEXT) xm_prefs_page.$(OBJEXT) \ + xm_prefs_scroll.$(OBJEXT) xm_toolbar.$(OBJEXT) +libgui_a_OBJECTS = $(am_libgui_a_OBJECTS) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libgui_a_SOURCES) +DIST_SOURCES = $(libgui_a_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KPATHSEA_DEPEND = @KPATHSEA_DEPEND@ +KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@ +KPATHSEA_LIBS = @KPATHSEA_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PS_DEF = @PS_DEF@ RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +T1LIB_DEPEND = @T1LIB_DEPEND@ +T1LIB_INCLUDES = @T1LIB_INCLUDES@ +T1LIB_LIBS = @T1LIB_LIBS@ +VERSION = @VERSION@ +XDVIK_VERSION = @XDVIK_VERSION@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +final_exec_name = @final_exec_name@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +iconv_includes = @iconv_includes@ +iconv_libpath = @iconv_libpath@ +iconv_libs = @iconv_libs@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +subdirs = @subdirs@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +x_linker_options = @x_linker_options@ +x_tool_libs = @x_tool_libs@ +x_xmu_lib = @x_xmu_lib@ +x_xpm_libs = @x_xpm_libs@ +INCLUDES = -I$(top_srcdir) $(PS_DEF) $(KPATHSEA_INCLUDES) \ + $(T1LIB_INCLUDES) $(X_CFLAGS) +noinst_LIBRARIES = libgui.a +libgui_a_SOURCES = \ + Panner.c \ + Panner.h \ + PannerP.h \ + Tip.c \ + Tip.h \ + TipP.h \ + help-window.c \ + help-window.h \ + mag.c \ + mag.h \ + menu.c \ + menu.h \ + message-window.c \ + message-window.h \ + pagesel.c \ + pagesel.h \ + print-dialog.c \ + print-dialog.h \ + print-log.c \ + print-log.h \ + search-dialog.c \ + search-dialog.h \ + selection.c \ + selection.h \ + sfDir.c \ + sfDir.h \ + sfDraw.c \ + sfDraw.h \ + sfPath.c \ + sfPath.h \ + sfSelFile.c \ + sfSelFile.h \ + sfinternal.h \ + statusline.c \ + statusline.h \ + topic-window.c \ + topic-window.h \ + xaw_bitmaps.c \ + xaw_bitmaps.h \ + xaw_menu.c \ + xaw_menu.h \ + xicon.c \ + xicon.h \ + xlwradio.c \ + xlwradio.h \ + xlwradioP.h \ + xm_colorsel.c \ + xm_colorsel.h \ + xm_filesel.c \ + xm_menu.c \ + xm_menu.h \ + xm_prefs.c \ + xm_prefs.h \ + xm_prefsP.h \ + xm_prefs_appearance.c \ + xm_prefs_appearance.h \ + xm_prefs_fonts.c \ + xm_prefs_fonts.h \ + xm_prefs_helpers.c \ + xm_prefs_helpers.h \ + xm_prefs_page.c \ + xm_prefs_page.h \ + xm_prefs_scroll.c \ + xm_prefs_scroll.h \ + xm_toolbar.c \ + xm_toolbar.h + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gui/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign gui/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +libgui.a: $(libgui_a_OBJECTS) $(libgui_a_DEPENDENCIES) + -rm -f libgui.a + $(libgui_a_AR) libgui.a $(libgui_a_OBJECTS) $(libgui_a_LIBADD) + $(RANLIB) libgui.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Panner.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Tip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-window.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mag.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message-window.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pagesel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-dialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-log.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search-dialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selection.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfDir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfDraw.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfPath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfSelFile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statusline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/topic-window.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xaw_bitmaps.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xaw_menu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xicon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlwradio.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_colorsel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_filesel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_menu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_prefs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_prefs_appearance.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_prefs_fonts.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_prefs_helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_prefs_page.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_prefs_scroll.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xm_toolbar.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am -# Make `#include <X11/...>' and `-lX...' work. -# This matches web2c (needed only for Metafont). -x_cppflags = @X_CFLAGS@ - -# Extra xdvi-specific compiler options. -ps_def = @PS_DEF@ -DXSERVER_INFO -prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBKPATHSEACPPFLAGS) -I.. -I$(srcdir)/.. $(x_cppflags) $(ps_def) - -# Note: to be able to use one depend.mk file for both Motif/Xaw (which -# is needed since only maintainers are supposed to invoke `make depend') -# we include *all* object files and have tests for #ifdef MOTIF/XAW inside -# the files. -objects = \ - help-window.o \ - message-window.o \ - mag.o \ - menu.o \ - Panner.o \ - pagesel.o \ - print-dialog.o \ - print-log.o \ - search-dialog.o \ - selection.o \ - sfDir.o \ - sfDraw.o \ - sfPath.o \ - sfSelFile.o \ - statusline.o \ - Tip.o \ - topic-window.o \ - xaw_bitmaps.o \ - xaw_menu.o \ - xicon.o \ - xlwradio.o \ - xm_colorsel.o \ - xm_filesel.o \ - xm_menu.o \ - xm_prefs.o \ - xm_prefs_appearance.o \ - xm_prefs_fonts.o \ - xm_prefs_page.o \ - xm_prefs_scroll.o \ - xm_prefs_helpers.o \ - xm_toolbar.o - -libgui.a: $(objects) -### hmm, I don't understand ar ... sometimes objects were NOT replaced. -### Play it safe and always remove the archive before creating new one. - rm -f $@ - $(AR) $(ARFLAGS) $@ $(objects) - $(RANLIB) $@ - -kpse_include ../make/dist.mk -kpse_include ../make/clean.mk - -clean:: - rm -f *.o *.a - -c_auto_h_dir = .. -kpse_include ../make/rdepend.mk -kpse_include ./gui/depend.mk +# 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/xdvik/m4/acinclude.m4 b/Build/source/texk/xdvik/m4/acinclude.m4 index 0eb757812a6..6a6c3ad25f7 100644 --- a/Build/source/texk/xdvik/m4/acinclude.m4 +++ b/Build/source/texk/xdvik/m4/acinclude.m4 @@ -1,476 +1,3 @@ -dnl dnl ### Check for vsnprintf() added by SU 2000/03/07 -dnl AC_DEFUN([AC_FUNC_VSNPRINTF], -dnl [AC_CACHE_CHECK([for vsnprintf], xdvi_cv_vsnprintf, -dnl [AC_TRY_LINK( -dnl [#include <stdio.h> -dnl ], [(void)vsnprintf((char *)NULL, 0, (char *)NULL, NULL);], -dnl xdvi_cv_vsnprintf=yes, xdvi_cv_vsnprintf=no)]) -dnl if test $xdvi_cv_vsnprintf = yes; then -dnl AC_DEFINE([HAVE_VSNPRINTF], 1, [Define if you have the vsnprintf() function.]) -dnl fi]) - -dnl dnl ### Check for realpath() added by SU 2002/04/10 -dnl AC_DEFUN([AC_FUNC_REALPATH], -dnl [AC_CACHE_CHECK([for realpath], xdvi_cv_realpath, -dnl [AC_TRY_LINK( -dnl [#include <stdlib.h> -dnl ], [(void)realpath((const char *)NULL, NULL);], -dnl xdvi_cv_realpath=yes, xdvi_cv_realpath=no)]) -dnl if test $xdvi_cv_realpath = yes; then -dnl AC_DEFINE([HAVE_REALPATH], 1 [Define if you have the realpath() function.]) -dnl fi]) - - -dnl ### for Xpm libraries and headers. -dnl Put Xpm include directory in xpm_includes, -dnl put Xpm library directory in xpm_libraries, -dnl and add appropriate flags to X_CFLAGS and X_LIBS. -dnl -AC_DEFUN([XDVI_FIND_XPM], -[ -AC_REQUIRE([AC_PATH_XTRA]) -xpm_includes= -xpm_libraries= -AC_ARG_WITH([xpm], -[ --without-xpm Do not use the Xpm library (will disable the toolbar)]) -dnl Treat --without-xpm like -dnl --without-xpm-includes --without-xpm-libraries. -if test "$with_xpm" = "no" -then -xpm_includes=no -xpm_libraries=no -fi -AC_ARG_WITH([xpm-includes], -[ --with-xpm-include=DIR - Specify the location of Xpm include files], -[xpm_includes="$withval"]) -AC_ARG_WITH([xpm-libraries], -[ --with-xpm-libdir=DIR - Specify the location of Xpm libraries], -[xpm_libraries="$withval"]) -AC_MSG_CHECKING(for Xpm) -# -# -# Search the include files. XPM can either be in <X11/xpm.h> (as in X11R6), -# which is dealt with by AC_CHECK_HEADERS(X11/xpm.h), or in <xpm.h> if installed locally; -# this is what this test is for. -# -if test "$xpm_includes" = ""; then -AC_CACHE_VAL(xdvi_cv_xpm_includes, -[ -xdvi_xpm_save_LIBS="$LIBS" -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_TRY_COMPILE([ -#include <X11/xpm.h> -],[int a;], -[ -# X11/xpm.h is in the standard search path. -xdvi_cv_xpm_includes="default" -], -[ -# X11/xpm.h is not in the standard search path. -# Locate it and put its directory in `xpm_includes' -# -# /usr/include/Motif* are used on HP-UX (Motif). -# /usr/include/X11* are used on HP-UX (X and Xaw). -# /usr/dt is used on Solaris (Motif). -# /usr/openwin is used on Solaris (X and Xaw). -# Other directories are just guesses. -for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ - /usr/X11/include /usr/X11R5/include /usr/X11R6/include \ - /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ - /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ - /usr/dt/include /usr/openwin/include \ - /usr/dt/*/include /opt/*/include /usr/include/Motif* \ - "${prefix}"/*/include /usr/*/include /usr/local/*/include \ - "${prefix}"/include/* /usr/include/* /usr/local/include/* -do - if test -f "$dir/X11/xpm.h"; then - xdvi_cv_xpm_includes="$dir" - break - elif test -f "$dir/xpm.h"; then - xdvi_cv_xpm_includes="$dir" - break - fi -done -]) -# -LIBS="$xdvi_xpm_save_LIBS" -CFLAGS="$xdvi_xpm_save_CFLAGS" -CPPFLAGS="$xdvi_xpm_save_CPPFLAGS" -LDFLAGS="$xdvi_xpm_save_LDFLAGS" -]) -xpm_includes="$xdvi_cv_xpm_includes" -fi - -dnl Second arg of AC_CACHE_VAL shouldn't contain any AC_DEFINE's, -dnl moved them out. Peter Breitenlohner <peb@mppmu.mpg.de> -dnl -if test "x$xpm_includes" != x; then - if test "x$xpm_includes" = xdefault; then - AC_DEFINE([HAVE_X11_XPM_H], 1, [Define if you have the <X11/xpm.h> header file.]) - elif test -f "$xpm_includes/X11/xpm.h"; then - AC_DEFINE([HAVE_X11_XPM_H], 1) - elif test -f "$xpm_includes/xpm.h"; then - AC_DEFINE([HAVE_XPM_H], 1, - [Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).]) - fi -fi - -# -# -# Now for the libraries. -# -if test "$xpm_libraries" = ""; then -AC_CACHE_VAL(xdvi_cv_xpm_libraries, -[ -xdvi_xpm_save_LIBS="$LIBS" -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" -xdvi_cv_xpm_libraries= -# -# -# We use XtToolkitInitialize() here since it takes no arguments -# and thus also works with a C++ compiler. -AC_TRY_LINK([ -#include <X11/Intrinsic.h> -#include <X11/xpm.h> -],[XtToolkitInitialize();], -[ -# libxpm.a is in the standard search path. -xdvi_cv_xpm_libraries="default" -], -[ -# libXpm.a is not in the standard search path. -# Locate it and put its directory in `xpm_libraries' -# -# -# /usr/lib/Motif* are used on HP-UX (Motif). -# /usr/lib/X11* are used on HP-UX (X and Xpm). -# /usr/dt is used on Solaris (Motif). -# /usr/openwin is used on Solaris (X and Xpm). -# Other directories are just guesses. -for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ - /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ - /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ - /usr/dt/lib /usr/openwin/lib \ - /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ - "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ - "${prefix}"/lib/* /usr/lib/* /usr/local/lib/* -do - if test -d "$dir" && test "`ls $dir/libXpm.* 2> /dev/null`" != ""; then - xdvi_cv_xpm_libraries="$dir" - break - fi -done -]) -# -LIBS="$xdvi_xpm_save_LIBS" -CFLAGS="$xdvi_xpm_save_CFLAGS" -CPPFLAGS="$xdvi_xpm_save_CPPFLAGS" -LDFLAGS="$xdvi_xpm_save_LDFLAGS" -]) -# -xpm_libraries="$xdvi_cv_xpm_libraries" -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" -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" -then -case "$X_LIBS" in - *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";; - *-R*) X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";; - *) X_LIBS="-L$xpm_libraries $X_LIBS";; -esac -fi - -# -# -x_xpm_libs="-lXpm" -# -# Now check the results of headers and libraries and set USE_XPM to 0 -# if one of them hadn't been found. -# -AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library]) -xpm_libraries_result="$xpm_libraries" -xpm_includes_result="$xpm_includes" -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 - xpm_libraries_result="(none)" - AC_DEFINE([USE_XPM], 0) - x_xpm_libs="" -fi - -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 - AC_DEFINE(USE_XPM, 0) - xpm_includes_result="(none)" -fi - -AC_SUBST(x_xpm_libs) -AC_MSG_RESULT( - [libraries $xpm_libraries_result, headers $xpm_includes_result]) -])dnl - - - -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 $1 is not `none', use Xaw as default toolkit if Motif isn't found. -AC_DEFUN([XDVI_FIND_MOTIF], -[ -default_toolkit="$1" -motif_include="$2" -motif_libdir="$3" -AC_REQUIRE([AC_PATH_XTRA]) -AC_MSG_CHECKING(for Motif) -# -# -# Search the include files. -# -if test "$motif_include" = ""; then -AC_CACHE_VAL(xdvi_cv_motif_include, -[ -xdvi_motif_save_LIBS="$LIBS" -xdvi_motif_save_CFLAGS="$CFLAGS" -xdvi_motif_save_CPPFLAGS="$CPPFLAGS" -xdvi_motif_save_LDFLAGS="$LDFLAGS" -# -LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" -CFLAGS="$X_CFLAGS $CFLAGS" -CPPFLAGS="$X_CFLAGS $CPPFLAGS" -LDFLAGS="$X_LIBS $LDFLAGS" -# -AC_TRY_COMPILE([#include <Xm/Xm.h>],[int a;], -[ -# Xm/Xm.h is in the standard search path. -xdvi_cv_motif_include= -], -[ -# Xm/Xm.h is not in the standard search path. -# Locate it and put its directory in `motif_include' -# -# /usr/include/Motif* are used on HP-UX (Motif). -# /usr/include/X11* are used on HP-UX (X and Athena). -# /usr/dt is used on Solaris (Motif). -# /usr/openwin is used on Solaris (X and Athena). -# Other directories are just guesses. -for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ - /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ - /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ - /usr/dt/include /usr/openwin/include \ - /usr/dt/*/include /opt/*/include /usr/include/Motif* \ - "${prefix}"/*/include /usr/*/include /usr/local/*/include \ - "${prefix}"/include/* /usr/include/* /usr/local/include/*; do - if test -f "$dir/Xm/Xm.h"; then - xdvi_cv_motif_include="$dir" - break - fi -done -if test "$xdvi_cv_motif_include" = ""; then -xdvi_cv_motif_include=no -fi -]) -# -LIBS="$xdvi_motif_save_LIBS" -CFLAGS="$xdvi_motif_save_CFLAGS" -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_motif_save_LIBS="$LIBS" -xdvi_motif_save_CFLAGS="$CFLAGS" -xdvi_motif_save_CPPFLAGS="$CPPFLAGS" -xdvi_motif_save_LDFLAGS="$LDFLAGS" -# -LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" -CFLAGS="$X_CFLAGS $CFLAGS" -CPPFLAGS="$X_CFLAGS $CPPFLAGS" -LDFLAGS="$X_LIBS $LDFLAGS" -# -# We use XtToolkitInitialize() here since it takes no arguments -# and thus also works with a C++ compiler. -AC_TRY_LINK( -[#include <X11/Intrinsic.h> -#include <Xm/Xm.h> -],[XtToolkitInitialize();], -[ -# libXm.a is in the standard search path. -xdvi_cv_motif_libdir= -], -[ -# libXm.a is not in the standard search path. -# Locate it and put its directory in `motif_libdir' -# -# /usr/lib/Motif* are used on HP-UX (Motif). -# /usr/lib/X11* are used on HP-UX (X and Athena). -# /usr/dt is used on Solaris (Motif). -# /usr/lesstif is used on Linux (Lesstif). -# /usr/openwin is used on Solaris (X and Athena). -# Other directories are just guesses. -for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ - /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ - /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ - /usr/dt/lib /usr/openwin/lib \ - /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ - /usr/lesstif*/lib /usr/lib/Lesstif* \ - "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ - "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do - if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then - xdvi_cv_motif_libdir="$dir" - break - fi -done -if test "$xdvi_cv_motif_libdir" = ""; then -xdvi_cv_motif_libdir=no -fi -]) -# -LIBS="$xdvi_motif_save_LIBS" -CFLAGS="$xdvi_motif_save_CFLAGS" -CPPFLAGS="$xdvi_motif_save_CPPFLAGS" -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 - -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. - ***************************************************************** - * Warning: You are using LessTif instead of OpenMotif. * - * Some GUI elements might be broken; please see the file * - * * - * texk/xdvik/LESSTIF-BUGS * - * * - * for more information. * - *****************************************************************]) - ],[ - # no, not running LessTif - AC_MSG_RESULT([no]) - ]) -else - AC_MSG_RESULT([not found, using Xaw]) - prog_extension="xaw" - AC_DEFINE(XAW) - x_tool_libs="-lXaw" -fi - -# -AC_MSG_CHECKING(whether to compile in panner (requires Xaw)) -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/Xfuncs.h> -#include <X11/Intrinsic.h> - -#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) -fi -])dnl - dnl SU: the following is copied from gnome/compiler-flags.m4: turn on warnings for gcc dnl dnl COMPILER_WARNINGS @@ -517,173 +44,3 @@ AC_DEFUN([COMPILER_WARNINGS],[ fi ]) -dnl ### Check for Xaw version -AC_DEFUN([XDVI_OLD_XAW],[ -if test "${with_xdvi_x_toolkit}" = xaw; then - AC_MSG_CHECKING(for Xaw library) - 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/Xfuncs.h> -#include <X11/Intrinsic.h> -#include <X11/Xaw/Form.h> - ],[ - ], - xdvi_have_xaw=yes, xdvi_have_xaw=no - ) - CPPFLAGS=$save_CPPFLAGS - if test $xdvi_have_xaw = yes; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(not found) - AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.]) - fi - - AC_MSG_CHECKING(version of Xaw library) - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_TRY_COMPILE([ -#include <X11/IntrinsicP.h> -#include <X11/StringDefs.h> -#include <X11/Intrinsic.h> -#include <X11/StringDefs.h> -#include <X11/Xos.h> -#include <X11/Xaw/Text.h> -#include <X11/Xaw/AsciiText.h> -#include <X11/Xaw/ToggleP.h> - typedef void (*XawDiamondProc) (Widget); - - /* New fields for the Radio widget class record */ - typedef struct _RadioClass { - Dimension dsize; /* diamond size */ - XawDiamondProc drawDiamond; - /* pixmaps for the button */ - Pixmap sel_radio; /* selected state */ - Pixmap unsel_radio; /* unselected state */ - Pixmap sel_menu; /* selected state */ - Pixmap unsel_menu; /* unselected state */ - /* TODO: 3-d and xaw-xpm features? */ - XtPointer extension; - } RadioClassPart; - - /* Full class record declaration */ - typedef struct _RadioClassRec { - CoreClassPart core_class; - SimpleClassPart simple_class; - LabelClassPart label_class; - CommandClassPart command_class; - ToggleClassPart toggle_class; - RadioClassPart radio_class; - } RadioClassRec; - /* New fields for the Radio widget record */ - typedef struct { - /* resources */ - Boolean isRadio; /* radio if True, checkbox else */ - /* TODO: 3-d and xaw-xpm features? */ - - /* private data */ - XtPointer extension; - } RadioPart; - - /* Full widget declaration */ - typedef struct _RadioRec { - CorePart core; - SimplePart simple; -#ifdef _ThreeDP_h - ThreeDPart threeD; -#endif - LabelPart label; - CommandPart command; - TogglePart toggle; - RadioPart radio; - } RadioRec; - - - /* The actions table from Toggle is almost perfect, but we need - * to override Highlight, Set, and Unset. - */ - -#define SuperClass ((ToggleWidgetClass)&toggleClassRec) - -#define BOX_SIZE 16 -#define PIXMAP_OFFSET 2 /* additional space between pixmap and label */ - ],[ - RadioClassRec radioClassRec = { - { - (WidgetClass) SuperClass, /* superclass */ - "Radio", /* class_name */ - sizeof(RadioRec), /* size */ - NULL, /* class_initialize */ - NULL, /* class_part_initialize */ - FALSE, /* class_inited */ - NULL, /* initialize */ - NULL, /* initialize_hook */ - XtInheritRealize, /* realize */ - NULL, /* actions */ - 0, /* num_actions */ - NULL, /* resources */ - 0, /* resource_count */ - NULLQUARK, /* xrm_class */ - TRUE, /* compress_motion */ - TRUE, /* compress_exposure */ - TRUE, /* compress_enterleave */ - FALSE, /* visible_interest */ - NULL, /* destroy */ - NULL, /* resize */ - NULL, /* expose */ - NULL, /* set_values */ - NULL, /* set_values_hook */ - XtInheritSetValuesAlmost, /* set_values_almost */ - NULL, /* get_values_hook */ - NULL, /* accept_focus */ - XtVersion, /* version */ - NULL, /* callback_private */ - XtInheritTranslations, /* tm_table */ - NULL, /* query_geometry */ - XtInheritDisplayAccelerator, /* display_accelerator */ - NULL /* extension */ - }, /* CoreClass fields initialization */ - { - XtInheritChangeSensitive, /* change_sensitive */ - NULL - }, /* SimpleClass fields initialization */ - { - 0 /* field not used */ - }, /* LabelClass fields initialization */ - { - 0 /* field not used */ - }, /* CommandClass fields initialization */ - { - NULL, /* Set Procedure. */ - NULL, /* Unset Procedure. */ - NULL /* extension. */ - }, /* ToggleClass fields initialization */ - { - BOX_SIZE, - NULL, /* draw procedure */ - None, /* selected radiobutton */ - None, /* unselected radiobutton */ - None, /* selected menubutton */ - None, /* unselected menubutton */ - NULL /* extension. */ - } /* RadioClass fields initialization */ - }; - (void)radioClassRec; - ], - xdvi_old_xaw=no, xdvi_old_xaw=yes - ) - CPPFLAGS=$save_CPPFLAGS -if test $xdvi_old_xaw = yes; then - AC_MSG_RESULT(old) - AC_DEFINE([HAVE_OLD_XAW], 1, - [Define if you have an old version of the Xaw library]) -else - AC_MSG_RESULT(current) -fi -fi -]) diff --git a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 new file mode 100644 index 00000000000..0130bb095d0 --- /dev/null +++ b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 @@ -0,0 +1,231 @@ +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 $1 is not `none', use Xaw as default toolkit if Motif isn't found. +AC_DEFUN([XDVI_FIND_MOTIF], +[ +default_toolkit="$1" +AC_REQUIRE([AC_PATH_XTRA]) +AC_MSG_CHECKING(for Motif) +# +# +# Search the include files. +# +if test "$motif_include" = ""; then +AC_CACHE_VAL(xdvi_cv_motif_include, +[ +xdvi_motif_save_LIBS="$LIBS" +xdvi_motif_save_CFLAGS="$CFLAGS" +xdvi_motif_save_CPPFLAGS="$CPPFLAGS" +xdvi_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +AC_TRY_COMPILE([#include <Xm/Xm.h>],[int a;], +[ +# Xm/Xm.h is in the standard search path. +xdvi_cv_motif_include= +], +[ +# Xm/Xm.h is not in the standard search path. +# Locate it and put its directory in `motif_include' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ + /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/*; do + if test -f "$dir/Xm/Xm.h"; then + xdvi_cv_motif_include="$dir" + break + fi +done +if test "$xdvi_cv_motif_include" = ""; then +xdvi_cv_motif_include=no +fi +]) +# +LIBS="$xdvi_motif_save_LIBS" +CFLAGS="$xdvi_motif_save_CFLAGS" +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_motif_save_LIBS="$LIBS" +xdvi_motif_save_CFLAGS="$CFLAGS" +xdvi_motif_save_CPPFLAGS="$CPPFLAGS" +xdvi_motif_save_LDFLAGS="$LDFLAGS" +# +LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" +CFLAGS="$X_CFLAGS $CFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" +LDFLAGS="$X_LIBS $LDFLAGS" +# +# We use XtToolkitInitialize() here since it takes no arguments +# and thus also works with a C++ compiler. +AC_TRY_LINK( +[#include <X11/Intrinsic.h> +#include <Xm/Xm.h> +],[XtToolkitInitialize();], +[ +# libXm.a is in the standard search path. +xdvi_cv_motif_libdir= +], +[ +# libXm.a is not in the standard search path. +# Locate it and put its directory in `motif_libdir' +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Athena). +# /usr/dt is used on Solaris (Motif). +# /usr/lesstif is used on Linux (Lesstif). +# /usr/openwin is used on Solaris (X and Athena). +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ + /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + /usr/lesstif*/lib /usr/lib/Lesstif* \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do + if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then + xdvi_cv_motif_libdir="$dir" + break + fi +done +if test "$xdvi_cv_motif_libdir" = ""; then +xdvi_cv_motif_libdir=no +fi +]) +# +LIBS="$xdvi_motif_save_LIBS" +CFLAGS="$xdvi_motif_save_CFLAGS" +CPPFLAGS="$xdvi_motif_save_CPPFLAGS" +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 + +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. + ***************************************************************** + * Warning: You are using LessTif instead of OpenMotif. * + * Some GUI elements might be broken; please see the file * + * * + * texk/xdvik/LESSTIF-BUGS * + * * + * for more information. * + *****************************************************************]) + ],[ + # no, not running LessTif + AC_MSG_RESULT([no]) + ]) +else + AC_MSG_RESULT([not found, using Xaw]) + prog_extension="xaw" + AC_DEFINE(XAW) + x_tool_libs="-lXaw" +fi + +# +AC_MSG_CHECKING(whether to compile in panner (requires Xaw)) +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/Xfuncs.h> +#include <X11/Intrinsic.h> + +#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) +fi +])dnl + diff --git a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 new file mode 100644 index 00000000000..0d22282782d --- /dev/null +++ b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 @@ -0,0 +1,217 @@ +dnl ### for Xpm libraries and headers. +dnl Put Xpm include directory in xpm_includes, +dnl put Xpm library directory in xpm_libraries, +dnl and add appropriate flags to X_CFLAGS and X_LIBS. +dnl +AC_DEFUN([XDVI_FIND_XPM], +[ +AC_REQUIRE([AC_PATH_XTRA]) +xpm_includes= +xpm_libraries= +AC_ARG_WITH([xpm], +[ --without-xpm Do not use the Xpm library (will disable the toolbar)]) +dnl Treat --without-xpm like +dnl --without-xpm-includes --without-xpm-libraries. +if test "$with_xpm" = "no" +then +xpm_includes=no +xpm_libraries=no +fi +AC_ARG_WITH([xpm-includes], +[ --with-xpm-include=DIR + Specify the location of Xpm include files], +[xpm_includes="$withval"]) +AC_ARG_WITH([xpm-libraries], +[ --with-xpm-libdir=DIR + Specify the location of Xpm libraries], +[xpm_libraries="$withval"]) +AC_MSG_CHECKING(for Xpm) +# +# +# Search the include files. XPM can either be in <X11/xpm.h> (as in X11R6), +# which is dealt with by AC_CHECK_HEADERS(X11/xpm.h), or in <xpm.h> if installed locally; +# this is what this test is for. +# +if test "$xpm_includes" = ""; then +AC_CACHE_VAL(xdvi_cv_xpm_includes, +[ +xdvi_xpm_save_LIBS="$LIBS" +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_TRY_COMPILE([ +#include <X11/xpm.h> +],[int a;], +[ +# X11/xpm.h is in the standard search path. +xdvi_cv_xpm_includes="default" +], +[ +# X11/xpm.h is not in the standard search path. +# Locate it and put its directory in `xpm_includes' +# +# /usr/include/Motif* are used on HP-UX (Motif). +# /usr/include/X11* are used on HP-UX (X and Xaw). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Xaw). +# Other directories are just guesses. +for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \ + /usr/X11/include /usr/X11R5/include /usr/X11R6/include \ + /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \ + /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \ + /usr/dt/include /usr/openwin/include \ + /usr/dt/*/include /opt/*/include /usr/include/Motif* \ + "${prefix}"/*/include /usr/*/include /usr/local/*/include \ + "${prefix}"/include/* /usr/include/* /usr/local/include/* +do + if test -f "$dir/X11/xpm.h"; then + xdvi_cv_xpm_includes="$dir" + break + elif test -f "$dir/xpm.h"; then + xdvi_cv_xpm_includes="$dir" + break + fi +done +]) +# +LIBS="$xdvi_xpm_save_LIBS" +CFLAGS="$xdvi_xpm_save_CFLAGS" +CPPFLAGS="$xdvi_xpm_save_CPPFLAGS" +LDFLAGS="$xdvi_xpm_save_LDFLAGS" +]) +xpm_includes="$xdvi_cv_xpm_includes" +fi + +dnl Second arg of AC_CACHE_VAL shouldn't contain any AC_DEFINE's, +dnl moved them out. Peter Breitenlohner <peb@mppmu.mpg.de> +dnl +if test "x$xpm_includes" != x; then + if test "x$xpm_includes" = xdefault; then + AC_DEFINE([HAVE_X11_XPM_H], 1, [Define if you have the <X11/xpm.h> header file.]) + elif test -f "$xpm_includes/X11/xpm.h"; then + AC_DEFINE([HAVE_X11_XPM_H], 1) + elif test -f "$xpm_includes/xpm.h"; then + AC_DEFINE([HAVE_XPM_H], 1, + [Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).]) + fi +fi + +# +# +# Now for the libraries. +# +if test "$xpm_libraries" = ""; then +AC_CACHE_VAL(xdvi_cv_xpm_libraries, +[ +xdvi_xpm_save_LIBS="$LIBS" +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" +xdvi_cv_xpm_libraries= +# +# +# We use XtToolkitInitialize() here since it takes no arguments +# and thus also works with a C++ compiler. +AC_TRY_LINK([ +#include <X11/Intrinsic.h> +#include <X11/xpm.h> +],[XtToolkitInitialize();], +[ +# libxpm.a is in the standard search path. +xdvi_cv_xpm_libraries="default" +], +[ +# libXpm.a is not in the standard search path. +# Locate it and put its directory in `xpm_libraries' +# +# +# /usr/lib/Motif* are used on HP-UX (Motif). +# /usr/lib/X11* are used on HP-UX (X and Xpm). +# /usr/dt is used on Solaris (Motif). +# /usr/openwin is used on Solaris (X and Xpm). +# Other directories are just guesses. +for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \ + /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \ + /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \ + /usr/dt/lib /usr/openwin/lib \ + /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/* +do + if test -d "$dir" && test "`ls $dir/libXpm.* 2> /dev/null`" != ""; then + xdvi_cv_xpm_libraries="$dir" + break + fi +done +]) +# +LIBS="$xdvi_xpm_save_LIBS" +CFLAGS="$xdvi_xpm_save_CFLAGS" +CPPFLAGS="$xdvi_xpm_save_CPPFLAGS" +LDFLAGS="$xdvi_xpm_save_LDFLAGS" +]) +# +xpm_libraries="$xdvi_cv_xpm_libraries" +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" +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" +then +case "$X_LIBS" in + *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";; + *-R*) X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";; + *) X_LIBS="-L$xpm_libraries $X_LIBS";; +esac +fi + +# +# +x_xpm_libs="-lXpm" +# +# Now check the results of headers and libraries and set USE_XPM to 0 +# if one of them hadn't been found. +# +AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library]) +xpm_libraries_result="$xpm_libraries" +xpm_includes_result="$xpm_includes" +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 + xpm_libraries_result="(none)" + AC_DEFINE([USE_XPM], 0) + x_xpm_libs="" +fi + +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 + AC_DEFINE(USE_XPM, 0) + xpm_includes_result="(none)" +fi + +AC_SUBST(x_xpm_libs) +AC_MSG_RESULT( + [libraries $xpm_libraries_result, headers $xpm_includes_result]) +])dnl + + + diff --git a/Build/source/texk/xdvik/m4/xdvi-old-xaw.m4 b/Build/source/texk/xdvik/m4/xdvi-old-xaw.m4 new file mode 100644 index 00000000000..c64a37daf2c --- /dev/null +++ b/Build/source/texk/xdvik/m4/xdvi-old-xaw.m4 @@ -0,0 +1,170 @@ +dnl ### Check for Xaw version +AC_DEFUN([XDVI_OLD_XAW],[ +if test "${with_xdvi_x_toolkit}" = xaw; then + AC_MSG_CHECKING(for Xaw library) + 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/Xfuncs.h> +#include <X11/Intrinsic.h> +#include <X11/Xaw/Form.h> + ],[ + ], + xdvi_have_xaw=yes, xdvi_have_xaw=no + ) + CPPFLAGS=$save_CPPFLAGS + if test $xdvi_have_xaw = yes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(not found) + AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.]) + fi + + AC_MSG_CHECKING(version of Xaw library) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([ +#include <X11/IntrinsicP.h> +#include <X11/StringDefs.h> +#include <X11/Intrinsic.h> +#include <X11/StringDefs.h> +#include <X11/Xos.h> +#include <X11/Xaw/Text.h> +#include <X11/Xaw/AsciiText.h> +#include <X11/Xaw/ToggleP.h> + typedef void (*XawDiamondProc) (Widget); + + /* New fields for the Radio widget class record */ + typedef struct _RadioClass { + Dimension dsize; /* diamond size */ + XawDiamondProc drawDiamond; + /* pixmaps for the button */ + Pixmap sel_radio; /* selected state */ + Pixmap unsel_radio; /* unselected state */ + Pixmap sel_menu; /* selected state */ + Pixmap unsel_menu; /* unselected state */ + /* TODO: 3-d and xaw-xpm features? */ + XtPointer extension; + } RadioClassPart; + + /* Full class record declaration */ + typedef struct _RadioClassRec { + CoreClassPart core_class; + SimpleClassPart simple_class; + LabelClassPart label_class; + CommandClassPart command_class; + ToggleClassPart toggle_class; + RadioClassPart radio_class; + } RadioClassRec; + /* New fields for the Radio widget record */ + typedef struct { + /* resources */ + Boolean isRadio; /* radio if True, checkbox else */ + /* TODO: 3-d and xaw-xpm features? */ + + /* private data */ + XtPointer extension; + } RadioPart; + + /* Full widget declaration */ + typedef struct _RadioRec { + CorePart core; + SimplePart simple; +#ifdef _ThreeDP_h + ThreeDPart threeD; +#endif + LabelPart label; + CommandPart command; + TogglePart toggle; + RadioPart radio; + } RadioRec; + + + /* The actions table from Toggle is almost perfect, but we need + * to override Highlight, Set, and Unset. + */ + +#define SuperClass ((ToggleWidgetClass)&toggleClassRec) + +#define BOX_SIZE 16 +#define PIXMAP_OFFSET 2 /* additional space between pixmap and label */ + ],[ + RadioClassRec radioClassRec = { + { + (WidgetClass) SuperClass, /* superclass */ + "Radio", /* class_name */ + sizeof(RadioRec), /* size */ + NULL, /* class_initialize */ + NULL, /* class_part_initialize */ + FALSE, /* class_inited */ + NULL, /* initialize */ + NULL, /* initialize_hook */ + XtInheritRealize, /* realize */ + NULL, /* actions */ + 0, /* num_actions */ + NULL, /* resources */ + 0, /* resource_count */ + NULLQUARK, /* xrm_class */ + TRUE, /* compress_motion */ + TRUE, /* compress_exposure */ + TRUE, /* compress_enterleave */ + FALSE, /* visible_interest */ + NULL, /* destroy */ + NULL, /* resize */ + NULL, /* expose */ + NULL, /* set_values */ + NULL, /* set_values_hook */ + XtInheritSetValuesAlmost, /* set_values_almost */ + NULL, /* get_values_hook */ + NULL, /* accept_focus */ + XtVersion, /* version */ + NULL, /* callback_private */ + XtInheritTranslations, /* tm_table */ + NULL, /* query_geometry */ + XtInheritDisplayAccelerator, /* display_accelerator */ + NULL /* extension */ + }, /* CoreClass fields initialization */ + { + XtInheritChangeSensitive, /* change_sensitive */ + NULL + }, /* SimpleClass fields initialization */ + { + 0 /* field not used */ + }, /* LabelClass fields initialization */ + { + 0 /* field not used */ + }, /* CommandClass fields initialization */ + { + NULL, /* Set Procedure. */ + NULL, /* Unset Procedure. */ + NULL /* extension. */ + }, /* ToggleClass fields initialization */ + { + BOX_SIZE, + NULL, /* draw procedure */ + None, /* selected radiobutton */ + None, /* unselected radiobutton */ + None, /* selected menubutton */ + None, /* unselected menubutton */ + NULL /* extension. */ + } /* RadioClass fields initialization */ + }; + (void)radioClassRec; + ], + xdvi_old_xaw=no, xdvi_old_xaw=yes + ) + CPPFLAGS=$save_CPPFLAGS +if test $xdvi_old_xaw = yes; then + AC_MSG_RESULT(old) + AC_DEFINE([HAVE_OLD_XAW], 1, + [Define if you have an old version of the Xaw library]) +else + AC_MSG_RESULT(current) +fi +fi +]) diff --git a/Build/source/texk/xdvik/withenable.ac.work b/Build/source/texk/xdvik/withenable.ac.work new file mode 100644 index 00000000000..38dd8f9130b --- /dev/null +++ b/Build/source/texk/xdvik/withenable.ac.work @@ -0,0 +1,41 @@ + +AC_ARG_ENABLE([magick], +[ --enable-magick Use ImageMagick to load/render image files. + EXPERIMENTAL - DO NOT USE!], +[if test "$enableval" != no; then + echo -n "checking for ImageMagick >= 5.3 ... " + if MAGICK_VER=`Magick-config --version 2>/dev/null`; then + echo $MAGICK_VER + set -- `echo $MAGICK_VER | sed -e 's/\./ /g'` + MAGICK_VER_MAJOR=$1 + MAGICK_VER_MINOR=$2 + if expr $MAGICK_VER_MAJOR \> 4 >/dev/null && \ + (expr $MAGICK_VER_MAJOR \> 5 >/dev/null || \ + expr $MAGICK_VER_MINOR \> 2 >/dev/null); then + MAGICK_CPP="-DMAGICK_VER_MAJOR=$MAGICK_VER_MAJOR -DMAGICK_VER_MINOR=$MAGICK_VER_MINOR `Magick-config --cppflags`" + # echo "CPP: $MAGICK_CPP" + MAGICK_LD="`Magick-config --libs`" + # echo "LD: $MAGICK_LD" + echo "ImageMagick support enabled" + MAGICK_INCLUDE= + MAGICK_LIBDIR= + + if test "x$with_magick_include" != x; then + MAGIC_INCLUDE="-I$with_magick_include" + fi + if test "x$with_magick_libdir" != x; then + MAGIC_LIBDIR="-L$with_magick_libdir" + fi + + X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD" + X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP" + AC_DEFINE([MAGICK], 1, [Define to use ImageMagick]) + #echo MAGICK_DEF=\"$MAGICK_DEF\" + else + echo "ImageMagick version too old - ImageMagick support disabled" + fi + else + echo "Can't run 'Magick-config' - ImageMagick support disabled" + fi +fi]) + |