diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-27 15:51:44 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-27 15:51:44 +0000 |
| commit | 00fd6939347f92cf9a6c4b4a794addb694f49e12 (patch) | |
| tree | ac402537f4eef3e24b28d394b41e11fb12f5c529 /Build/source/texk/xdvik | |
| parent | f9ca28880f0f3b5743559635fd96b5b98bcd78b8 (diff) | |
new build system: update texk/xdvik
git-svn-id: svn://tug.org/texlive/trunk@12830 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik')
19 files changed, 2055 insertions, 2443 deletions
diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am index 9bfee87afca..b2e7db23cc9 100644 --- a/Build/source/texk/xdvik/Makefile.am +++ b/Build/source/texk/xdvik/Makefile.am @@ -5,88 +5,160 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -SUBDIRS = squeeze gui . tests +SUBDIRS = squeeze . tests include common.am INCLUDES = -I$(srcdir)/gui $(common_includes) -noinst_HEADERS = \ +## The object files created from ./*.c and gui/*.c are used for both +## ./xdvi-bin and tests/run_tests. +## In order not to compile them twice, we put them into a library. +noinst_LIBRARIES = libxdvi.a + +nodist_libxdvi_a_SOURCES = psheader.c + +libxdvi_a_SOURCES = \ alloc-debug.h \ + browser.c \ browser.h \ c-openmx.h \ + dl_list.c \ dl_list.h \ + dvi-draw.c \ dvi-draw.h \ + dvi-init.c \ dvi-init.h \ dvi.h \ + dvisel.c \ dvisel.h \ + encodings.c \ encodings.h \ + events.c \ events.h \ + exit-handlers.c \ exit-handlers.h \ + filehist.c \ filehist.h \ + font-open.c \ font-open.h \ + gf.c \ + hypertex.c \ hypertex.h \ + image-magick.c \ image-magick.h \ + mime.c \ mime.h \ + my-snprintf.c \ my-snprintf.h \ + my-vsnprintf.c \ my-vsnprintf.h \ + pagehist.c \ pagehist.h \ + pk.c \ + print-internal.c \ print-internal.h \ + psdps.c \ psdps.h \ + psgs.c \ psgs.h \ + psnews.c \ psnews.h \ + read-mapfile.c \ read-mapfile.h \ + search-internal.c \ search-internal.h \ + special.c \ special.h \ + string-utils.c \ string-utils.h \ + string_list.c \ string_list.h \ + tfmload.c \ tfmload.h \ translations.h \ + util.c \ util.h \ version.h \ + vf.c \ + x_util.c \ x_util.h \ + xdvi.c \ xdvi-config.h \ xdvi-debug.h \ + xserver-info.c \ xdvi.h \ xserver-info.h -noinst_LIBRARIES = libxdvi.a - -nodist_libxdvi_a_SOURCES = psheader.c - -libxdvi_a_SOURCES = \ - browser.c \ - dl_list.c \ - dvi-draw.c \ - dvi-init.c \ - dvisel.c \ - encodings.c \ - events.c \ - exit-handlers.c \ - filehist.c \ - font-open.c \ - gf.c \ - hypertex.c \ - image-magick.c \ - mime.c \ - my-snprintf.c \ - my-vsnprintf.c \ - pagehist.c \ - pk.c \ - psdps.c \ - psgs.c \ - psnews.c \ - read-mapfile.c \ - search-internal.c \ - special.c \ - string-utils.c \ - string_list.c \ - tfmload.c \ - util.c \ - vf.c \ - x_util.c \ - xdvi.c \ - xserver-info.c +## We cannot easily use two different libraries due to the mutual +## dependencies between routines in ./*.c and gui/*.c. +libxdvi_a_SOURCES += \ + 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 bin_SCRIPTS = xdvi @@ -94,12 +166,9 @@ bin_PROGRAMS = xdvi-bin xdvi_bin_SOURCES = main.c -xdvi_bin_DEPENDENCIES = libxdvi.a gui/libgui.a libxdvi.a $(common_dependencies) - -LDADD = libxdvi.a gui/libgui.a $(common_ldadd) +xdvi_bin_DEPENDENCIES = libxdvi.a $(common_dependencies) -gui/libgui.a: $(libgui_dependencies) - cd gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a +LDADD = libxdvi.a $(common_ldadd) psheader.c: psheader.txt squeeze/squeeze$(EXEEXT) squeeze/squeeze $(srcdir)/psheader.txt $@ diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in index ec9f621caa4..2eb425a84f2 100644 --- a/Build/source/texk/xdvik/Makefile.in +++ b/Build/source/texk/xdvik/Makefile.in @@ -17,7 +17,6 @@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,7 +36,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__configure_deps) $(dist_noinst_DATA) \ - $(dist_pixmap_DATA) $(dist_xdvi_DATA) $(noinst_HEADERS) \ + $(dist_pixmap_DATA) $(dist_xdvi_DATA) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ @@ -55,15 +54,16 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \ $(top_srcdir)/m4/xdvi-cc-concat.m4 \ + $(top_srcdir)/m4/xdvi-check-iconv.m4 \ + $(top_srcdir)/m4/xdvi-check-langinfo.m4 \ + $(top_srcdir)/m4/xdvi-check-xaw.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 \ @@ -93,12 +93,24 @@ am_libxdvi_a_OBJECTS = browser.$(OBJEXT) dl_list.$(OBJEXT) \ filehist.$(OBJEXT) font-open.$(OBJEXT) gf.$(OBJEXT) \ hypertex.$(OBJEXT) image-magick.$(OBJEXT) mime.$(OBJEXT) \ my-snprintf.$(OBJEXT) my-vsnprintf.$(OBJEXT) \ - pagehist.$(OBJEXT) pk.$(OBJEXT) psdps.$(OBJEXT) psgs.$(OBJEXT) \ - psnews.$(OBJEXT) read-mapfile.$(OBJEXT) \ - search-internal.$(OBJEXT) special.$(OBJEXT) \ - string-utils.$(OBJEXT) string_list.$(OBJEXT) tfmload.$(OBJEXT) \ - util.$(OBJEXT) vf.$(OBJEXT) x_util.$(OBJEXT) xdvi.$(OBJEXT) \ - xserver-info.$(OBJEXT) + pagehist.$(OBJEXT) pk.$(OBJEXT) print-internal.$(OBJEXT) \ + psdps.$(OBJEXT) psgs.$(OBJEXT) psnews.$(OBJEXT) \ + read-mapfile.$(OBJEXT) search-internal.$(OBJEXT) \ + special.$(OBJEXT) string-utils.$(OBJEXT) string_list.$(OBJEXT) \ + tfmload.$(OBJEXT) util.$(OBJEXT) vf.$(OBJEXT) x_util.$(OBJEXT) \ + xdvi.$(OBJEXT) xserver-info.$(OBJEXT) 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) nodist_libxdvi_a_OBJECTS = psheader.$(OBJEXT) libxdvi_a_OBJECTS = $(am_libxdvi_a_OBJECTS) \ $(nodist_libxdvi_a_OBJECTS) @@ -156,7 +168,6 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; dist_pixmapDATA_INSTALL = $(INSTALL_DATA) dist_xdviDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_noinst_DATA) $(dist_pixmap_DATA) $(dist_xdvi_DATA) -HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive ETAGS = etags @@ -309,7 +320,7 @@ 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 gui . tests +SUBDIRS = squeeze . tests x_cppflags = $(X_CFLAGS) $(iconv_includes) common_includes = $(PS_DEF) $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) $(x_cppflags) x_ldflags = $(X_LIBS) $(x_linker_options) $(iconv_libpath) @@ -318,88 +329,49 @@ xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \ $(X_PRE_LIBS) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) -libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_builddir}/psheader.c -libgui_dependencies = ${top_srcdir}/*.h ${top_srcdir}/print-internal.c ${top_srcdir}/gui/*.[ch] +libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c INCLUDES = -I$(srcdir)/gui $(common_includes) -noinst_HEADERS = \ - alloc-debug.h \ - browser.h \ - c-openmx.h \ - dl_list.h \ - dvi-draw.h \ - dvi-init.h \ - dvi.h \ - dvisel.h \ - encodings.h \ - events.h \ - exit-handlers.h \ - filehist.h \ - font-open.h \ - hypertex.h \ - image-magick.h \ - mime.h \ - my-snprintf.h \ - my-vsnprintf.h \ - pagehist.h \ - print-internal.h \ - psdps.h \ - psgs.h \ - psnews.h \ - read-mapfile.h \ - search-internal.h \ - special.h \ - string-utils.h \ - string_list.h \ - tfmload.h \ - translations.h \ - util.h \ - version.h \ - x_util.h \ - xdvi-config.h \ - xdvi-debug.h \ - xdvi.h \ - xserver-info.h - noinst_LIBRARIES = libxdvi.a nodist_libxdvi_a_SOURCES = psheader.c -libxdvi_a_SOURCES = \ - browser.c \ - dl_list.c \ - dvi-draw.c \ - dvi-init.c \ - dvisel.c \ - encodings.c \ - events.c \ - exit-handlers.c \ - filehist.c \ - font-open.c \ - gf.c \ - hypertex.c \ - image-magick.c \ - mime.c \ - my-snprintf.c \ - my-vsnprintf.c \ - pagehist.c \ - pk.c \ - psdps.c \ - psgs.c \ - psnews.c \ - read-mapfile.c \ - search-internal.c \ - special.c \ - string-utils.c \ - string_list.c \ - tfmload.c \ - util.c \ - vf.c \ - x_util.c \ - xdvi.c \ - xserver-info.c - +libxdvi_a_SOURCES = alloc-debug.h browser.c browser.h c-openmx.h \ + dl_list.c dl_list.h dvi-draw.c dvi-draw.h dvi-init.c \ + dvi-init.h dvi.h dvisel.c dvisel.h encodings.c encodings.h \ + events.c events.h exit-handlers.c exit-handlers.h filehist.c \ + filehist.h font-open.c font-open.h gf.c hypertex.c hypertex.h \ + image-magick.c image-magick.h mime.c mime.h my-snprintf.c \ + my-snprintf.h my-vsnprintf.c my-vsnprintf.h pagehist.c \ + pagehist.h pk.c print-internal.c print-internal.h psdps.c \ + psdps.h psgs.c psgs.h psnews.c psnews.h read-mapfile.c \ + read-mapfile.h search-internal.c search-internal.h special.c \ + special.h string-utils.c string-utils.h string_list.c \ + string_list.h tfmload.c tfmload.h translations.h util.c util.h \ + version.h vf.c x_util.c x_util.h xdvi.c xdvi-config.h \ + xdvi-debug.h xserver-info.c xdvi.h xserver-info.h 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 bin_SCRIPTS = xdvi xdvi_bin_SOURCES = main.c -xdvi_bin_DEPENDENCIES = libxdvi.a gui/libgui.a libxdvi.a $(common_dependencies) -LDADD = libxdvi.a gui/libgui.a $(common_ldadd) +xdvi_bin_DEPENDENCIES = libxdvi.a $(common_dependencies) +LDADD = libxdvi.a $(common_ldadd) EXTRA_DIST = psheader.txt mksedscript xdvi.1.in BUGS CHANGES \ ChangeLog.TL FAQ LESSTIF-BUGS README.t1fonts README.t1mapper \ m4/acinclude.m4 pixmaps/drag_horiz.xbm \ @@ -550,6 +522,8 @@ mostlyclean-compile: 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)/browser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dl_list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvi-draw.Po@am__quote@ @@ -561,28 +535,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filehist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font-open.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hypertex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-magick.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mag.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.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)/mime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/my-snprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/my-vsnprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pagehist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pagesel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pk.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-dialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-internal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-log.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdps.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psgs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psheader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psnews.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read-mapfile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search-internal.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)/special.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statusline.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfmload.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/topic-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x_util.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)/xdvi.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@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xserver-info.Po@am__quote@ .c.o: @@ -606,6 +610,440 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +Panner.o: gui/Panner.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT Panner.o -MD -MP -MF $(DEPDIR)/Panner.Tpo -c -o Panner.o `test -f 'gui/Panner.c' || echo '$(srcdir)/'`gui/Panner.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/Panner.Tpo $(DEPDIR)/Panner.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/Panner.c' object='Panner.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o Panner.o `test -f 'gui/Panner.c' || echo '$(srcdir)/'`gui/Panner.c + +Panner.obj: gui/Panner.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT Panner.obj -MD -MP -MF $(DEPDIR)/Panner.Tpo -c -o Panner.obj `if test -f 'gui/Panner.c'; then $(CYGPATH_W) 'gui/Panner.c'; else $(CYGPATH_W) '$(srcdir)/gui/Panner.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/Panner.Tpo $(DEPDIR)/Panner.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/Panner.c' object='Panner.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o Panner.obj `if test -f 'gui/Panner.c'; then $(CYGPATH_W) 'gui/Panner.c'; else $(CYGPATH_W) '$(srcdir)/gui/Panner.c'; fi` + +Tip.o: gui/Tip.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT Tip.o -MD -MP -MF $(DEPDIR)/Tip.Tpo -c -o Tip.o `test -f 'gui/Tip.c' || echo '$(srcdir)/'`gui/Tip.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/Tip.Tpo $(DEPDIR)/Tip.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/Tip.c' object='Tip.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o Tip.o `test -f 'gui/Tip.c' || echo '$(srcdir)/'`gui/Tip.c + +Tip.obj: gui/Tip.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT Tip.obj -MD -MP -MF $(DEPDIR)/Tip.Tpo -c -o Tip.obj `if test -f 'gui/Tip.c'; then $(CYGPATH_W) 'gui/Tip.c'; else $(CYGPATH_W) '$(srcdir)/gui/Tip.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/Tip.Tpo $(DEPDIR)/Tip.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/Tip.c' object='Tip.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o Tip.obj `if test -f 'gui/Tip.c'; then $(CYGPATH_W) 'gui/Tip.c'; else $(CYGPATH_W) '$(srcdir)/gui/Tip.c'; fi` + +help-window.o: gui/help-window.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT help-window.o -MD -MP -MF $(DEPDIR)/help-window.Tpo -c -o help-window.o `test -f 'gui/help-window.c' || echo '$(srcdir)/'`gui/help-window.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/help-window.Tpo $(DEPDIR)/help-window.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/help-window.c' object='help-window.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o help-window.o `test -f 'gui/help-window.c' || echo '$(srcdir)/'`gui/help-window.c + +help-window.obj: gui/help-window.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT help-window.obj -MD -MP -MF $(DEPDIR)/help-window.Tpo -c -o help-window.obj `if test -f 'gui/help-window.c'; then $(CYGPATH_W) 'gui/help-window.c'; else $(CYGPATH_W) '$(srcdir)/gui/help-window.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/help-window.Tpo $(DEPDIR)/help-window.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/help-window.c' object='help-window.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o help-window.obj `if test -f 'gui/help-window.c'; then $(CYGPATH_W) 'gui/help-window.c'; else $(CYGPATH_W) '$(srcdir)/gui/help-window.c'; fi` + +mag.o: gui/mag.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mag.o -MD -MP -MF $(DEPDIR)/mag.Tpo -c -o mag.o `test -f 'gui/mag.c' || echo '$(srcdir)/'`gui/mag.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mag.Tpo $(DEPDIR)/mag.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/mag.c' object='mag.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mag.o `test -f 'gui/mag.c' || echo '$(srcdir)/'`gui/mag.c + +mag.obj: gui/mag.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mag.obj -MD -MP -MF $(DEPDIR)/mag.Tpo -c -o mag.obj `if test -f 'gui/mag.c'; then $(CYGPATH_W) 'gui/mag.c'; else $(CYGPATH_W) '$(srcdir)/gui/mag.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mag.Tpo $(DEPDIR)/mag.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/mag.c' object='mag.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mag.obj `if test -f 'gui/mag.c'; then $(CYGPATH_W) 'gui/mag.c'; else $(CYGPATH_W) '$(srcdir)/gui/mag.c'; fi` + +menu.o: gui/menu.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT menu.o -MD -MP -MF $(DEPDIR)/menu.Tpo -c -o menu.o `test -f 'gui/menu.c' || echo '$(srcdir)/'`gui/menu.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/menu.c' object='menu.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o menu.o `test -f 'gui/menu.c' || echo '$(srcdir)/'`gui/menu.c + +menu.obj: gui/menu.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT menu.obj -MD -MP -MF $(DEPDIR)/menu.Tpo -c -o menu.obj `if test -f 'gui/menu.c'; then $(CYGPATH_W) 'gui/menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/menu.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/menu.Tpo $(DEPDIR)/menu.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/menu.c' object='menu.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o menu.obj `if test -f 'gui/menu.c'; then $(CYGPATH_W) 'gui/menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/menu.c'; fi` + +message-window.o: gui/message-window.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT message-window.o -MD -MP -MF $(DEPDIR)/message-window.Tpo -c -o message-window.o `test -f 'gui/message-window.c' || echo '$(srcdir)/'`gui/message-window.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/message-window.Tpo $(DEPDIR)/message-window.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/message-window.c' object='message-window.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o message-window.o `test -f 'gui/message-window.c' || echo '$(srcdir)/'`gui/message-window.c + +message-window.obj: gui/message-window.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT message-window.obj -MD -MP -MF $(DEPDIR)/message-window.Tpo -c -o message-window.obj `if test -f 'gui/message-window.c'; then $(CYGPATH_W) 'gui/message-window.c'; else $(CYGPATH_W) '$(srcdir)/gui/message-window.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/message-window.Tpo $(DEPDIR)/message-window.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/message-window.c' object='message-window.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o message-window.obj `if test -f 'gui/message-window.c'; then $(CYGPATH_W) 'gui/message-window.c'; else $(CYGPATH_W) '$(srcdir)/gui/message-window.c'; fi` + +pagesel.o: gui/pagesel.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pagesel.o -MD -MP -MF $(DEPDIR)/pagesel.Tpo -c -o pagesel.o `test -f 'gui/pagesel.c' || echo '$(srcdir)/'`gui/pagesel.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pagesel.Tpo $(DEPDIR)/pagesel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/pagesel.c' object='pagesel.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pagesel.o `test -f 'gui/pagesel.c' || echo '$(srcdir)/'`gui/pagesel.c + +pagesel.obj: gui/pagesel.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pagesel.obj -MD -MP -MF $(DEPDIR)/pagesel.Tpo -c -o pagesel.obj `if test -f 'gui/pagesel.c'; then $(CYGPATH_W) 'gui/pagesel.c'; else $(CYGPATH_W) '$(srcdir)/gui/pagesel.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pagesel.Tpo $(DEPDIR)/pagesel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/pagesel.c' object='pagesel.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pagesel.obj `if test -f 'gui/pagesel.c'; then $(CYGPATH_W) 'gui/pagesel.c'; else $(CYGPATH_W) '$(srcdir)/gui/pagesel.c'; fi` + +print-dialog.o: gui/print-dialog.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-dialog.o -MD -MP -MF $(DEPDIR)/print-dialog.Tpo -c -o print-dialog.o `test -f 'gui/print-dialog.c' || echo '$(srcdir)/'`gui/print-dialog.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-dialog.Tpo $(DEPDIR)/print-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/print-dialog.c' object='print-dialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-dialog.o `test -f 'gui/print-dialog.c' || echo '$(srcdir)/'`gui/print-dialog.c + +print-dialog.obj: gui/print-dialog.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-dialog.obj -MD -MP -MF $(DEPDIR)/print-dialog.Tpo -c -o print-dialog.obj `if test -f 'gui/print-dialog.c'; then $(CYGPATH_W) 'gui/print-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gui/print-dialog.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-dialog.Tpo $(DEPDIR)/print-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/print-dialog.c' object='print-dialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-dialog.obj `if test -f 'gui/print-dialog.c'; then $(CYGPATH_W) 'gui/print-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gui/print-dialog.c'; fi` + +print-log.o: gui/print-log.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-log.o -MD -MP -MF $(DEPDIR)/print-log.Tpo -c -o print-log.o `test -f 'gui/print-log.c' || echo '$(srcdir)/'`gui/print-log.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-log.Tpo $(DEPDIR)/print-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/print-log.c' object='print-log.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-log.o `test -f 'gui/print-log.c' || echo '$(srcdir)/'`gui/print-log.c + +print-log.obj: gui/print-log.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-log.obj -MD -MP -MF $(DEPDIR)/print-log.Tpo -c -o print-log.obj `if test -f 'gui/print-log.c'; then $(CYGPATH_W) 'gui/print-log.c'; else $(CYGPATH_W) '$(srcdir)/gui/print-log.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-log.Tpo $(DEPDIR)/print-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/print-log.c' object='print-log.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-log.obj `if test -f 'gui/print-log.c'; then $(CYGPATH_W) 'gui/print-log.c'; else $(CYGPATH_W) '$(srcdir)/gui/print-log.c'; fi` + +search-dialog.o: gui/search-dialog.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT search-dialog.o -MD -MP -MF $(DEPDIR)/search-dialog.Tpo -c -o search-dialog.o `test -f 'gui/search-dialog.c' || echo '$(srcdir)/'`gui/search-dialog.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/search-dialog.Tpo $(DEPDIR)/search-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/search-dialog.c' object='search-dialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o search-dialog.o `test -f 'gui/search-dialog.c' || echo '$(srcdir)/'`gui/search-dialog.c + +search-dialog.obj: gui/search-dialog.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT search-dialog.obj -MD -MP -MF $(DEPDIR)/search-dialog.Tpo -c -o search-dialog.obj `if test -f 'gui/search-dialog.c'; then $(CYGPATH_W) 'gui/search-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gui/search-dialog.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/search-dialog.Tpo $(DEPDIR)/search-dialog.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/search-dialog.c' object='search-dialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o search-dialog.obj `if test -f 'gui/search-dialog.c'; then $(CYGPATH_W) 'gui/search-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gui/search-dialog.c'; fi` + +selection.o: gui/selection.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT selection.o -MD -MP -MF $(DEPDIR)/selection.Tpo -c -o selection.o `test -f 'gui/selection.c' || echo '$(srcdir)/'`gui/selection.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/selection.Tpo $(DEPDIR)/selection.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/selection.c' object='selection.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o selection.o `test -f 'gui/selection.c' || echo '$(srcdir)/'`gui/selection.c + +selection.obj: gui/selection.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT selection.obj -MD -MP -MF $(DEPDIR)/selection.Tpo -c -o selection.obj `if test -f 'gui/selection.c'; then $(CYGPATH_W) 'gui/selection.c'; else $(CYGPATH_W) '$(srcdir)/gui/selection.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/selection.Tpo $(DEPDIR)/selection.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/selection.c' object='selection.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o selection.obj `if test -f 'gui/selection.c'; then $(CYGPATH_W) 'gui/selection.c'; else $(CYGPATH_W) '$(srcdir)/gui/selection.c'; fi` + +sfDir.o: gui/sfDir.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfDir.o -MD -MP -MF $(DEPDIR)/sfDir.Tpo -c -o sfDir.o `test -f 'gui/sfDir.c' || echo '$(srcdir)/'`gui/sfDir.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfDir.Tpo $(DEPDIR)/sfDir.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfDir.c' object='sfDir.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfDir.o `test -f 'gui/sfDir.c' || echo '$(srcdir)/'`gui/sfDir.c + +sfDir.obj: gui/sfDir.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfDir.obj -MD -MP -MF $(DEPDIR)/sfDir.Tpo -c -o sfDir.obj `if test -f 'gui/sfDir.c'; then $(CYGPATH_W) 'gui/sfDir.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfDir.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfDir.Tpo $(DEPDIR)/sfDir.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfDir.c' object='sfDir.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfDir.obj `if test -f 'gui/sfDir.c'; then $(CYGPATH_W) 'gui/sfDir.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfDir.c'; fi` + +sfDraw.o: gui/sfDraw.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfDraw.o -MD -MP -MF $(DEPDIR)/sfDraw.Tpo -c -o sfDraw.o `test -f 'gui/sfDraw.c' || echo '$(srcdir)/'`gui/sfDraw.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfDraw.Tpo $(DEPDIR)/sfDraw.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfDraw.c' object='sfDraw.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfDraw.o `test -f 'gui/sfDraw.c' || echo '$(srcdir)/'`gui/sfDraw.c + +sfDraw.obj: gui/sfDraw.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfDraw.obj -MD -MP -MF $(DEPDIR)/sfDraw.Tpo -c -o sfDraw.obj `if test -f 'gui/sfDraw.c'; then $(CYGPATH_W) 'gui/sfDraw.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfDraw.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfDraw.Tpo $(DEPDIR)/sfDraw.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfDraw.c' object='sfDraw.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfDraw.obj `if test -f 'gui/sfDraw.c'; then $(CYGPATH_W) 'gui/sfDraw.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfDraw.c'; fi` + +sfPath.o: gui/sfPath.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfPath.o -MD -MP -MF $(DEPDIR)/sfPath.Tpo -c -o sfPath.o `test -f 'gui/sfPath.c' || echo '$(srcdir)/'`gui/sfPath.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfPath.Tpo $(DEPDIR)/sfPath.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfPath.c' object='sfPath.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfPath.o `test -f 'gui/sfPath.c' || echo '$(srcdir)/'`gui/sfPath.c + +sfPath.obj: gui/sfPath.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfPath.obj -MD -MP -MF $(DEPDIR)/sfPath.Tpo -c -o sfPath.obj `if test -f 'gui/sfPath.c'; then $(CYGPATH_W) 'gui/sfPath.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfPath.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfPath.Tpo $(DEPDIR)/sfPath.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfPath.c' object='sfPath.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfPath.obj `if test -f 'gui/sfPath.c'; then $(CYGPATH_W) 'gui/sfPath.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfPath.c'; fi` + +sfSelFile.o: gui/sfSelFile.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfSelFile.o -MD -MP -MF $(DEPDIR)/sfSelFile.Tpo -c -o sfSelFile.o `test -f 'gui/sfSelFile.c' || echo '$(srcdir)/'`gui/sfSelFile.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfSelFile.Tpo $(DEPDIR)/sfSelFile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfSelFile.c' object='sfSelFile.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfSelFile.o `test -f 'gui/sfSelFile.c' || echo '$(srcdir)/'`gui/sfSelFile.c + +sfSelFile.obj: gui/sfSelFile.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sfSelFile.obj -MD -MP -MF $(DEPDIR)/sfSelFile.Tpo -c -o sfSelFile.obj `if test -f 'gui/sfSelFile.c'; then $(CYGPATH_W) 'gui/sfSelFile.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfSelFile.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sfSelFile.Tpo $(DEPDIR)/sfSelFile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/sfSelFile.c' object='sfSelFile.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sfSelFile.obj `if test -f 'gui/sfSelFile.c'; then $(CYGPATH_W) 'gui/sfSelFile.c'; else $(CYGPATH_W) '$(srcdir)/gui/sfSelFile.c'; fi` + +statusline.o: gui/statusline.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT statusline.o -MD -MP -MF $(DEPDIR)/statusline.Tpo -c -o statusline.o `test -f 'gui/statusline.c' || echo '$(srcdir)/'`gui/statusline.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/statusline.Tpo $(DEPDIR)/statusline.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/statusline.c' object='statusline.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o statusline.o `test -f 'gui/statusline.c' || echo '$(srcdir)/'`gui/statusline.c + +statusline.obj: gui/statusline.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT statusline.obj -MD -MP -MF $(DEPDIR)/statusline.Tpo -c -o statusline.obj `if test -f 'gui/statusline.c'; then $(CYGPATH_W) 'gui/statusline.c'; else $(CYGPATH_W) '$(srcdir)/gui/statusline.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/statusline.Tpo $(DEPDIR)/statusline.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/statusline.c' object='statusline.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o statusline.obj `if test -f 'gui/statusline.c'; then $(CYGPATH_W) 'gui/statusline.c'; else $(CYGPATH_W) '$(srcdir)/gui/statusline.c'; fi` + +topic-window.o: gui/topic-window.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT topic-window.o -MD -MP -MF $(DEPDIR)/topic-window.Tpo -c -o topic-window.o `test -f 'gui/topic-window.c' || echo '$(srcdir)/'`gui/topic-window.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/topic-window.Tpo $(DEPDIR)/topic-window.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/topic-window.c' object='topic-window.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o topic-window.o `test -f 'gui/topic-window.c' || echo '$(srcdir)/'`gui/topic-window.c + +topic-window.obj: gui/topic-window.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT topic-window.obj -MD -MP -MF $(DEPDIR)/topic-window.Tpo -c -o topic-window.obj `if test -f 'gui/topic-window.c'; then $(CYGPATH_W) 'gui/topic-window.c'; else $(CYGPATH_W) '$(srcdir)/gui/topic-window.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/topic-window.Tpo $(DEPDIR)/topic-window.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/topic-window.c' object='topic-window.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o topic-window.obj `if test -f 'gui/topic-window.c'; then $(CYGPATH_W) 'gui/topic-window.c'; else $(CYGPATH_W) '$(srcdir)/gui/topic-window.c'; fi` + +xaw_bitmaps.o: gui/xaw_bitmaps.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xaw_bitmaps.o -MD -MP -MF $(DEPDIR)/xaw_bitmaps.Tpo -c -o xaw_bitmaps.o `test -f 'gui/xaw_bitmaps.c' || echo '$(srcdir)/'`gui/xaw_bitmaps.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xaw_bitmaps.Tpo $(DEPDIR)/xaw_bitmaps.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xaw_bitmaps.c' object='xaw_bitmaps.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xaw_bitmaps.o `test -f 'gui/xaw_bitmaps.c' || echo '$(srcdir)/'`gui/xaw_bitmaps.c + +xaw_bitmaps.obj: gui/xaw_bitmaps.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xaw_bitmaps.obj -MD -MP -MF $(DEPDIR)/xaw_bitmaps.Tpo -c -o xaw_bitmaps.obj `if test -f 'gui/xaw_bitmaps.c'; then $(CYGPATH_W) 'gui/xaw_bitmaps.c'; else $(CYGPATH_W) '$(srcdir)/gui/xaw_bitmaps.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xaw_bitmaps.Tpo $(DEPDIR)/xaw_bitmaps.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xaw_bitmaps.c' object='xaw_bitmaps.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xaw_bitmaps.obj `if test -f 'gui/xaw_bitmaps.c'; then $(CYGPATH_W) 'gui/xaw_bitmaps.c'; else $(CYGPATH_W) '$(srcdir)/gui/xaw_bitmaps.c'; fi` + +xaw_menu.o: gui/xaw_menu.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xaw_menu.o -MD -MP -MF $(DEPDIR)/xaw_menu.Tpo -c -o xaw_menu.o `test -f 'gui/xaw_menu.c' || echo '$(srcdir)/'`gui/xaw_menu.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xaw_menu.Tpo $(DEPDIR)/xaw_menu.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xaw_menu.c' object='xaw_menu.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xaw_menu.o `test -f 'gui/xaw_menu.c' || echo '$(srcdir)/'`gui/xaw_menu.c + +xaw_menu.obj: gui/xaw_menu.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xaw_menu.obj -MD -MP -MF $(DEPDIR)/xaw_menu.Tpo -c -o xaw_menu.obj `if test -f 'gui/xaw_menu.c'; then $(CYGPATH_W) 'gui/xaw_menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/xaw_menu.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xaw_menu.Tpo $(DEPDIR)/xaw_menu.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xaw_menu.c' object='xaw_menu.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xaw_menu.obj `if test -f 'gui/xaw_menu.c'; then $(CYGPATH_W) 'gui/xaw_menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/xaw_menu.c'; fi` + +xicon.o: gui/xicon.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xicon.o -MD -MP -MF $(DEPDIR)/xicon.Tpo -c -o xicon.o `test -f 'gui/xicon.c' || echo '$(srcdir)/'`gui/xicon.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xicon.Tpo $(DEPDIR)/xicon.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xicon.c' object='xicon.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xicon.o `test -f 'gui/xicon.c' || echo '$(srcdir)/'`gui/xicon.c + +xicon.obj: gui/xicon.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xicon.obj -MD -MP -MF $(DEPDIR)/xicon.Tpo -c -o xicon.obj `if test -f 'gui/xicon.c'; then $(CYGPATH_W) 'gui/xicon.c'; else $(CYGPATH_W) '$(srcdir)/gui/xicon.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xicon.Tpo $(DEPDIR)/xicon.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xicon.c' object='xicon.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xicon.obj `if test -f 'gui/xicon.c'; then $(CYGPATH_W) 'gui/xicon.c'; else $(CYGPATH_W) '$(srcdir)/gui/xicon.c'; fi` + +xlwradio.o: gui/xlwradio.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xlwradio.o -MD -MP -MF $(DEPDIR)/xlwradio.Tpo -c -o xlwradio.o `test -f 'gui/xlwradio.c' || echo '$(srcdir)/'`gui/xlwradio.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xlwradio.Tpo $(DEPDIR)/xlwradio.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xlwradio.c' object='xlwradio.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xlwradio.o `test -f 'gui/xlwradio.c' || echo '$(srcdir)/'`gui/xlwradio.c + +xlwradio.obj: gui/xlwradio.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xlwradio.obj -MD -MP -MF $(DEPDIR)/xlwradio.Tpo -c -o xlwradio.obj `if test -f 'gui/xlwradio.c'; then $(CYGPATH_W) 'gui/xlwradio.c'; else $(CYGPATH_W) '$(srcdir)/gui/xlwradio.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xlwradio.Tpo $(DEPDIR)/xlwradio.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xlwradio.c' object='xlwradio.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xlwradio.obj `if test -f 'gui/xlwradio.c'; then $(CYGPATH_W) 'gui/xlwradio.c'; else $(CYGPATH_W) '$(srcdir)/gui/xlwradio.c'; fi` + +xm_colorsel.o: gui/xm_colorsel.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_colorsel.o -MD -MP -MF $(DEPDIR)/xm_colorsel.Tpo -c -o xm_colorsel.o `test -f 'gui/xm_colorsel.c' || echo '$(srcdir)/'`gui/xm_colorsel.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_colorsel.Tpo $(DEPDIR)/xm_colorsel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_colorsel.c' object='xm_colorsel.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_colorsel.o `test -f 'gui/xm_colorsel.c' || echo '$(srcdir)/'`gui/xm_colorsel.c + +xm_colorsel.obj: gui/xm_colorsel.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_colorsel.obj -MD -MP -MF $(DEPDIR)/xm_colorsel.Tpo -c -o xm_colorsel.obj `if test -f 'gui/xm_colorsel.c'; then $(CYGPATH_W) 'gui/xm_colorsel.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_colorsel.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_colorsel.Tpo $(DEPDIR)/xm_colorsel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_colorsel.c' object='xm_colorsel.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_colorsel.obj `if test -f 'gui/xm_colorsel.c'; then $(CYGPATH_W) 'gui/xm_colorsel.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_colorsel.c'; fi` + +xm_filesel.o: gui/xm_filesel.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_filesel.o -MD -MP -MF $(DEPDIR)/xm_filesel.Tpo -c -o xm_filesel.o `test -f 'gui/xm_filesel.c' || echo '$(srcdir)/'`gui/xm_filesel.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_filesel.Tpo $(DEPDIR)/xm_filesel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_filesel.c' object='xm_filesel.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_filesel.o `test -f 'gui/xm_filesel.c' || echo '$(srcdir)/'`gui/xm_filesel.c + +xm_filesel.obj: gui/xm_filesel.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_filesel.obj -MD -MP -MF $(DEPDIR)/xm_filesel.Tpo -c -o xm_filesel.obj `if test -f 'gui/xm_filesel.c'; then $(CYGPATH_W) 'gui/xm_filesel.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_filesel.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_filesel.Tpo $(DEPDIR)/xm_filesel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_filesel.c' object='xm_filesel.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_filesel.obj `if test -f 'gui/xm_filesel.c'; then $(CYGPATH_W) 'gui/xm_filesel.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_filesel.c'; fi` + +xm_menu.o: gui/xm_menu.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_menu.o -MD -MP -MF $(DEPDIR)/xm_menu.Tpo -c -o xm_menu.o `test -f 'gui/xm_menu.c' || echo '$(srcdir)/'`gui/xm_menu.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_menu.Tpo $(DEPDIR)/xm_menu.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_menu.c' object='xm_menu.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_menu.o `test -f 'gui/xm_menu.c' || echo '$(srcdir)/'`gui/xm_menu.c + +xm_menu.obj: gui/xm_menu.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_menu.obj -MD -MP -MF $(DEPDIR)/xm_menu.Tpo -c -o xm_menu.obj `if test -f 'gui/xm_menu.c'; then $(CYGPATH_W) 'gui/xm_menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_menu.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_menu.Tpo $(DEPDIR)/xm_menu.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_menu.c' object='xm_menu.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_menu.obj `if test -f 'gui/xm_menu.c'; then $(CYGPATH_W) 'gui/xm_menu.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_menu.c'; fi` + +xm_prefs.o: gui/xm_prefs.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs.o -MD -MP -MF $(DEPDIR)/xm_prefs.Tpo -c -o xm_prefs.o `test -f 'gui/xm_prefs.c' || echo '$(srcdir)/'`gui/xm_prefs.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs.Tpo $(DEPDIR)/xm_prefs.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs.c' object='xm_prefs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs.o `test -f 'gui/xm_prefs.c' || echo '$(srcdir)/'`gui/xm_prefs.c + +xm_prefs.obj: gui/xm_prefs.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs.obj -MD -MP -MF $(DEPDIR)/xm_prefs.Tpo -c -o xm_prefs.obj `if test -f 'gui/xm_prefs.c'; then $(CYGPATH_W) 'gui/xm_prefs.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs.Tpo $(DEPDIR)/xm_prefs.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs.c' object='xm_prefs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs.obj `if test -f 'gui/xm_prefs.c'; then $(CYGPATH_W) 'gui/xm_prefs.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs.c'; fi` + +xm_prefs_appearance.o: gui/xm_prefs_appearance.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_appearance.o -MD -MP -MF $(DEPDIR)/xm_prefs_appearance.Tpo -c -o xm_prefs_appearance.o `test -f 'gui/xm_prefs_appearance.c' || echo '$(srcdir)/'`gui/xm_prefs_appearance.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_appearance.Tpo $(DEPDIR)/xm_prefs_appearance.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_appearance.c' object='xm_prefs_appearance.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_appearance.o `test -f 'gui/xm_prefs_appearance.c' || echo '$(srcdir)/'`gui/xm_prefs_appearance.c + +xm_prefs_appearance.obj: gui/xm_prefs_appearance.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_appearance.obj -MD -MP -MF $(DEPDIR)/xm_prefs_appearance.Tpo -c -o xm_prefs_appearance.obj `if test -f 'gui/xm_prefs_appearance.c'; then $(CYGPATH_W) 'gui/xm_prefs_appearance.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_appearance.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_appearance.Tpo $(DEPDIR)/xm_prefs_appearance.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_appearance.c' object='xm_prefs_appearance.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_appearance.obj `if test -f 'gui/xm_prefs_appearance.c'; then $(CYGPATH_W) 'gui/xm_prefs_appearance.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_appearance.c'; fi` + +xm_prefs_fonts.o: gui/xm_prefs_fonts.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_fonts.o -MD -MP -MF $(DEPDIR)/xm_prefs_fonts.Tpo -c -o xm_prefs_fonts.o `test -f 'gui/xm_prefs_fonts.c' || echo '$(srcdir)/'`gui/xm_prefs_fonts.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_fonts.Tpo $(DEPDIR)/xm_prefs_fonts.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_fonts.c' object='xm_prefs_fonts.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_fonts.o `test -f 'gui/xm_prefs_fonts.c' || echo '$(srcdir)/'`gui/xm_prefs_fonts.c + +xm_prefs_fonts.obj: gui/xm_prefs_fonts.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_fonts.obj -MD -MP -MF $(DEPDIR)/xm_prefs_fonts.Tpo -c -o xm_prefs_fonts.obj `if test -f 'gui/xm_prefs_fonts.c'; then $(CYGPATH_W) 'gui/xm_prefs_fonts.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_fonts.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_fonts.Tpo $(DEPDIR)/xm_prefs_fonts.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_fonts.c' object='xm_prefs_fonts.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_fonts.obj `if test -f 'gui/xm_prefs_fonts.c'; then $(CYGPATH_W) 'gui/xm_prefs_fonts.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_fonts.c'; fi` + +xm_prefs_helpers.o: gui/xm_prefs_helpers.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_helpers.o -MD -MP -MF $(DEPDIR)/xm_prefs_helpers.Tpo -c -o xm_prefs_helpers.o `test -f 'gui/xm_prefs_helpers.c' || echo '$(srcdir)/'`gui/xm_prefs_helpers.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_helpers.Tpo $(DEPDIR)/xm_prefs_helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_helpers.c' object='xm_prefs_helpers.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_helpers.o `test -f 'gui/xm_prefs_helpers.c' || echo '$(srcdir)/'`gui/xm_prefs_helpers.c + +xm_prefs_helpers.obj: gui/xm_prefs_helpers.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_helpers.obj -MD -MP -MF $(DEPDIR)/xm_prefs_helpers.Tpo -c -o xm_prefs_helpers.obj `if test -f 'gui/xm_prefs_helpers.c'; then $(CYGPATH_W) 'gui/xm_prefs_helpers.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_helpers.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_helpers.Tpo $(DEPDIR)/xm_prefs_helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_helpers.c' object='xm_prefs_helpers.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_helpers.obj `if test -f 'gui/xm_prefs_helpers.c'; then $(CYGPATH_W) 'gui/xm_prefs_helpers.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_helpers.c'; fi` + +xm_prefs_page.o: gui/xm_prefs_page.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_page.o -MD -MP -MF $(DEPDIR)/xm_prefs_page.Tpo -c -o xm_prefs_page.o `test -f 'gui/xm_prefs_page.c' || echo '$(srcdir)/'`gui/xm_prefs_page.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_page.Tpo $(DEPDIR)/xm_prefs_page.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_page.c' object='xm_prefs_page.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_page.o `test -f 'gui/xm_prefs_page.c' || echo '$(srcdir)/'`gui/xm_prefs_page.c + +xm_prefs_page.obj: gui/xm_prefs_page.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_page.obj -MD -MP -MF $(DEPDIR)/xm_prefs_page.Tpo -c -o xm_prefs_page.obj `if test -f 'gui/xm_prefs_page.c'; then $(CYGPATH_W) 'gui/xm_prefs_page.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_page.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_page.Tpo $(DEPDIR)/xm_prefs_page.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_page.c' object='xm_prefs_page.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_page.obj `if test -f 'gui/xm_prefs_page.c'; then $(CYGPATH_W) 'gui/xm_prefs_page.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_page.c'; fi` + +xm_prefs_scroll.o: gui/xm_prefs_scroll.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_scroll.o -MD -MP -MF $(DEPDIR)/xm_prefs_scroll.Tpo -c -o xm_prefs_scroll.o `test -f 'gui/xm_prefs_scroll.c' || echo '$(srcdir)/'`gui/xm_prefs_scroll.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_scroll.Tpo $(DEPDIR)/xm_prefs_scroll.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_scroll.c' object='xm_prefs_scroll.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_scroll.o `test -f 'gui/xm_prefs_scroll.c' || echo '$(srcdir)/'`gui/xm_prefs_scroll.c + +xm_prefs_scroll.obj: gui/xm_prefs_scroll.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_prefs_scroll.obj -MD -MP -MF $(DEPDIR)/xm_prefs_scroll.Tpo -c -o xm_prefs_scroll.obj `if test -f 'gui/xm_prefs_scroll.c'; then $(CYGPATH_W) 'gui/xm_prefs_scroll.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_scroll.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_prefs_scroll.Tpo $(DEPDIR)/xm_prefs_scroll.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_prefs_scroll.c' object='xm_prefs_scroll.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_prefs_scroll.obj `if test -f 'gui/xm_prefs_scroll.c'; then $(CYGPATH_W) 'gui/xm_prefs_scroll.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_prefs_scroll.c'; fi` + +xm_toolbar.o: gui/xm_toolbar.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_toolbar.o -MD -MP -MF $(DEPDIR)/xm_toolbar.Tpo -c -o xm_toolbar.o `test -f 'gui/xm_toolbar.c' || echo '$(srcdir)/'`gui/xm_toolbar.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_toolbar.Tpo $(DEPDIR)/xm_toolbar.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_toolbar.c' object='xm_toolbar.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_toolbar.o `test -f 'gui/xm_toolbar.c' || echo '$(srcdir)/'`gui/xm_toolbar.c + +xm_toolbar.obj: gui/xm_toolbar.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xm_toolbar.obj -MD -MP -MF $(DEPDIR)/xm_toolbar.Tpo -c -o xm_toolbar.obj `if test -f 'gui/xm_toolbar.c'; then $(CYGPATH_W) 'gui/xm_toolbar.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_toolbar.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xm_toolbar.Tpo $(DEPDIR)/xm_toolbar.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gui/xm_toolbar.c' object='xm_toolbar.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xm_toolbar.obj `if test -f 'gui/xm_toolbar.c'; then $(CYGPATH_W) 'gui/xm_toolbar.c'; else $(CYGPATH_W) '$(srcdir)/gui/xm_toolbar.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -963,7 +1401,7 @@ distcleancheck: distclean check-am: all-am check: check-recursive all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ - $(HEADERS) c-auto.h + c-auto.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)"; do \ @@ -1095,9 +1533,6 @@ uninstall-man: uninstall-man1 @KPATHSEA_RULE@ @T1LIB_RULE@ -gui/libgui.a: $(libgui_dependencies) - cd gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a - psheader.c: psheader.txt squeeze/squeeze$(EXEEXT) squeeze/squeeze $(srcdir)/psheader.txt $@ diff --git a/Build/source/texk/xdvik/aclocal.m4 b/Build/source/texk/xdvik/aclocal.m4 index 98d54f98a33..6f03acf13a4 100644 --- a/Build/source/texk/xdvik/aclocal.m4 +++ b/Build/source/texk/xdvik/aclocal.m4 @@ -906,15 +906,16 @@ AC_SUBST([am__untar]) m4_include([m4/xdvi-c-bitmap-type.m4]) m4_include([m4/xdvi-cc-concat.m4]) +m4_include([m4/xdvi-check-iconv.m4]) +m4_include([m4/xdvi-check-langinfo.m4]) +m4_include([m4/xdvi-check-xaw.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 284e99a20b1..ce7521f20d8 100644 --- a/Build/source/texk/xdvik/c-auto.in +++ b/Build/source/texk/xdvik/c-auto.in @@ -108,7 +108,7 @@ /* Define if the vsnprintf function works. */ #undef HAVE_GOOD_VSNPRINTF -/* Define if you have the iconv function. */ +/* Define to 1 if you have the `iconv' function. */ #undef HAVE_ICONV /* Define to 1 if you have the <iconv.h> header file. */ diff --git a/Build/source/texk/xdvik/common.am b/Build/source/texk/xdvik/common.am index f2b19aa6e50..85c55f5bcd6 100644 --- a/Build/source/texk/xdvik/common.am +++ b/Build/source/texk/xdvik/common.am @@ -23,10 +23,9 @@ common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) -## Dependencies for libxdvi.a and gui/libgui.a +## Dependencies for libxdvi.a ## -libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_builddir}/psheader.c -libgui_dependencies = ${top_srcdir}/*.h ${top_srcdir}/print-internal.c ${top_srcdir}/gui/*.[ch] +libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c ## Rebuild libkpathsea @KPATHSEA_RULE@ diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index c52b51f6fc1..d256afdbfca 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -798,14 +798,14 @@ KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS KPATHSEA_INCLUDES -iconv_includes -iconv_libs -iconv_libpath final_exec_name x_tool_libs -x_xpm_libs x_ext_lib +x_xpm_libs x_xmu_lib +iconv_libs +iconv_libpath +iconv_includes x_linker_options X_EXTRA_LIBS X_LIBS @@ -938,14 +938,14 @@ with_xdvi_x_toolkit with_ps enable_a4 with_x +with_iconv_include +with_iconv_libdir enable_magick with_xpm with_xpm_includes with_xpm_libraries with_motif_include with_motif_libdir -with_iconv_libdir -with_iconv_include with_system_kpathsea with_kpathsea_includes with_kpathsea_libdir @@ -1626,17 +1626,17 @@ 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-iconv-include=DIR + Specify the location of <iconv.h> header + --with-iconv-libdir=DIR Specify the location of iconv (-liconv or -lrecode) + library + --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 - Specify the location of iconv header (iconv.h) --with-system-kpathsea use installed kpathsea headers and library --with-kpathsea-includes=DIR kpathsea headers installed in DIR @@ -12902,6 +12902,16 @@ _ACEOF fi +## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ +## configure options for xdvik + +# Check whether --with-xdvi-x-toolkit was given. +if test "${with_xdvi_x_toolkit+set}" = set; then + withval=$with_xdvi_x_toolkit; +fi + + + { $as_echo "$as_me:$LINENO: checking for library containing pow" >&5 $as_echo_n "checking for library containing pow... " >&6; } if test "${ac_cv_search_pow+set}" = set; then @@ -12990,30 +13000,6 @@ if test "$ac_res" != no; then fi -## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ -## configure options for xdvik - -# Check whether --with-xdvi-x-toolkit was given. -if test "${with_xdvi_x_toolkit+set}" = set; then - withval=$with_xdvi_x_toolkit; -fi - - -case $with_xdvi_x_toolkit in - next | nextaw | neXtaw) val=neXtaw ;; - xaw3d) val=xaw3d ;; - "" | x | xa | xaw) val=xaw ;; - y | ye | yes) val=yes ;; - m | mo | mot | moti | motif) val=motif ;; - *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument - \`$with_xdvi_x_toolkit'; using xaw." >&5 -$as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument - \`$with_xdvi_x_toolkit'; using xaw." >&2;} - val=xaw ;; -esac - -with_xdvi_x_toolkit=$val - # Check whether --with-ps was given. if test "${with_ps+set}" = set; then @@ -18499,14 +18485,14 @@ 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; } +{ $as_echo "$as_me:$LINENO: checking if linker supports multiple definitions and for required flags" >&5 +$as_echo_n "checking if linker supports multiple definitions and for required flags... " >&6; } if test "${xdvi_cv_linker_multiple_defns+set}" = set; then $as_echo_n "(cached) " >&6 else - xdvi_save_LDFLAGS=$LDFLAGS - LDFLAGS="-Xlinker --allow-multiple-definition" - cat >conftest.$ac_ext <<_ACEOF + xdvi_ld_save_LDFLAGS=$LDFLAGS + LDFLAGS="-Xlinker --allow-multiple-definition" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18542,40 +18528,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - xdvi_cv_linker_multiple_defns=yes + xdvi_cv_linker_multiple_defns=$LDFLAGS else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - xdvi_cv_linker_multiple_defns=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$xdvi_save_LDFLAGS -fi -{ $as_echo "$as_me:$LINENO: result: $xdvi_cv_linker_multiple_defns" >&5 -$as_echo "$xdvi_cv_linker_multiple_defns" >&6; } + xdvi_ld_save_LIBS=$LIBS + xdvi_ld_save_CFLAGS=$CFLAGS + xdvi_ld_save_CPPFLAGS=$CPPFLAGS -x_linker_options="" -case $xdvi_cv_linker_multiple_defns in - yes) x_linker_options="-Xlinker --allow-multiple-definition" ;; - "by default") : ;; - *) { $as_echo "$as_me:$LINENO: checking whether linker supports multiple definitions" >&5 -$as_echo_n "checking whether linker supports multiple definitions... " >&6; } - - xdvi_ld_save_LIBS=$LIBS - xdvi_ld_save_CFLAGS=$CFLAGS - xdvi_ld_save_CPPFLAGS=$CPPFLAGS - xdvi_ld_save_LDFLAGS=$LDFLAGS + LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS" + CFLAGS="$X_CFLAGS $CFLAGS" + CPPFLAGS="$X_CFLAGS $CPPFLAGS" + LDFLAGS="$X_LIBS $xdvi_ld_save_LDFLAGS" - LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS" - CFLAGS="$X_CFLAGS $CFLAGS" - CPPFLAGS="$X_CFLAGS $CPPFLAGS" - LDFLAGS="$X_LIBS $LDFLAGS" - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18583,15 +18550,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <X11/Intrinsic.h> - XtIntervalId XtAppAddTimeOut(XtAppContext app, - unsigned long interval, - XtTimerCallbackProc proc, - XtPointer closure) - { - (void)app; (void)interval; (void)proc; (void)closure; - return (XtIntervalId)0; - } - + XtIntervalId XtAppAddTimeOut(XtAppContext app, + unsigned long interval, + XtTimerCallbackProc proc, + XtPointer closure) + { + (void)app; (void)interval; (void)proc; (void)closure; + return (XtIntervalId)0; + } int main () { @@ -18621,35 +18587,39 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - xdvi_cv_linker_multiple_defns="by default" + xdvi_cv_linker_multiple_defns="none required" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + xdvi_cv_linker_multiple_defns=unsupported 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_ld_save_LIBS - CFLAGS=$xdvi_ld_save_CFLAGS - CPPFLAGS=$xdvi_ld_save_CPPFLAGS - LDFLAGS=$xdvi_ld_save_LDFLAGS - - { $as_echo "$as_me:$LINENO: result: $xdvi_cv_linker_multiple_defns" >&5 -$as_echo "$xdvi_cv_linker_multiple_defns" >&6; } ;; -esac + LIBS=$xdvi_ld_save_LIBS + CFLAGS=$xdvi_ld_save_CFLAGS + CPPFLAGS=$xdvi_ld_save_CPPFLAGS +fi -if test "x$xdvi_cv_linker_multiple_defns" != xno; then +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$xdvi_ld_save_LDFLAGS +fi +{ $as_echo "$as_me:$LINENO: result: $xdvi_cv_linker_multiple_defns" >&5 +$as_echo "$xdvi_cv_linker_multiple_defns" >&6; } +x_linker_options="" +case $xdvi_cv_linker_multiple_defns in + "none required") cat >>confdefs.h <<\_ACEOF #define LD_ALLOWS_MULTIPLE_DEFINITIONS 1 _ACEOF - -else - { $as_echo "$as_me:$LINENO: WARNING: Linker does not allow multiple definitions. + ;; + unsupported) { $as_echo "$as_me:$LINENO: WARNING: Linker does not allow multiple definitions. ***************************************************************** * Warning: Your linker does not allow multiple definitions. * * This does not make xdvik unusable, but it will cause problems * @@ -18664,8 +18634,14 @@ $as_echo "$as_me: WARNING: Linker does not allow multiple definitions. * with event handling: Some widgets, e.g. the print log window, * * tooltips, statusline messages and hyperlink location markers * * will not be updated until the mouse is moved. * - *****************************************************************" >&2;} -fi + *****************************************************************" >&2;} ;; + *) x_linker_options=$xdvi_cv_linker_multiple_defns + cat >>confdefs.h <<\_ACEOF +#define LD_ALLOWS_MULTIPLE_DEFINITIONS 1 +_ACEOF + ;; +esac + @@ -19021,10 +18997,8 @@ fi - - for ac_func in mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr \ - fchdir getcwd getpwnam getuid getpwuid iconv nl_langinfo \ + fchdir getcwd getpwnam getuid getpwuid \ lstat ftruncate snprintf vsnprintf realpath do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -19132,9 +19106,7 @@ done - - -for ac_header in netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h iconv.h langinfo.h +for ac_header in netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.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 @@ -19285,13 +19257,228 @@ fi done -xdvi_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $X_CFLAGS" +# Checks for iconv +# Check whether --with-iconv-include was given. +if test "${with_iconv_include+set}" = set; then + withval=$with_iconv_include; +fi +# Check whether --with-iconv-libdir was given. +if test "${with_iconv_libdir+set}" = set; then + withval=$with_iconv_libdir; +fi +case $with_iconv_include in + yes | no | "") iconv_includes= ;; + *) iconv_includes="-I$with_iconv_include" ;; +esac +case $with_iconv_libdir in + yes | no | "") iconv_libpath= ;; + *) iconv_libpath="-L$with_iconv_libdir" ;; +esac -for ac_header in X11/Intrinsic.h X11/Xosdefs.h X11/xpm.h Xm/XpmP.h +xdvi_iconv_save_CPPFLAGS=$CPPFLAGS +xdvi_iconv_save_LDFLAGS=$LDFLAGS +xdvi_iconv_save_LIBS=$LIBS +CPPFLAGS="$iconv_includes $CPPFLAGS" +LDFLAGS="$iconv_libpath $LDFLAGS" +# Check if -liconv or -lrecode is needed for iconv() +{ $as_echo "$as_me:$LINENO: checking for library containing iconv" >&5 +$as_echo_n "checking for library containing iconv... " >&6; } +if test "${ac_cv_search_iconv+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char iconv (); +int +main () +{ +return iconv (); + ; + return 0; +} +_ACEOF +for ac_lib in '' iconv recode; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_iconv=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_iconv+set}" = set; then + break +fi +done +if test "${ac_cv_search_iconv+set}" = set; then + : +else + ac_cv_search_iconv=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_iconv" >&5 +$as_echo "$ac_cv_search_iconv" >&6; } +ac_res=$ac_cv_search_iconv +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +case $ac_cv_search_iconv in + no | "none required") : ;; + *) iconv_libs="-l$ac_cv_search_iconv" ;; +esac + + +for ac_func in iconv +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; 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. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + 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 + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=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 +ac_res=`eval 'as_val=${'$as_ac_var'} + $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_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +for ac_header in iconv.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 @@ -19441,14 +19628,10 @@ 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 +if test "x$ac_cv_func_iconv:$ac_cv_header_iconv_h" = xyes:yes; then + { $as_echo "$as_me:$LINENO: checking for iconv input type" >&5 +$as_echo_n "checking for iconv input type... " >&6; } +if test "${xdvi_cv_iconv_char_pptr_type+set}" = set; then $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -19457,11 +19640,32 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef HAVE_X11_INTRINSIC_H -# include <X11/Intrinsic.h> + +/* iconv() definitions may differ depending on following macros ... */ +#ifdef __hpux +/* On HP-UX 10.10 B and 20.10, compiling with _XOPEN_SOURCE + ..._EXTENDED + * leads to poll() not realizing that a file descriptor is writable in psgs.c. + */ +# define _HPUX_SOURCE 1 +#else +# ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE 600 +# endif +# define _XOPEN_SOURCE_EXTENDED 1 +# define __EXTENSIONS__ 1 /* needed to get struct timeval on SunOS 5.5 */ +# define _SVID_SOURCE 1 /* needed to get S_IFLNK in glibc */ +# define _BSD_SOURCE 1 /* needed to get F_SETOWN in glibc-2.1.3 */ #endif -#include <$ac_header> +#include <iconv.h> + +int +main () +{ +extern size_t iconv(iconv_t, char **, size_t *, char**, size_t*); + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -19481,114 +19685,97 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + xdvi_cv_iconv_char_pptr_type='char **' else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + xdvi_cv_iconv_char_pptr_type='const char **' 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 +{ $as_echo "$as_me:$LINENO: result: $xdvi_cv_iconv_char_pptr_type" >&5 +$as_echo "$xdvi_cv_iconv_char_pptr_type" >&6; } +cat >>confdefs.h <<_ACEOF +#define ICONV_CHAR_PPTR_TYPE $xdvi_cv_iconv_char_pptr_type +_ACEOF -CPPFLAGS=$xdvi_save_CPPFLAGS -# Check whether --enable-magick was given. -if test "${enable_magick+set}" = set; then - enableval=$enable_magick; fi +CPPFLAGS=$xdvi_iconv_save_CPPFLAGS +LDFLAGS=$xdvi_iconv_save_LDFLAGS +LIBS=$xdvi_iconv_save_LIBS -if test "x$enable_magick" = xyes; then - { $as_echo "$as_me:$LINENO: checking for ImageMagick version" >&5 -$as_echo_n "checking for ImageMagick version... " >&6; } - if MAGICK_VER=`Magick-config --version 2>/dev/null`; then - { $as_echo "$as_me:$LINENO: result: $MAGICK_VER" >&5 -$as_echo "$MAGICK_VER" >&6; } - set dummy `echo $MAGICK_VER | sed -e 's/\./ /g'` - MAGICK_VER_MAJOR=$2 - MAGICK_VER_MINOR=$3 - 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`" - MAGICK_LD="`Magick-config --libs` `Magick-config --ldflags`" - { $as_echo "$as_me:$LINENO: ImageMagick support enabled" >&5 -$as_echo "$as_me: ImageMagick support enabled" >&6;} - X_CFLAGS="$X_CFLAGS $MAGICK_CPP" - X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGICK_LD" -cat >>confdefs.h <<\_ACEOF -#define MAGICK 1 -_ACEOF - else - { $as_echo "$as_me:$LINENO: ImageMagick version too old - disabled" >&5 -$as_echo "$as_me: ImageMagick version too old - disabled" >&6;} - fi - else - { $as_echo "$as_me:$LINENO: result: cannot run 'Magick-config' - ImageMagick support disabled" >&5 -$as_echo "cannot run 'Magick-config' - ImageMagick support disabled" >&6; } - fi -fi -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 +# Checks for langinfo + +for ac_func in nl_langinfo +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; 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. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -#include <X11/X.h> -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/Xos.h> +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -#include <X11/Xfuncs.h> -#include <X11/Intrinsic.h> -#include <X11/Xaw/Form.h> +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif int main () { - - +return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -19597,174 +19784,62 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - xdvi_have_xaw=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - xdvi_have_xaw=no + eval "$as_ac_var=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 +ac_res=`eval 'as_val=${'$as_ac_var'} + $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_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -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 +fi +done - { $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 + +for ac_header in langinfo.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $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. */ - -#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; -} +$ac_includes_default +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -19784,33 +19859,114 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - xdvi_old_xaw=no + ac_header_compiler=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - xdvi_old_xaw=yes - + ac_header_compiler=no 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; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_OLD_XAW 1 +# 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 - { $as_echo "$as_me:$LINENO: result: current" >&5 -$as_echo "current" >&6; } + 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 -{ $as_echo "$as_me:$LINENO: checking if nl_langinfo(CODESET) is working" >&5 +if test "x$ac_cv_func_nl_langinfo:$ac_cv_header_langinfo_h" = xyes:yes; then + { $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 @@ -19865,7 +20021,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 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 + if test "x$xdvi_cv_nl_langinfo_codeset" = xyes; then cat >>confdefs.h <<\_ACEOF #define HAVE_WORKING_NL_LANGINFO_CODESET 1 @@ -19873,53 +20029,50 @@ _ACEOF fi +fi -if test -n "$x_libraries"; then - XLFLAG="-L$x_libraries" -else - XLFLAG= -fi +xdvi_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $X_CFLAGS" -if test -z "$x_ext_lib"; then # allow envvar override - { $as_echo "$as_me:$LINENO: checking for XpQueryVersion in -lXp" >&5 -$as_echo_n "checking for XpQueryVersion in -lXp... " >&6; } -if test "${ac_cv_lib_Xp_XpQueryVersion+set}" = set; then + + + +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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXp -lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" + # 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. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XpQueryVersion (); -int -main () -{ -return XpQueryVersion (); - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -19928,69 +20081,144 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_Xp_XpQueryVersion=yes + } && 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_cv_lib_Xp_XpQueryVersion=no + ac_header_compiler=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpQueryVersion" >&5 -$as_echo "$ac_cv_lib_Xp_XpQueryVersion" >&6; } -if test "x$ac_cv_lib_Xp_XpQueryVersion" = x""yes; then - x_ext_lib_with_Xp='-lXp -lXext' + +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; } - { $as_echo "$as_me:$LINENO: checking for XextCreateExtension in -lXext" >&5 -$as_echo_n "checking for XextCreateExtension in -lXext... " >&6; } -if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then +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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" +#ifdef HAVE_X11_INTRINSIC_H +# include <X11/Intrinsic.h> #endif -char XextCreateExtension (); -int -main () -{ -return XextCreateExtension (); - ; - return 0; -} + +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -19999,36 +20227,76 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_Xext_XextCreateExtension=yes + } && 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 - ac_cv_lib_Xext_XextCreateExtension=no + eval "$as_ac_Header=no" fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 -$as_echo "$ac_cv_lib_Xext_XextCreateExtension" >&6; } -if test "x$ac_cv_lib_Xext_XextCreateExtension" = x""yes; then - x_ext_lib='-lXext' +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 + +# Check whether --enable-magick was given. +if test "${enable_magick+set}" = set; then + enableval=$enable_magick; fi +if test "x$enable_magick" = xyes; then + { $as_echo "$as_me:$LINENO: checking for ImageMagick version" >&5 +$as_echo_n "checking for ImageMagick version... " >&6; } + if MAGICK_VER=`Magick-config --version 2>/dev/null`; then + { $as_echo "$as_me:$LINENO: result: $MAGICK_VER" >&5 +$as_echo "$MAGICK_VER" >&6; } + set dummy `echo $MAGICK_VER | sed -e 's/\./ /g'` + MAGICK_VER_MAJOR=$2 + MAGICK_VER_MINOR=$3 + 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`" + MAGICK_LD="`Magick-config --libs` `Magick-config --ldflags`" + { $as_echo "$as_me:$LINENO: ImageMagick support enabled" >&5 +$as_echo "$as_me: ImageMagick support enabled" >&6;} + X_CFLAGS="$X_CFLAGS $MAGICK_CPP" + X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGICK_LD" +cat >>confdefs.h <<\_ACEOF +#define MAGICK 1 +_ACEOF + else + { $as_echo "$as_me:$LINENO: ImageMagick version too old - disabled" >&5 +$as_echo "$as_me: ImageMagick version too old - disabled" >&6;} + fi + else + { $as_echo "$as_me:$LINENO: result: cannot run 'Magick-config' - ImageMagick support disabled" >&5 +$as_echo "cannot run 'Magick-config' - ImageMagick support disabled" >&6; } + fi +fi +# Check whether -lXpm can be used xpm_includes= xpm_libraries= @@ -20038,12 +20306,6 @@ 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" @@ -20055,23 +20317,23 @@ if test "${with_xpm_libraries+set}" = set; then withval=$with_xpm_libraries; xpm_libraries="$withval" fi +if test "x$with_xpm" = xno; then + xpm_includes=no + xpm_libraries=no +fi { $as_echo "$as_me:$LINENO: checking for Xpm" >&5 $as_echo_n "checking for Xpm... " >&6; } # +# Check the headers. # -# 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 +if test "x$xpm_includes" = x; then + if test "${xdvi_cv_xpm_includes+set}" = set; then $as_echo_n "(cached) " >&6 else - -xdvi_xpm_save_LIBS="$LIBS" -xdvi_xpm_save_CFLAGS="$CFLAGS" -xdvi_xpm_save_CPPFLAGS="$CPPFLAGS" -xdvi_xpm_save_LDFLAGS="$LDFLAGS" + 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" @@ -20084,9 +20346,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <X11/xpm.h> - int main () { @@ -20113,16 +20373,14 @@ $as_echo "$ac_try_echo") >&5 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" - + # 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. + # X11/xpm.h is not in the standard search path. + xdvi_cv_xpm_includes=no # Locate it and put its directory in `xpm_includes' # # /usr/include/Motif* are used on HP-UX (Motif). @@ -20140,28 +20398,27 @@ for dir in "$x_includes" "${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" + xdvi_cv_xpm_includes=$dir break elif test -f "$dir/xpm.h"; then - xdvi_cv_xpm_includes="$dir" + 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" - +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 +# +xpm_includes=$xdvi_cv_xpm_includes +fi if test "x$xpm_includes" != x; then if test "x$xpm_includes" = xdefault; then @@ -20182,27 +20439,22 @@ _ACEOF fi fi - # +# Check the libraries. # -# Now for the libraries. -# -if test "$xpm_libraries" = ""; then -if test "${xdvi_cv_xpm_libraries+set}" = set; then +if test "x$xpm_libraries" = x; 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" + 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. @@ -20212,10 +20464,8 @@ _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 () { @@ -20245,19 +20495,16 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - -# libxpm.a is in the standard search path. -xdvi_cv_xpm_libraries="default" - + # 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. + # libXpm.a is not in the standard search path. + xdvi_cv_xpm_libraries=no # 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). @@ -20272,22 +20519,20 @@ for dir in "$x_libraries" "${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" + 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" - +LIBS=$xdvi_xpm_save_LIBS +CFLAGS=$xdvi_xpm_save_CFLAGS +CPPFLAGS=$xdvi_xpm_save_CPPFLAGS +LDFLAGS=$xdvi_xpm_save_LDFLAGS fi # @@ -20299,22 +20544,18 @@ fi 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" + 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 + 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. @@ -20324,9 +20565,10 @@ 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 +x_xpm_libs="-lXpm" +# +xpm_libraries_result=$xpm_libraries +if test "x$xpm_libraries_result" = xdefault ; then xpm_libraries_result="in default path" elif test "$xpm_libraries_result" = no || test "x$xpm_libraries_result" = "x"; then xpm_libraries_result="(none)" @@ -20337,6 +20579,8 @@ _ACEOF x_xpm_libs="" fi +# +xpm_includes_result=$xpm_includes 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 @@ -20346,82 +20590,57 @@ _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; +if test -n "$x_libraries"; then + XLFLAG="-L$x_libraries" +else + XLFLAG= 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 +if test -z "$x_ext_lib"; then # allow envvar override + { $as_echo "$as_me:$LINENO: checking for XpQueryVersion in -lXp" >&5 +$as_echo_n "checking for XpQueryVersion in -lXp... " >&6; } +if test "${ac_cv_lib_Xp_XpQueryVersion+set}" = set; then $as_echo_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" -# + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXp -lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" 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> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XpQueryVersion (); int main () { -int a; +return XpQueryVersion (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20430,87 +20649,56 @@ $as_echo "$ac_try_echo") >&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= - + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_Xp_XpQueryVersion=yes 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 + ac_cv_lib_Xp_XpQueryVersion=no fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - -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" - +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpQueryVersion" >&5 +$as_echo "$ac_cv_lib_Xp_XpQueryVersion" >&6; } +if test "x$ac_cv_lib_Xp_XpQueryVersion" = x""yes; then + x_ext_lib_with_Xp='-lXp -lXext' +else + : 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 "$as_me:$LINENO: checking for XextCreateExtension in -lXext" >&5 +$as_echo_n "checking for XextCreateExtension in -lXext... " >&6; } +if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then $as_echo_n "(cached) " >&6 else - -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_check_lib_save_LIBS=$LIBS +LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" 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> +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XextCreateExtension (); int main () { -XtToolkitInitialize(); +return XextCreateExtension (); ; return 0; } @@ -20536,132 +20724,76 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - -# libXm.a is in the standard search path. -xdvi_cv_motif_libdir= - + ac_cv_lib_Xext_XextCreateExtension=yes 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 - + ac_cv_lib_Xext_XextCreateExtension=no fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -# -LIBS="$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" +LIBS=$ac_check_lib_save_LIBS 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" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +$as_echo "$ac_cv_lib_Xext_XextCreateExtension" >&6; } +if test "x$ac_cv_lib_Xext_XextCreateExtension" = x""yes; then + x_ext_lib='-lXext' +else + : 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 +case $with_xdvi_x_toolkit in + next | nextaw | neXtaw) val=neXtaw ;; + xaw3d) val=xaw3d ;; + "" | x | xa | xaw) val=xaw ;; + y | ye | yes) val=yes ;; + m | mo | mot | moti | motif) val=motif ;; + *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument + \`$with_xdvi_x_toolkit'; using xaw." >&5 +$as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument + \`$with_xdvi_x_toolkit'; using xaw." >&2;} + val=xaw ;; +esac - 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 +with_xdvi_x_toolkit=$val + +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" +else + # Check for Xaw + save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +{ $as_echo "$as_me:$LINENO: checking for Xaw library" >&5 +$as_echo_n "checking for Xaw library... " >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/Xos.h> - #include <X11/Intrinsic.h> - #include <Xm/Xm.h> +#include <X11/X.h> +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/Xos.h> + +#include <X11/Xfuncs.h> +#include <X11/Intrinsic.h> +#include <X11/Xaw/Form.h> int main () { -const char *p = LesstifVERSION_STRING; ; return 0; @@ -20685,79 +20817,94 @@ $as_echo "$ac_try_echo") >&5 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;} - + xdvi_have_xaw=yes 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; } - + xdvi_have_xaw=no 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: result: $xdvi_have_xaw" >&5 +$as_echo "$xdvi_have_xaw" >&6; } # -{ $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" +if test "x$xdvi_have_xaw" = xyes; then + +save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" -cat >conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:$LINENO: checking for SimpleClassPart.extension" >&5 +$as_echo_n "checking for SimpleClassPart.extension... " >&6; } +if test "${ac_cv_member_SimpleClassPart_extension+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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/IntrinsicP.h> +#include <X11/StringDefs.h> #include <X11/Intrinsic.h> - -#include <X11/Xaw/Reports.h> +#include <X11/StringDefs.h> +#include <X11/Xos.h> +#include <X11/Xaw/SimpleP.h> int main () { +static SimpleClassPart ac_aggr; +if (ac_aggr.extension) +return 0; + ; + 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 + ac_cv_member_SimpleClassPart_extension=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + 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/SimpleP.h> + +int +main () +{ +static SimpleClassPart ac_aggr; +if (sizeof ac_aggr.extension) +return 0; ; return 0; } @@ -20780,36 +20927,59 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - xdvi_use_xaw_panner=yes + ac_cv_member_SimpleClassPart_extension=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - xdvi_use_xaw_panner=no + ac_cv_member_SimpleClassPart_extension=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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; } +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_SimpleClassPart_extension" >&5 +$as_echo "$ac_cv_member_SimpleClassPart_extension" >&6; } +if test "x$ac_cv_member_SimpleClassPart_extension" = x""yes; then + : +else cat >>confdefs.h <<\_ACEOF -#define USE_XAW_PANNER 1 +#define HAVE_OLD_XAW 1 _ACEOF -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi - ;; - *) -default_toolkit="Xaw" + +CPPFLAGS=$save_CPPFLAGS + +fi +CPPFLAGS=$save_CPPFLAGS + + if test "x$with_xdvi_x_toolkit" != xxaw; then + # Requested motiv (possibly with xaw as fallback) + if test "x$with_xdvi_x_toolkit" = xmotif; then + default_toolkit=none + else + default_toolkit=Xaw + fi { $as_echo "$as_me:$LINENO: checking for Motif" >&5 $as_echo_n "checking for Motif... " >&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 + # # Search the include files. # @@ -21153,12 +21323,7 @@ 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" + with_xdvi_x_toolkit="xaw" fi # @@ -21233,278 +21398,27 @@ 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. -if test "${with_iconv_libdir+set}" = set; then - withval=$with_iconv_libdir; if test XXX"$withval" != "XXX"; then - iconv_libpath="-L$withval" - iconv_libs="-lrecode" -else - iconv_libpath= - iconv_libs= -fi -else - -iconv_libpath= -iconv_libs= -{ $as_echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5 -$as_echo_n "checking for iconv_open in -liconv... " >&6; } -if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char iconv_open (); -int -main () -{ -return iconv_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_iconv_iconv_open=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_iconv_iconv_open=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5 -$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; } -if test "x$ac_cv_lib_iconv_iconv_open" = x""yes; then - iconv_libs=-liconv -else - { $as_echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5 -$as_echo_n "checking for libiconv_open in -liconv... " >&6; } -if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char libiconv_open (); -int -main () -{ -return libiconv_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_iconv_libiconv_open=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_iconv_libiconv_open=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5 -$as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; } -if test "x$ac_cv_lib_iconv_libiconv_open" = x""yes; then - iconv_libs=-liconv -else - iconv_libs= -fi - -fi - -fi -if test "x$iconv_libs" != x; then + fi + if test "x$with_xdvi_x_toolkit" = xxaw; then + # Requested or defaulted to Xaw + if test "x$xdvi_have_xaw" = xno; then + { { $as_echo "$as_me:$LINENO: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&5 +$as_echo "$as_me: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&2;} + { (exit 1); exit 1; }; } + fi + prog_extension="xaw" + x_tool_libs="-lXaw" cat >>confdefs.h <<\_ACEOF -#define HAVE_ICONV 1 -_ACEOF - -fi - - - - -# Check whether --with-iconv-include was given. -if test "${with_iconv_include+set}" = set; then - withval=$with_iconv_include; if test XXX"$withval" != "XXX"; then - iconv_includes="-I$withval" -fi -else - -iconv_includes= - -fi - - - -{ $as_echo "$as_me:$LINENO: checking for iconv input type" >&5 -$as_echo_n "checking for iconv input type... " >&6; } -if test "${xdvi_cv_iconv_char_pptr_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - xdvi_iconv_save_cppflags=$CPPFLAGS - xdvi_iconv_save_libs=$LIBS - CPPFLAGS="$CPPFLAGS $iconv_includes" - LIBS="$LIBS $iconv_libpath $iconv_libs" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* iconv() definitions may differ depending on following macros ... */ -#ifdef __hpux -/* On HP-UX 10.10 B and 20.10, compiling with _XOPEN_SOURCE + ..._EXTENDED - * leads to poll() not realizing that a file descriptor is writable in psgs.c. - */ -# define _HPUX_SOURCE 1 -#else -# ifndef _XOPEN_SOURCE -# define _XOPEN_SOURCE 600 -# endif -# define _XOPEN_SOURCE_EXTENDED 1 -# define __EXTENSIONS__ 1 /* needed to get struct timeval on SunOS 5.5 */ -# define _SVID_SOURCE 1 /* needed to get S_IFLNK in glibc */ -# define _BSD_SOURCE 1 /* needed to get F_SETOWN in glibc-2.1.3 */ -#endif - -#include <iconv.h> - -int -main () -{ -extern size_t iconv(iconv_t, char **, size_t *, char**, size_t*); - ; - return 0; -} +#define XAW 1 _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_cv_iconv_char_pptr_type='char **' -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - xdvi_cv_iconv_char_pptr_type='const char **' -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$xdvi_iconv_save_cppflags - LIBS=$xdvi_iconv_save_libs + fi fi -{ $as_echo "$as_me:$LINENO: result: $xdvi_cv_iconv_char_pptr_type" >&5 -$as_echo "$xdvi_cv_iconv_char_pptr_type" >&6; } - -cat >>confdefs.h <<_ACEOF -#define ICONV_CHAR_PPTR_TYPE $xdvi_cv_iconv_char_pptr_type -_ACEOF +final_exec_name="xdvi-$prog_extension" +program_transform_name="'s,xdvi-bin,$final_exec_name,'" @@ -23341,13 +23255,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -PS_DEF="$PS_DEF $MAGICK_DEF" -if echo "$PS_DEF" | grep MAGICK >/dev/null; then - { $as_echo "$as_me:$LINENO: adding ImageMagick libraries" >&5 -$as_echo "$as_me: adding ImageMagick libraries" >&6;} - X_EXTRA_LIBS="$X_EXTRA_LIBS `Magick-config --libs`" -fi - XDVIK_VERSION=22.84.15 @@ -23356,7 +23263,7 @@ XDVIK_VERSION=22.84.15 subdirs="$subdirs squeeze" -ac_config_files="$ac_config_files Makefile gui/Makefile tests/Makefile" +ac_config_files="$ac_config_files Makefile tests/Makefile" ac_config_files="$ac_config_files xdvi:xdvi-sh.in" @@ -24251,7 +24158,6 @@ 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" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "xdvi") CONFIG_FILES="$CONFIG_FILES xdvi:xdvi-sh.in" ;; diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac index 976701c7b01..cebd5476c2f 100644 --- a/Build/source/texk/xdvik/configure.ac +++ b/Build/source/texk/xdvik/configure.ac @@ -16,19 +16,10 @@ AC_CONFIG_MACRO_DIR([../../m4]) dnl Common code for all programs using libkpathsea. KPSE_COMMON([xdvik]) -AC_SEARCH_LIBS([pow], [m]) - +dnl Include additional code for xdvik. m4_include([ac/xdvik.ac]) -AS_CASE([$with_xdvi_x_toolkit], - [next | nextaw | neXtaw], [val=neXtaw], - [xaw3d], [val=xaw3d], - ["" | x | xa | xaw], [val=xaw], - [y | ye | yes], [val=yes], - [m | mo | mot | moti | motif], [val=motif], - [AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument - `$with_xdvi_x_toolkit'; using xaw.]) - val=xaw]) -with_xdvi_x_toolkit=$val + +AC_SEARCH_LIBS([pow], [m]) AC_ARG_WITH([ps], AS_HELP_STRING([--with-ps=PS], @@ -122,12 +113,18 @@ AC_CHECK_TYPE([ptrdiff_t], [], [Define to `long' if <sys/types.h> does not define.])]) AC_CHECK_FUNCS([mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr \ - fchdir getcwd getpwnam getuid getpwuid iconv nl_langinfo \ + fchdir getcwd getpwnam getuid getpwuid \ lstat ftruncate snprintf vsnprintf realpath]) dnl <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c. dnl regex.h is needed for regexp support in DVI search. -AC_CHECK_HEADERS([netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h iconv.h langinfo.h]) +AC_CHECK_HEADERS([netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h]) + +# Checks for iconv +XDVI_CHECK_ICONV + +# Checks for langinfo +XDVI_CHECK_LANGINFO dnl Check X11 headers. xdvi_save_CPPFLAGS=$CPPFLAGS @@ -171,19 +168,8 @@ if test "x$enable_magick" = xyes; then fi fi -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.])]) +# Check whether -lXpm can be used +XDVI_FIND_XPM dnl ####### @@ -210,23 +196,45 @@ AC_SUBST([x_ext_lib]) 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])]) + [next | nextaw | neXtaw], [val=neXtaw], + [xaw3d], [val=xaw3d], + ["" | x | xa | xaw], [val=xaw], + [y | ye | yes], [val=yes], + [m | mo | mot | moti | motif], [val=motif], + [AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument + `$with_xdvi_x_toolkit'; using xaw.]) + val=xaw]) +with_xdvi_x_toolkit=$val + +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" +else + # Check for Xaw + XDVI_CHECK_XAW + if test "x$with_xdvi_x_toolkit" != xxaw; then + # Requested motiv (possibly with xaw as fallback) + if test "x$with_xdvi_x_toolkit" = xmotif; then + default_toolkit=none + else + default_toolkit=Xaw + fi + XDVI_FIND_MOTIF + fi + if test "x$with_xdvi_x_toolkit" = xxaw; then + # Requested or defaulted to Xaw + if test "x$xdvi_have_xaw" = xno; then + AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.]) + fi + prog_extension="xaw" + x_tool_libs="-lXaw" + AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.]) + fi +fi AC_SUBST([x_tool_libs]) final_exec_name="xdvi-$prog_extension" program_transform_name="'s,xdvi-bin,$final_exec_name,'" @@ -234,49 +242,6 @@ AC_SUBST([final_exec_name]) dnl ####### -dnl AC_SUBST(x_tool_libs) ?? - -dnl ####### - -dnl Only relevant if AC_CHECK_FUNCS([... iconv ...]) above failed -AC_ARG_WITH([iconv-libdir], - AS_HELP_STRING([--with-iconv-libdir=DIR], - [Specify the location of iconv library (librecode.so)]), -[if test XXX"$withval" != "XXX"; then - iconv_libpath="-L$withval" - iconv_libs="-lrecode" -else - iconv_libpath= - iconv_libs= -fi], [ -dnl On non-Linux systems, -liconv is needed. Check for both iconv_open and libiconv_open. -iconv_libpath= -iconv_libs= -AC_CHECK_LIB([iconv], [iconv_open], - [iconv_libs=-liconv], - [AC_CHECK_LIB([iconv], [libiconv_open], - [iconv_libs=-liconv], - [iconv_libs=])])]) -if test "x$iconv_libs" != x; then - AC_DEFINE([HAVE_ICONV], 1, [Define if you have the iconv function.]) -fi -AC_SUBST([iconv_libpath]) -AC_SUBST([iconv_libs]) - -AC_ARG_WITH([iconv-include], - AS_HELP_STRING([--with-iconv-include=DIR], - [Specify the location of iconv header (iconv.h)]), -[if test XXX"$withval" != "XXX"; then - iconv_includes="-I$withval" -fi],[ -iconv_includes= -]) -AC_SUBST([iconv_includes]) - -XDVI_ICONV_CHAR_PPTR_TYPE - -dnl ####### - dnl $program_transform_name replacement dnl ####### @@ -330,19 +295,12 @@ AC_ARG_WITH([default-ps2pdf-path], AC_DEFINE_UNQUOTED([DEFAULT_PS2PDF_PATH], ["$with_default_ps2pdf_path"], [Define to point to the default command to use for printing (optional).]) -dnl ImageMagick support (requires at the moment MAGICK_DEF from the environment) -PS_DEF="$PS_DEF $MAGICK_DEF" -if echo "$PS_DEF" | grep MAGICK >/dev/null; then - AC_MSG_NOTICE([adding ImageMagick libraries]) - X_EXTRA_LIBS="$X_EXTRA_LIBS `Magick-config --libs`" -fi - XDVIK_VERSION=xdvik_version AC_SUBST([XDVIK_VERSION]) AC_CONFIG_SUBDIRS([squeeze]) -AC_CONFIG_FILES([Makefile gui/Makefile tests/Makefile]) +AC_CONFIG_FILES([Makefile tests/Makefile]) AC_CONFIG_FILES([xdvi:xdvi-sh.in], [chmod +x xdvi]) diff --git a/Build/source/texk/xdvik/gui/Makefile.am b/Build/source/texk/xdvik/gui/Makefile.am deleted file mode 100644 index 9f0fea5ad5c..00000000000 --- a/Build/source/texk/xdvik/gui/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Makefile.am for the TeX Live subdirectory texk/xdvik/gui/ -## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -## You may freely use, modify and/or distribute this file. -## -include ../common.am - -INCLUDES = -I$(top_srcdir) $(common_includes) - -noinst_LIBRARIES = libgui.a - -libgui_a_SOURCES = \ - ../print-internal.c \ - 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 deleted file mode 100644 index 123d5d71995..00000000000 --- a/Build/source/texk/xdvik/gui/Makefile.in +++ /dev/null @@ -1,619 +0,0 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -# @configure_input@ - -# 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. - -# 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. - -@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@ -DIST_COMMON = $(srcdir)/../common.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -subdir = gui -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(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 = print-internal.$(OBJEXT) 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@ -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_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_ext_lib = @x_ext_lib@ -x_linker_options = @x_linker_options@ -x_tool_libs = @x_tool_libs@ -x_xmu_lib = @x_xmu_lib@ -x_xpm_libs = @x_xpm_libs@ -x_cppflags = $(X_CFLAGS) $(iconv_includes) -common_includes = $(PS_DEF) $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) $(x_cppflags) -x_ldflags = $(X_LIBS) $(x_linker_options) $(iconv_libpath) -x_extra_libs = $(X_EXTRA_LIBS) $(iconv_libs) -xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \ - $(X_PRE_LIBS) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) -common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) -common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) -libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_builddir}/psheader.c -libgui_dependencies = ${top_srcdir}/*.h ${top_srcdir}/print-internal.c ${top_srcdir}/gui/*.[ch] -INCLUDES = -I$(top_srcdir) $(common_includes) -noinst_LIBRARIES = libgui.a -libgui_a_SOURCES = \ - ../print-internal.c \ - 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 $(srcdir)/../common.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-internal.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 $@ $< - -print-internal.o: ../print-internal.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-internal.o -MD -MP -MF $(DEPDIR)/print-internal.Tpo -c -o print-internal.o `test -f '../print-internal.c' || echo '$(srcdir)/'`../print-internal.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-internal.Tpo $(DEPDIR)/print-internal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../print-internal.c' object='print-internal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-internal.o `test -f '../print-internal.c' || echo '$(srcdir)/'`../print-internal.c - -print-internal.obj: ../print-internal.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-internal.obj -MD -MP -MF $(DEPDIR)/print-internal.Tpo -c -o print-internal.obj `if test -f '../print-internal.c'; then $(CYGPATH_W) '../print-internal.c'; else $(CYGPATH_W) '$(srcdir)/../print-internal.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-internal.Tpo $(DEPDIR)/print-internal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../print-internal.c' object='print-internal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-internal.obj `if test -f '../print-internal.c'; then $(CYGPATH_W) '../print-internal.c'; else $(CYGPATH_W) '$(srcdir)/../print-internal.c'; fi` - -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 - - -@KPATHSEA_RULE@ -@T1LIB_RULE@ -# 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/xdvi-check-iconv.m4 b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 new file mode 100644 index 00000000000..7ffd12bb3d3 --- /dev/null +++ b/Build/source/texk/xdvik/m4/xdvi-check-iconv.m4 @@ -0,0 +1,85 @@ +# Autoconf macros for xdvik. +# Copyright (C) 2004 - 2009 Stefan Ulrich <xdvi-core@lists.sourceforge.net> +# ???? or maybe earlier Copyright by Paul Vojta ?? +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# XDVI_CHECK_ICONV +# ---------------- +# Check for iconv(), <iconv.h>, and for type of iconv() input argument. +AC_DEFUN([XDVI_CHECK_ICONV], +[AC_ARG_WITH([iconv-include], + AS_HELP_STRING([--with-iconv-include=DIR], + [Specify the location of <iconv.h> header]))[]dnl +AC_ARG_WITH([iconv-libdir], + AS_HELP_STRING([--with-iconv-libdir=DIR], + [Specify the location of iconv (-liconv or -lrecode) library]))[]dnl +AS_CASE([$with_iconv_include], + [yes | no | ""], [iconv_includes=], + [iconv_includes="-I$with_iconv_include"]) +AS_CASE([$with_iconv_libdir], + [yes | no | ""], [iconv_libpath=], + [iconv_libpath="-L$with_iconv_libdir"]) +xdvi_iconv_save_CPPFLAGS=$CPPFLAGS +xdvi_iconv_save_LDFLAGS=$LDFLAGS +xdvi_iconv_save_LIBS=$LIBS +CPPFLAGS="$iconv_includes $CPPFLAGS" +LDFLAGS="$iconv_libpath $LDFLAGS" +# Check if -liconv or -lrecode is needed for iconv() +AC_SEARCH_LIBS([iconv], [iconv recode]) +AS_CASE([$ac_cv_search_iconv], + [no | "none required"], [:], + [iconv_libs="-l$ac_cv_search_iconv"]) +AC_CHECK_FUNCS([iconv]) +AC_CHECK_HEADERS([iconv.h]) +if test "x$ac_cv_func_iconv:$ac_cv_header_iconv_h" = xyes:yes; then + XDVI_ICONV_CHAR_PPTR_TYPE +fi +CPPFLAGS=$xdvi_iconv_save_CPPFLAGS +LDFLAGS=$xdvi_iconv_save_LDFLAGS +LIBS=$xdvi_iconv_save_LIBS +AC_SUBST([iconv_includes]) +AC_SUBST([iconv_libpath]) +AC_SUBST([iconv_libs]) +]) # XDVI_CHECK_ICONV + +# XDVI_ICONV_CHAR_PPTR_TYPE +# ------------------------- +# Check whether iconv takes a 'const char **' or a 'char **' input argument. +# According to IEEE 1003.1, `char **' is correct, but e.g. librecode +# uses `const char **'. +# Inspired by Autoconf's AC_FUNC_SELECT_ARGTYPES we do this without the need +# to run a test program or to use C++. +m4_define([XDVI_ICONV_CHAR_PPTR_TYPE], +[AC_CACHE_CHECK([for iconv input type], + [xdvi_cv_iconv_char_pptr_type], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +/* iconv() definitions may differ depending on following macros ... */ +#ifdef __hpux +/* On HP-UX 10.10 B and 20.10, compiling with _XOPEN_SOURCE + ..._EXTENDED + * leads to poll() not realizing that a file descriptor is writable in psgs.c. + */ +# define _HPUX_SOURCE 1 +#else +# ifndef _XOPEN_SOURCE +# define _XOPEN_SOURCE 600 +# endif +# define _XOPEN_SOURCE_EXTENDED 1 +# define __EXTENSIONS__ 1 /* needed to get struct timeval on SunOS 5.5 */ +# define _SVID_SOURCE 1 /* needed to get S_IFLNK in glibc */ +# define _BSD_SOURCE 1 /* needed to get F_SETOWN in glibc-2.1.3 */ +#endif + +#include <iconv.h> + ]], + [[extern size_t iconv(iconv_t, char **, size_t *, char**, size_t*);]])], + [xdvi_cv_iconv_char_pptr_type='char **'], + [xdvi_cv_iconv_char_pptr_type='const char **'])]) +AC_DEFINE_UNQUOTED([ICONV_CHAR_PPTR_TYPE], [$xdvi_cv_iconv_char_pptr_type], + [Define the type of the iconv input string (char ** or const char **)]) +]) # XDVI_ICONV_CHAR_PPTR_TYPE diff --git a/Build/source/texk/xdvik/m4/xdvi-check-langinfo.m4 b/Build/source/texk/xdvik/m4/xdvi-check-langinfo.m4 new file mode 100644 index 00000000000..34de37e1d42 --- /dev/null +++ b/Build/source/texk/xdvik/m4/xdvi-check-langinfo.m4 @@ -0,0 +1,29 @@ +# Autoconf macros for xdvik. +# Copyright (C) ???? - 2009 Paul Vojta <xdvi-core@lists.sourceforge.net> +# and/or +# Copyright (C) ???? - 2009 Stefan Ulrich <xdvi-core@lists.sourceforge.net> +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# XDVI_CHECK_LANGINFO +# ------------------- +# Check for nl_langinfo(), <langinfo.h>, and if nl_langinfo(CODESET) +# is working. +AC_DEFUN([XDVI_CHECK_LANGINFO], +[AC_CHECK_FUNCS([nl_langinfo]) +AC_CHECK_HEADERS([langinfo.h]) +if test "x$ac_cv_func_nl_langinfo:$ac_cv_header_langinfo_h" = xyes:yes; then + 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.])]) +fi +]) # XDVI_CHECK_LANGINFO diff --git a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 new file mode 100644 index 00000000000..fe56f6616f9 --- /dev/null +++ b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 @@ -0,0 +1,59 @@ +# Autoconf macros for xdvik. +# Copyright (C) 2003 - 2009 Stefan Ulrich <xdvi-core@lists.sourceforge.net> +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +## + +dnl ### Check for Xaw version +AC_DEFUN([XDVI_CHECK_XAW], [_XDVI_CHECK_XAW_HEADERS]) + +# _XDVI_CHECK_XAW_HEADERS +# ----------------------- +# Check for Xaw headers. +m4_define([_XDVI_CHECK_XAW_HEADERS], +[save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +AC_MSG_CHECKING([for Xaw library]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <X11/X.h> +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/Xos.h> + +#include <X11/Xfuncs.h> +#include <X11/Intrinsic.h> +#include <X11/Xaw/Form.h>]])], + [xdvi_have_xaw=yes], + [xdvi_have_xaw=no]) +AC_MSG_RESULT([$xdvi_have_xaw]) +# +if test "x$xdvi_have_xaw" = xyes; then + _XDVI_CHECK_XAW_VERSION +fi +CPPFLAGS=$save_CPPFLAGS +]) # _XDVI_CHECK_XAW_HEADERS + +# _XDVI_CHECK_XAW_VERSION +# ----------------------- +# Check Xaw version. +m4_define([_XDVI_CHECK_XAW_VERSION], +[ +save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +AC_CHECK_MEMBER([SimpleClassPart.extension], + [], + [AC_DEFINE([HAVE_OLD_XAW], 1, + [Define if you have an old version of the Xaw library])], + [[ +#include <X11/IntrinsicP.h> +#include <X11/StringDefs.h> +#include <X11/Intrinsic.h> +#include <X11/StringDefs.h> +#include <X11/Xos.h> +#include <X11/Xaw/SimpleP.h>]]) +CPPFLAGS=$save_CPPFLAGS +]) # _XDVI_CHECK_XAW_VERSION diff --git a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 index 0130bb095d0..c9d2d136e69 100644 --- a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 @@ -1,14 +1,26 @@ +# Autoconf macros for xdvik. +# Copyright (C) 2001 - 2009 Marcin Dalecki <xdvi-core@lists.sourceforge.net> +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + dnl ### Check for Motif libraries and headers dnl Put Motif include directory in motif_include, dnl put Motif library directory in motif_libdir, dnl and add appropriate flags to X_CFLAGS and X_LIBS. -dnl If $1 is not `none', use Xaw as default toolkit if Motif isn't found. +dnl If default_toolkit 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) +[AC_REQUIRE([AC_PATH_XTRA]) +AC_MSG_CHECKING([for Motif]) # +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])) # # Search the include files. # @@ -197,9 +209,7 @@ if test "$motif_include_result" != "" && test "$motif_libdir_result" != ""; then ]) else AC_MSG_RESULT([not found, using Xaw]) - prog_extension="xaw" - AC_DEFINE(XAW) - x_tool_libs="-lXaw" + with_xdvi_x_toolkit="xaw" fi # diff --git a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 index 0d22282782d..fce20f51464 100644 --- a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 @@ -1,59 +1,131 @@ -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 +# Autoconf macros for xdvik. +# Copyright (C) 2001 - 2009 Marcin Dalecki <xdvi-core@lists.sourceforge.net> +# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# +# This file is free software; the copyright holders +# give unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# XDVI_FIND_XPM +# ------------- +# Put Xpm include directory in xpm_includes, +# put Xpm library directory in xpm_libraries, +# define x_xpm_libs, +# and add appropriate flags to X_CFLAGS and X_LIBS. AC_DEFUN([XDVI_FIND_XPM], -[ -AC_REQUIRE([AC_PATH_XTRA]) +[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)]) + AS_HELP_STRING([--without-xpm], + [Do not use the Xpm library (will disable the toolbar)]))[]dnl +AC_ARG_WITH([xpm-includes], + AS_HELP_STRING([--with-xpm-include=DIR], + [Specify the location of Xpm include files]), + [xpm_includes="$withval"]) +AC_ARG_WITH([xpm-libraries], + AS_HELP_STRING([--with-xpm-libdir=DIR], + [Specify the location of Xpm libraries]), + [xpm_libraries="$withval"]) dnl Treat --without-xpm like dnl --without-xpm-includes --without-xpm-libraries. -if test "$with_xpm" = "no" +if test "x$with_xpm" = xno; then + xpm_includes=no + xpm_libraries=no +fi +AC_MSG_CHECKING([for Xpm]) +# +# Check the headers. +# +if test "x$xpm_includes" = x; then + _XDVI_FIND_XPM_INCLUDES +fi +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 +# +# Check the libraries. +# +if test "x$xpm_libraries" = x; then + _XDVI_FIND_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 -xpm_includes=no -xpm_libraries=no + X_CFLAGS="-I$xpm_includes $X_CFLAGS" 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) # +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 # -# 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. +# Now check the results of headers and libraries and set USE_XPM to 0 +# if one of them hadn't been found. # -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" +AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library]) +x_xpm_libs="-lXpm" +# +xpm_libraries_result=$xpm_libraries +if test "x$xpm_libraries_result" = xdefault ; then + xpm_libraries_result="in default path" +elif test "$xpm_libraries_result" = no || test "x$xpm_libraries_result" = "x"; then + xpm_libraries_result="(none)" + AC_DEFINE([USE_XPM], 0) + x_xpm_libs="" +fi +AC_SUBST([x_xpm_libs]) +# +xpm_includes_result=$xpm_includes +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_MSG_RESULT([libraries $xpm_libraries_result, headers $xpm_includes_result]) +]) # XDVI_FIND_XPM + +# _XDVI_FIND_XPM_INCLUDES +# ----------------------- +# Search the Xpm include files. +# They 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. +m4_define([_XDVI_FIND_XPM_INCLUDES], +[AC_CACHE_VAL([xdvi_cv_xpm_includes], +[xdvi_xpm_save_LIBS=$LIBS +xdvi_xpm_save_CFLAGS=$CFLAGS +xdvi_xpm_save_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. +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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. + xdvi_cv_xpm_includes=no # Locate it and put its directory in `xpm_includes' # # /usr/include/Motif* are used on HP-UX (Motif). @@ -71,71 +143,48 @@ for dir in "$x_includes" "${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" + xdvi_cv_xpm_includes=$dir break elif test -f "$dir/xpm.h"; then - xdvi_cv_xpm_includes="$dir" + 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 - +done]) # +LIBS=$xdvi_xpm_save_LIBS +CFLAGS=$xdvi_xpm_save_CFLAGS +CPPFLAGS=$xdvi_xpm_save_CPPFLAGS +LDFLAGS=$xdvi_xpm_save_LDFLAGS]) # -# 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" +xpm_includes=$xdvi_cv_xpm_includes +]) # _XDVI_FIND_XPM_INCLUDES + +# _XDVI_FIND_XPM_LIBRARIES +# ------------------------ +# Search the Xpm library. +m4_define([_XDVI_FIND_XPM_LIBRARIES], +[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. +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#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. + xdvi_cv_xpm_libraries=no # 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). @@ -150,68 +199,14 @@ for dir in "$x_libraries" "${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" + 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" -]) +done]) # -xpm_libraries="$xdvi_cv_xpm_libraries" -fi +LIBS=$xdvi_xpm_save_LIBS +CFLAGS=$xdvi_xpm_save_CFLAGS +CPPFLAGS=$xdvi_xpm_save_CPPFLAGS +LDFLAGS=$xdvi_xpm_save_LDFLAGS]) # -# 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 - - - +xpm_libraries="$xdvi_cv_xpm_libraries"]) # _XDVI_FIND_XPM_LIBRARIES diff --git a/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 b/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 deleted file mode 100644 index 4c6e74e760f..00000000000 --- a/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 +++ /dev/null @@ -1,52 +0,0 @@ -# Autoconf macros for xdvik. -# Copyright (C) 2004 - 2009 Stefan Ulrich <xdvi-core@lists.sourceforge.net> -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -# -# This file is free software; the copyright holders -# give unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# XDVI_ICONV_CHAR_PPTR_TYPE -# ------------------------- -# Check whether iconv takes a 'const char **' or a 'char **' input argument. -# According to IEEE 1003.1, `char **' is correct, but e.g. librecode -# uses `const char **'. -# Inspired by Autoconf's AC_FUNC_SELECT_ARGTYPES we do this without the need -# to run a test program or to use C++. -AC_DEFUN([XDVI_ICONV_CHAR_PPTR_TYPE], -[AC_CACHE_CHECK([for iconv input type], - [xdvi_cv_iconv_char_pptr_type], - [ - xdvi_iconv_save_cppflags=$CPPFLAGS - xdvi_iconv_save_libs=$LIBS - CPPFLAGS="$CPPFLAGS $iconv_includes" - LIBS="$LIBS $iconv_libpath $iconv_libs" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -/* iconv() definitions may differ depending on following macros ... */ -#ifdef __hpux -/* On HP-UX 10.10 B and 20.10, compiling with _XOPEN_SOURCE + ..._EXTENDED - * leads to poll() not realizing that a file descriptor is writable in psgs.c. - */ -# define _HPUX_SOURCE 1 -#else -# ifndef _XOPEN_SOURCE -# define _XOPEN_SOURCE 600 -# endif -# define _XOPEN_SOURCE_EXTENDED 1 -# define __EXTENSIONS__ 1 /* needed to get struct timeval on SunOS 5.5 */ -# define _SVID_SOURCE 1 /* needed to get S_IFLNK in glibc */ -# define _BSD_SOURCE 1 /* needed to get F_SETOWN in glibc-2.1.3 */ -#endif - -#include <iconv.h> - ]], - [[extern size_t iconv(iconv_t, char **, size_t *, char**, size_t*);]])], - [xdvi_cv_iconv_char_pptr_type='char **'], - [xdvi_cv_iconv_char_pptr_type='const char **']) - CPPFLAGS=$xdvi_iconv_save_cppflags - LIBS=$xdvi_iconv_save_libs]) -AC_DEFINE_UNQUOTED([ICONV_CHAR_PPTR_TYPE], [$xdvi_cv_iconv_char_pptr_type], - [Define the type of the iconv input string (char ** or const char **)]) -]) # XDVI_ICONV_CHAR_PPTR_TYPE diff --git a/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 b/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 index 5c67903a2b9..01f373cdcd6 100644 --- a/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-linker-multiple-defns.m4 @@ -14,64 +14,57 @@ # and if it doesn't, don't define LD_ALLOWS_MULTIPLE_DEFINITIONS. AC_DEFUN([XDVI_LINKER_MULTIPLE_DEFNS], -[AC_CACHE_CHECK([whether linker supports the --allow-multiple-definition flag], - [xdvi_cv_linker_multiple_defns], - [xdvi_save_LDFLAGS=$LDFLAGS - LDFLAGS="-Xlinker --allow-multiple-definition" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], - [[void foo(void);]])], - [xdvi_cv_linker_multiple_defns=yes], - [xdvi_cv_linker_multiple_defns=no]) - LDFLAGS=$xdvi_save_LDFLAGS]) +[AC_CACHE_CHECK( + [if linker supports multiple definitions and for required flags], + [xdvi_cv_linker_multiple_defns], + [xdvi_ld_save_LDFLAGS=$LDFLAGS + LDFLAGS="-Xlinker --allow-multiple-definition" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include <stdio.h>]], [[void foo(void);]])], + [xdvi_cv_linker_multiple_defns=$LDFLAGS], + [xdvi_ld_save_LIBS=$LIBS + xdvi_ld_save_CFLAGS=$CFLAGS + xdvi_ld_save_CPPFLAGS=$CPPFLAGS -x_linker_options="" -AS_CASE([$xdvi_cv_linker_multiple_defns], - [yes], [x_linker_options="-Xlinker --allow-multiple-definition"], - ["by default"], [], - [AC_MSG_CHECKING([whether linker supports multiple definitions]) - - xdvi_ld_save_LIBS=$LIBS - xdvi_ld_save_CFLAGS=$CFLAGS - xdvi_ld_save_CPPFLAGS=$CPPFLAGS - xdvi_ld_save_LDFLAGS=$LDFLAGS + LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS" + CFLAGS="$X_CFLAGS $CFLAGS" + CPPFLAGS="$X_CFLAGS $CPPFLAGS" + LDFLAGS="$X_LIBS $xdvi_ld_save_LDFLAGS" - LIBS="$X_PRE_LIBS -lXt -lX11 $X_EXTRA_LIBS $LIBS" - CFLAGS="$X_CFLAGS $CFLAGS" - CPPFLAGS="$X_CFLAGS $CPPFLAGS" - LDFLAGS="$X_LIBS $LDFLAGS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <X11/Intrinsic.h> - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Intrinsic.h> + XtIntervalId XtAppAddTimeOut(XtAppContext app, + unsigned long interval, + XtTimerCallbackProc proc, + XtPointer closure) + { + (void)app; (void)interval; (void)proc; (void)closure; + return (XtIntervalId)0; + }]], + [[XtIntervalId i = 0; XtRemoveTimeOut(i);]])], + [xdvi_cv_linker_multiple_defns="none required"], + [xdvi_cv_linker_multiple_defns=unsupported]) - XtIntervalId XtAppAddTimeOut(XtAppContext app, - unsigned long interval, - XtTimerCallbackProc proc, - XtPointer closure) - { - (void)app; (void)interval; (void)proc; (void)closure; - return (XtIntervalId)0; - } - ]], - [[XtIntervalId i = 0; XtRemoveTimeOut(i);]])], - [xdvi_cv_linker_multiple_defns="by default"]) + LIBS=$xdvi_ld_save_LIBS + CFLAGS=$xdvi_ld_save_CFLAGS + CPPFLAGS=$xdvi_ld_save_CPPFLAGS]) + LDFLAGS=$xdvi_ld_save_LDFLAGS]) - LIBS=$xdvi_ld_save_LIBS - CFLAGS=$xdvi_ld_save_CFLAGS - CPPFLAGS=$xdvi_ld_save_CPPFLAGS - LDFLAGS=$xdvi_ld_save_LDFLAGS - - AC_MSG_RESULT([$xdvi_cv_linker_multiple_defns])]) -if test "x$xdvi_cv_linker_multiple_defns" != xno; then - AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS], 1, - [Define if your system allows multiple definitions of functions.]) -else - AC_MSG_WARN([Linker does not allow multiple definitions. +x_linker_options="" +AS_CASE([$xdvi_cv_linker_multiple_defns], + ["none required"], [AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS], 1, + [Define if your system allows multiple definitions of functions.])], + [unsupported], [AC_MSG_WARN([Linker does not allow multiple definitions. ***************************************************************** * Warning: Your linker does not allow multiple definitions. * * This does not make xdvik unusable, but it will cause problems * * with event handling: Some widgets, e.g. the print log window, * * tooltips, statusline messages and hyperlink location markers * * will not be updated until the mouse is moved. * - *****************************************************************]) -fi + *****************************************************************])], + [x_linker_options=$xdvi_cv_linker_multiple_defns + AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS], 1)]) AC_SUBST([x_linker_options]) ]) # XDVI_LINKER_MULTIPLE_DEFNS diff --git a/Build/source/texk/xdvik/m4/xdvi-old-xaw.m4 b/Build/source/texk/xdvik/m4/xdvi-old-xaw.m4 deleted file mode 100644 index c64a37daf2c..00000000000 --- a/Build/source/texk/xdvik/m4/xdvi-old-xaw.m4 +++ /dev/null @@ -1,170 +0,0 @@ -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/tests/Makefile.am b/Build/source/texk/xdvik/tests/Makefile.am index 4fb76fddb7b..10b95abf1d8 100644 --- a/Build/source/texk/xdvik/tests/Makefile.am +++ b/Build/source/texk/xdvik/tests/Makefile.am @@ -19,16 +19,13 @@ run_tests_SOURCES = \ test_string_utils.c \ test_util.c -run_tests_DEPENDENCIES = ../libxdvi.a ../gui/libgui.a $(common_dependencies) +run_tests_DEPENDENCIES = ../libxdvi.a $(common_dependencies) -LDADD = ../libxdvi.a ../gui/libgui.a $(common_ldadd) +LDADD = ../libxdvi.a $(common_ldadd) ../libxdvi.a: $(libxdvi_dependencies) cd .. && $(MAKE) $(AM_MAKEFLAGS) libxdvi.a -../gui/libgui.a: $(libgui_dependencies) - cd ../gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a - ## Not used ## EXTRA_DIST = test1.c diff --git a/Build/source/texk/xdvik/tests/Makefile.in b/Build/source/texk/xdvik/tests/Makefile.in index 3a89b4313ed..18ef5f13d31 100644 --- a/Build/source/texk/xdvik/tests/Makefile.in +++ b/Build/source/texk/xdvik/tests/Makefile.in @@ -38,15 +38,16 @@ subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \ $(top_srcdir)/m4/xdvi-cc-concat.m4 \ + $(top_srcdir)/m4/xdvi-check-iconv.m4 \ + $(top_srcdir)/m4/xdvi-check-langinfo.m4 \ + $(top_srcdir)/m4/xdvi-check-xaw.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 \ @@ -239,8 +240,7 @@ xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \ $(X_PRE_LIBS) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) -libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_builddir}/psheader.c -libgui_dependencies = ${top_srcdir}/*.h ${top_srcdir}/print-internal.c ${top_srcdir}/gui/*.[ch] +libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes) TESTS = $(check_PROGRAMS) run_tests_SOURCES = \ @@ -251,8 +251,8 @@ run_tests_SOURCES = \ test_string_utils.c \ test_util.c -run_tests_DEPENDENCIES = ../libxdvi.a ../gui/libgui.a $(common_dependencies) -LDADD = ../libxdvi.a ../gui/libgui.a $(common_ldadd) +run_tests_DEPENDENCIES = ../libxdvi.a $(common_dependencies) +LDADD = ../libxdvi.a $(common_ldadd) EXTRA_DIST = test1.c all: all-am @@ -607,9 +607,6 @@ uninstall-am: ../libxdvi.a: $(libxdvi_dependencies) cd .. && $(MAKE) $(AM_MAKEFLAGS) libxdvi.a - -../gui/libgui.a: $(libgui_dependencies) - cd ../gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a # 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: |