diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-21 09:44:45 +0000 |
| commit | b77e78eaf3652b80e78ae80f770bd3bdf721363d (patch) | |
| tree | d3c67296e30534c63d02c5bb5e5790b1d9150cd0 /Build | |
| parent | ad04e2284cbf8d1a4b268636c7451f89d29c4d0a (diff) | |
new build system: mode texk/xdvik and general update
git-svn-id: svn://tug.org/texlive/trunk@12771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
184 files changed, 4763 insertions, 8339 deletions
diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am index 999731182c7..63a51a56999 100644 --- a/Build/source/Makefile.am +++ b/Build/source/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live top-level +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I m4 diff --git a/Build/source/README.cross b/Build/source/README.cross index 9e9da1389c1..b6230026104 100644 --- a/Build/source/README.cross +++ b/Build/source/README.cross @@ -1,3 +1,6 @@ +Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +You may freely use, modify and/or distribute this file. + Cross compiling =============== diff --git a/Build/source/ac/withenable.ac b/Build/source/ac/withenable.ac index fd7510220bf..47d8078a245 100644 --- a/Build/source/ac/withenable.ac +++ b/Build/source/ac/withenable.ac @@ -1 +1,4 @@ -## ac/withenable.ac +## ac/withenable.ac: configure.ac fragment for the TeX Live top-level +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. diff --git a/Build/source/build-aux/README.TL b/Build/source/build-aux/README.TL index 214e7d0249f..d3f076d4021 100644 --- a/Build/source/build-aux/README.TL +++ b/Build/source/build-aux/README.TL @@ -1,3 +1,6 @@ +Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +You may freely use, modify and/or distribute this file. + This directory is the central repository for auxiliary files, mostly shell scripts, needed to build the teTeX / TeX Live (TL) tree. They are used by all packages `owned' by the TL tree, i.e., maintained as part of TL. diff --git a/Build/source/configure b/Build/source/configure index 26555875d46..34d2a5cf59f 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for TeX Live 2009-04-08. +# Generated by GNU Autoconf 2.63 for TeX Live 2009-04-20. # # Report bugs to <tex-k@tug.org>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2009-04-08' -PACKAGE_STRING='TeX Live 2009-04-08' +PACKAGE_VERSION='2009-04-20' +PACKAGE_STRING='TeX Live 2009-04-20' PACKAGE_BUGREPORT='tex-k@tug.org' ac_unique_file="m4/kpse-pkgs.m4" @@ -1007,6 +1007,7 @@ enable_mktextex_default with_system_teckit with_teckit_includes with_teckit_libdir +with_graphite with_system_graphite with_graphite_includes with_graphite_libdir @@ -1605,7 +1606,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live 2009-04-08 to adapt to many kinds of systems. +\`configure' configures TeX Live 2009-04-20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1679,7 +1680,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2009-04-08:";; + short | recursive ) echo "Configuration of TeX Live 2009-04-20:";; esac cat <<\_ACEOF @@ -1806,6 +1807,7 @@ Optional Packages: teckit headers installed in DIR --with-teckit-libdir=DIR teckit library installed in DIR + --without-graphite build XeTeX without graphite support --with-system-graphite use installed graphite headers and library --with-graphite-includes=DIR graphite headers installed in DIR @@ -1923,7 +1925,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2009-04-08 +TeX Live configure 2009-04-20 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1937,7 +1939,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live $as_me 2009-04-08, which was +It was created by TeX Live $as_me 2009-04-20, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2452,11 +2454,11 @@ if test "x$enable_multiplatform" = xyes; then fi -## ac/withenable.ac +## ac/withenable.ac: configure.ac fragment for the TeX Live top-level -## utils/ac/withenable.ac +## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ -## utils/dialog/ac/withenable.ac +## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. if test "${enable_dialog+set}" = set; then @@ -2471,7 +2473,7 @@ $as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;} esac -## utils/pdfopen/ac/withenable.ac +## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then @@ -2486,7 +2488,7 @@ $as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;} esac -## utils/ps2eps/ac/withenable.ac +## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/ ## configure options and TL libraries required for ps2eps # Check whether --enable-ps2eps was given. if test "${enable_ps2eps+set}" = set; then @@ -2501,7 +2503,7 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;} esac -## utils/psutils/ac/withenable.ac +## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/ ## configure options and TL libraries required for psutils # Check whether --enable-psutils was given. if test "${enable_psutils+set}" = set; then @@ -2516,7 +2518,7 @@ $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;} esac -## utils/t1utils/ac/withenable.ac +## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/ ## configure options and TL libraries required for t1utils # Check whether --enable-t1utils was given. if test "${enable_t1utils+set}" = set; then @@ -2531,7 +2533,7 @@ $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;} esac -## utils/tpic2pdftex/ac/withenable.ac +## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/ ## configure options and TL libraries required for tpic2pdftex # Check whether --enable-tpic2pdftex was given. if test "${enable_tpic2pdftex+set}" = set; then @@ -2546,7 +2548,7 @@ $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;} esac -## utils/vlna/ac/withenable.ac +## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/ ## configure options and TL libraries required for vlna # Check whether --enable-vlna was given. if test "${enable_vlna+set}" = set; then @@ -2562,7 +2564,7 @@ esac -## texk/ac/withenable.ac +## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options and TL libraries required for web2c @@ -2734,7 +2736,7 @@ if test "${enable_web_progs+set}" = set; then fi -## texk/afm2pl/ac/withenable.ac +## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/ ## configure options and TL libraries required for afm2pl # Check whether --enable-afm2pl was given. if test "${enable_afm2pl+set}" = set; then @@ -2753,7 +2755,7 @@ test "x$enable_afm2pl" = xno || { } -## texk/bibtex8/ac/withenable.ac +## texk/bibtex8/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex8/ ## configure options and TL libraries required for bibtex8 # Check whether --enable-bibtex8 was given. if test "${enable_bibtex8+set}" = set; then @@ -2772,7 +2774,7 @@ test "x$enable_bibtex8" = xno || { } -## texk/cjkutils/ac/withenable.ac +## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/ ## configure options and TL libraries required for cjkutils # Check whether --enable-cjkutils was given. if test "${enable_cjkutils+set}" = set; then @@ -2791,7 +2793,7 @@ test "x$enable_cjkutils" = xno || { } -## texk/detex/ac/withenable.ac +## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/ ## configure options and TL libraries required for detex # Check whether --enable-detex was given. if test "${enable_detex+set}" = set; then @@ -2810,7 +2812,7 @@ test "x$enable_detex" = xno || { } -## texk/devnag/ac/withenable.ac +## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/ ## configure options and TL libraries required for devnag # Check whether --enable-devnag was given. if test "${enable_devnag+set}" = set; then @@ -2825,7 +2827,7 @@ $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;} esac -## texk/dtl/ac/withenable.ac +## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/ ## configure options and TL libraries required for dtl # Check whether --enable-dtl was given. if test "${enable_dtl+set}" = set; then @@ -2844,7 +2846,7 @@ test "x$enable_dtl" = xno || { } -## texk/dvi2tty/ac/withenable.ac +## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/ ## configure options and TL libraries required for dvi2tty # Check whether --enable-dvi2tty was given. if test "${enable_dvi2tty+set}" = set; then @@ -2863,7 +2865,7 @@ test "x$enable_dvi2tty" = xno || { } -## texk/dvidvi/ac/withenable.ac +## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/ ## configure options and TL libraries required for dvidvi # Check whether --enable-dvidvi was given. if test "${enable_dvidvi+set}" = set; then @@ -2882,7 +2884,7 @@ test "x$enable_dvidvi" = xno || { } -## texk/dviljk/ac/withenable.ac +## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/ ## configure options and TL libraries required for dviljk # Check whether --enable-dviljk was given. if test "${enable_dviljk+set}" = set; then @@ -2901,7 +2903,7 @@ test "x$enable_dviljk" = xno || { } -## texk/dvipdfm/ac/withenable.ac +## texk/dvipdfm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm/ ## configure options and TL libraries required for dvipdfm # Check whether --enable-dvipdfm was given. if test "${enable_dvipdfm+set}" = set; then @@ -2921,7 +2923,7 @@ test "x$enable_dvipdfm" = xno || { } -## texk/dvipdfmx/ac/withenable.ac +## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/ ## configure options and TL libraries required for dvipdfmx # Check whether --enable-dvipdfmx was given. if test "${enable_dvipdfmx+set}" = set; then @@ -2941,7 +2943,7 @@ test "x$enable_dvipdfmx" = xno || { } -## texk/dvipng/ac/withenable.ac +## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options and TL libraries required for dvipng # Check whether --enable-dvipng was given. if test "${enable_dvipng+set}" = set; then @@ -2962,7 +2964,7 @@ test "x$enable_dvipng" = xno || { need_t1lib=yes } -## texk/dvipng/ac/dvipng.ac +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options for dvipng # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then @@ -2982,7 +2984,7 @@ fi -## texk/dvipos/ac/withenable.ac +## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/ ## configure options and TL libraries required for dvipos # Check whether --enable-dvipos was given. if test "${enable_dvipos+set}" = set; then @@ -3001,7 +3003,7 @@ test "x$enable_dvipos" = xno || { } -## texk/dvipsk/ac/withenable.ac +## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/ ## configure options and TL libraries required for dvipsk # Check whether --enable-dvipsk was given. if test "${enable_dvipsk+set}" = set; then @@ -3020,7 +3022,7 @@ test "x$enable_dvipsk" = xno || { } -## texk/gsftopk/ac/withenable.ac +## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/ ## configure options and TL libraries required for gsftopk # Check whether --enable-gsftopk was given. if test "${enable_gsftopk+set}" = set; then @@ -3039,7 +3041,7 @@ test "x$enable_gsftopk" = xno || { } -## texk/lacheck/ac/withenable.ac +## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/ ## configure options and TL libraries required for lacheck # Check whether --enable-lacheck was given. if test "${enable_lacheck+set}" = set; then @@ -3058,7 +3060,7 @@ test "x$enable_lacheck" = xno || { } -## texk/lcdf-typetools/ac/withenable.ac +## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options and TL libraries required for lcdf-typetools # Check whether --enable-lcdf-typetools was given. if test "${enable_lcdf_typetools+set}" = set; then @@ -3076,7 +3078,7 @@ test "x$enable_lcdf_typetools" = xno || { need_kpathsea=yes } -## texk/lcdf-typetools/ac/lcdf-typetools.ac +## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then @@ -3138,7 +3140,7 @@ fi -## texk/makeindexk/ac/withenable.ac +## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/ ## configure options and TL libraries required for makeindexk # Check whether --enable-makeindexk was given. if test "${enable_makeindexk+set}" = set; then @@ -3157,7 +3159,7 @@ test "x$enable_makeindexk" = xno || { } -## texk/musixflx/ac/withenable.ac +## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ ## configure options and TL libraries required for musixflx # Check whether --enable-musixflx was given. if test "${enable_musixflx+set}" = set; then @@ -3172,7 +3174,7 @@ $as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;} esac -## texk/ps2pkm/ac/withenable.ac +## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ ## configure options and TL libraries required for ps2pkm # Check whether --enable-ps2pkm was given. if test "${enable_ps2pkm+set}" = set; then @@ -3191,7 +3193,7 @@ test "x$enable_ps2pkm" = xno || { } -## texk/seetexk/ac/withenable.ac +## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ ## configure options and TL libraries required for seetexk # Check whether --enable-seetexk was given. if test "${enable_seetexk+set}" = set; then @@ -3210,7 +3212,7 @@ test "x$enable_seetexk" = xno || { } -## texk/tex4htk/ac/withenable.ac +## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/ ## configure options and TL libraries required for tex4htk # Check whether --enable-tex4htk was given. if test "${enable_tex4htk+set}" = set; then @@ -3229,7 +3231,7 @@ test "x$enable_tex4htk" = xno || { } -## texk/ttf2pk/ac/withenable.ac +## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/ ## configure options and TL libraries required for ttf2pk # Check whether --enable-ttf2pk was given. if test "${enable_ttf2pk+set}" = set; then @@ -3249,7 +3251,7 @@ test "x$enable_ttf2pk" = xno || { } -## texk/ttfdump/ac/withenable.ac +## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ ## configure options and TL libraries required for ttfdump # Check whether --enable-ttfdump was given. if test "${enable_ttfdump+set}" = set; then @@ -3268,7 +3270,7 @@ test "x$enable_ttfdump" = xno || { } -## texk/xdv2pdf/ac/withenable.ac +## texk/xdv2pdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdv2pdf/ ## configure options and TL libraries required for xdv2pdf # Check whether --enable-xdv2pdf was given. if test "${enable_xdv2pdf+set}" = set; then @@ -3287,7 +3289,7 @@ test "x$enable_xdv2pdf" = xno || { } -## texk/xdvik/ac/withenable.ac +## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then @@ -3306,7 +3308,7 @@ test "x$enable_xdvik" = xno || { need_t1lib=yes } -## texk/xdvik/ac/xdvik.ac +## 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. @@ -3316,7 +3318,7 @@ fi -## texk/xdvipdfmx/ac/withenable.ac +## texk/xdvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvipdfmx/ ## configure options and TL libraries required for xdvipdfmx # Check whether --enable-xdvipdfmx was given. if test "${enable_xdvipdfmx+set}" = set; then @@ -3337,7 +3339,7 @@ test "x$enable_xdvipdfmx" = xno || { } -## texk/tetex/ac/withenable.ac +## texk/tetex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tetex/ ## configure options and TL libraries required for tetex # Check whether --enable-tetex was given. if test "${enable_tetex+set}" = set; then @@ -3352,7 +3354,7 @@ $as_echo "$as_me: Assuming \`--enable-tetex=$enable_tetex'" >&6;} esac -## texk/texlive/ac/withenable.ac +## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ ## configure options and TL libraries required for texlive # Check whether --enable-texlive was given. if test "${enable_texlive+set}" = set; then @@ -3468,13 +3470,13 @@ case $enable_mktextex_default in esac -## libs/ac/withenable.ac +## libs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/ ## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/ ## configure options and TL libraries required for icu (modified for XeTeX) -## libs/teckit/ac/withenable.ac +## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ ## configure options and TL libraries required for teckit # Check whether --with-system-teckit was given. @@ -3531,7 +3533,15 @@ test "x$need_teckit" = xyes && { } -## libs/graphite/ac/withenable.ac +## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ +## XeTeX can be built without graphite support + +# Check whether --with-graphite was given. +if test "${with_graphite+set}" = set; then + withval=$with_graphite; +fi + +test "x$with_graphite" = xno && need_graphite=no ## configure options and TL libraries required for graphite # Check whether --with-system-graphite was given. @@ -3572,11 +3582,11 @@ $as_echo "$as_me: Using \`graphite' headers and library from TL tree" >&6;} fi -## libs/xpdf/ac/withenable.ac +## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf -## libs/gd/kpse/withenable.ac +## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd # Check whether --with-system-gd was given. @@ -3633,7 +3643,7 @@ test "x$need_gd" = xyes && { } -## libs/freetype2/ac/withenable.ac +## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ ## configure options and TL libraries required for freetype2 # Check whether --with-system-freetype2 was given. @@ -3690,7 +3700,7 @@ test "x$need_freetype2" = xyes && { } -## libs/freetype/ac/withenable.ac +## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ ## configure options and TL libraries required for freetype # Check whether --with-system-freetype was given. @@ -3731,7 +3741,7 @@ $as_echo "$as_me: Using \`freetype' headers and library from TL tree" >&6;} fi -## libs/t1lib/ac/withenable.ac +## libs/t1lib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/ ## configure options and TL libraries required for t1lib # Check whether --with-system-t1lib was given. @@ -3772,11 +3782,11 @@ $as_echo "$as_me: Using \`t1lib' headers and library from TL tree" >&6;} fi -## libs/obsdcompat/ac/withenable.ac +## libs/obsdcompat/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/obsdcompat/ ## configure options and TL libraries required for obsdcompat -## libs/libpng/kpse/withenable.ac +## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ ## configure options and TL libraries required for libpng # Check whether --with-system-libpng was given. @@ -3833,7 +3843,7 @@ test "x$need_libpng" = xyes && { } -## libs/zlib/ac/withenable.ac +## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ ## configure options and TL libraries required for zlib # Check whether --with-system-zlib was given. @@ -5892,13 +5902,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5895: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5905: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5898: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5908: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5901: output\"" >&5) + (eval echo "\"\$as_me:5911: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7104,7 +7114,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7107 "configure"' > conftest.$ac_ext + echo '#line 7117 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8484,7 +8494,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2009-04-08' + VERSION='2009-04-20' cat >>confdefs.h <<_ACEOF @@ -9151,11 +9161,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9154: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9164: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9158: \$? = $ac_status" >&5 + echo "$as_me:9168: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9490,11 +9500,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9493: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9503: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9497: \$? = $ac_status" >&5 + echo "$as_me:9507: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9595,11 +9605,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9598: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9608: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9602: \$? = $ac_status" >&5 + echo "$as_me:9612: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9650,11 +9660,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9653: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9663: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9657: \$? = $ac_status" >&5 + echo "$as_me:9667: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12450,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12453 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12546,7 +12556,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12549 "configure" +#line 12559 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18942,11 +18952,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18945: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18955: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18949: \$? = $ac_status" >&5 + echo "$as_me:18959: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19041,11 +19051,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19044: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19054: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19048: \$? = $ac_status" >&5 + echo "$as_me:19058: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19093,11 +19103,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19096: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19106: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19100: \$? = $ac_status" >&5 + echo "$as_me:19110: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20169,7 +20179,7 @@ fi -## libs/zlib/ac/zlib.ac +## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ ## define required functions and headers from system zlib if test "x$need_zlib:$with_system_zlib" = 'xyes:yes'; then { $as_echo "$as_me:$LINENO: checking requested system \`zlib' library..." >&5 @@ -20435,7 +20445,7 @@ done fi -## libs/libpng/ac/libpng.ac +## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ ## define required functions and headers from system libpng if test "x$need_libpng:$with_system_libpng" = 'xyes:yes'; then { $as_echo "$as_me:$LINENO: checking requested system \`libpng' library..." >&5 @@ -20701,7 +20711,7 @@ done fi -## libs/t1lib/ac/t1lib.ac +## libs/t1lib/ac/t1lib.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/ ## define required functions and headers from system t1lib if test "x$need_t1lib:$with_system_t1lib" = 'xyes:yes'; then { $as_echo "$as_me:$LINENO: checking requested system \`t1lib' library..." >&5 @@ -20968,7 +20978,7 @@ done fi -## libs/freetype/ac/freetype.ac +## libs/freetype/ac/freetype.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ ## define required functions and headers from system freetype if test "x$need_freetype:$with_system_freetype" = 'xyes:yes'; then { $as_echo "$as_me:$LINENO: checking requested system \`freetype' library..." >&5 @@ -21234,7 +21244,7 @@ done fi -## libs/freetype2/ac/freetype2.ac +## libs/freetype2/ac/freetype2.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ ## define required functions and headers from system freetype2 if test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then { $as_echo "$as_me:$LINENO: checking requested system \`freetype2' library..." >&5 @@ -21500,7 +21510,7 @@ done fi -## libs/gd/ac/gd.ac +## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## define required functions and headers from system gd if test "x$need_gd:$with_system_gd" = 'xyes:yes'; then { $as_echo "$as_me:$LINENO: checking requested system \`gd' library..." >&5 @@ -21766,7 +21776,7 @@ done fi -## libs/graphite/ac/graphite.ac +## libs/graphite/ac/graphite.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ ## define required functions and headers from system graphite ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -22042,7 +22052,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -## libs/teckit/ac/teckit.ac +## libs/teckit/ac/teckit.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ ## define required functions and headers from system teckit if test "x$need_teckit:$with_system_teckit" = 'xyes:yes'; then { $as_echo "$as_me:$LINENO: checking requested system \`teckit' library..." >&5 @@ -22581,6 +22591,13 @@ $as_echo "$as_me: error: some requested system libraries failed" >&2;} { (exit 1); exit 1; }; } fi +if test "x$cross_compiling:$enable_xetex" = xyes:yes; then + { { $as_echo "$as_me:$LINENO: error: Sorry, can not cross compile icu libraries required for XeTeX" >&5 +$as_echo "$as_me: error: Sorry, can not cross compile icu libraries required for XeTeX" >&2;} + { (exit 1); exit 1; }; } +fi + + if test "x$need_kpathsea" = xyes && test "x$with_system_kpathsea" != xyes; then build_kpathsea_TRUE= build_kpathsea_FALSE='#' @@ -23095,7 +23112,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live $as_me 2009-04-08, which was +This file was extended by TeX Live $as_me 2009-04-20, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23149,7 +23166,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -TeX Live config.status 2009-04-08 +TeX Live config.status 2009-04-20 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Build/source/configure.ac b/Build/source/configure.ac index fef643c78d1..0920ff6e6d7 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([TeX Live], [2009-04-08], [tex-k@tug.org]) +AC_INIT([TeX Live], [2009-04-20], [tex-k@tug.org]) AC_PREREQ([2.63]) AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -94,6 +94,9 @@ if test "x$syslib_status" = xno; then AC_MSG_ERROR([some requested system libraries failed]) fi +AS_IF([test "x$cross_compiling:$enable_xetex" = xyes:yes], + [AC_MSG_ERROR([Sorry, can not cross compile icu libraries required for XeTeX])]) + AM_CONDITIONAL([build_kpathsea], [test "x$need_kpathsea" = xyes && test "x$with_system_kpathsea" != xyes]) diff --git a/Build/source/libs/Makefile.am b/Build/source/libs/Makefile.am index 1f4bdb8d23a..276e411fa66 100644 --- a/Build/source/libs/Makefile.am +++ b/Build/source/libs/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory libs/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../m4 diff --git a/Build/source/libs/ac/withenable.ac b/Build/source/libs/ac/withenable.ac index a56321ceb75..36b263962bc 100644 --- a/Build/source/libs/ac/withenable.ac +++ b/Build/source/libs/ac/withenable.ac @@ -1 +1,4 @@ -## libs/ac/withenable.ac +## libs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. diff --git a/Build/source/libs/dummy/Makefile.am b/Build/source/libs/dummy/Makefile.am index 257c3fb65a0..3fb6f74a34e 100644 --- a/Build/source/libs/dummy/Makefile.am +++ b/Build/source/libs/dummy/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory libs/dummy/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## noinst_DATA = ../sublibsdir-configure diff --git a/Build/source/libs/dummy/README b/Build/source/libs/dummy/README index fe16d6f99e1..00640c0b4ce 100644 --- a/Build/source/libs/dummy/README +++ b/Build/source/libs/dummy/README @@ -1,3 +1,6 @@ +Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +You may freely use, modify and/or distribute this file. + This directory libs/dummy does not build or install anything. Its purpose is to record the command line used to invoke libs/dummy/configure from libs/configure. This information is then used by libs/Makefile to invoke diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am index 50cb2b7e83f..0dd6397767a 100644 --- a/Build/source/libs/freetype/Makefile.am +++ b/Build/source/libs/freetype/Makefile.am @@ -19,9 +19,7 @@ dist-hook: rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn` if build - noinst_DATA = libttf.a - endif build ft-build/Makefile: @@ -34,7 +32,7 @@ ft-build/Makefile: --includedir=$(abs_builddir) ## Unfortunately the FreeType build system installs the headers after the library; -## get our dependencies right we wait for a second and then touch the library. +## to get our dependencies right we wait for a second and then touch the library. libttf.a: ft-build/Makefile rm -rf ft-install cd ft-build/lib \ diff --git a/Build/source/libs/freetype/ac/freetype.ac b/Build/source/libs/freetype/ac/freetype.ac index 90c43ce4ed3..f5d7e28c131 100644 --- a/Build/source/libs/freetype/ac/freetype.ac +++ b/Build/source/libs/freetype/ac/freetype.ac @@ -1,3 +1,7 @@ -## libs/freetype/ac/freetype.ac +## libs/freetype/ac/freetype.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system freetype KPSE_CHECK_LIB([freetype], [TT_Init_FreeType], [freetype.h]) diff --git a/Build/source/libs/freetype/ac/withenable.ac b/Build/source/libs/freetype/ac/withenable.ac index 55cb676e47a..cd0abc14983 100644 --- a/Build/source/libs/freetype/ac/withenable.ac +++ b/Build/source/libs/freetype/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/freetype/ac/withenable.ac +## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for freetype KPSE_WITH_LIB([freetype]) diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am index 49f9b63ef3a..edfe538a56e 100644 --- a/Build/source/libs/freetype2/Makefile.am +++ b/Build/source/libs/freetype2/Makefile.am @@ -19,9 +19,7 @@ dist-hook: rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn` if build - noinst_DATA = libfreetype.a - endif build ft-build/Makefile: diff --git a/Build/source/libs/freetype2/ac/freetype2.ac b/Build/source/libs/freetype2/ac/freetype2.ac index c52d0078f42..1c69124297f 100644 --- a/Build/source/libs/freetype2/ac/freetype2.ac +++ b/Build/source/libs/freetype2/ac/freetype2.ac @@ -1,3 +1,7 @@ -## libs/freetype2/ac/freetype2.ac +## libs/freetype2/ac/freetype2.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system freetype2 KPSE_CHECK_LIB([freetype2], [FT_Init_FreeType], [ft2build.h]) diff --git a/Build/source/libs/freetype2/ac/withenable.ac b/Build/source/libs/freetype2/ac/withenable.ac index 97d78f86a29..1ac95763640 100644 --- a/Build/source/libs/freetype2/ac/withenable.ac +++ b/Build/source/libs/freetype2/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/freetype2/ac/withenable.ac +## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for freetype2 KPSE_WITH_LIB([freetype2], [zlib], , , [both -IDIR and -IDIR/freetype2]) diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index c972c77881e..5b043bd13a4 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -22,10 +22,9 @@ dist-hook: INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) if build - noinst_LIBRARIES=libgd.a - endif build +EXTRA_LIBRARIES=libgd.a nodist_libgd_a_SOURCES = \ $(GD_TREE)/gd.c \ @@ -72,15 +71,15 @@ BUILT_SOURCES = \ jisx0208.h \ wbmp.h -$(BUILT_SOURCES): stamp-gd - -libgd_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) +$(libgd_a_OBJECTS): $(BUILT_SOURCES) $(ZLIB_DEPEND) $(LIBPNG_DEPEND) ## Rebuild zlib @ZLIB_RULE@ ## Rebuild libpng @LIBPNG_RULE@ +$(BUILT_SOURCES): stamp-gd + stamp-gd: @for file in $(BUILT_SOURCES); do \ test -f $$file || { \ @@ -92,7 +91,3 @@ stamp-gd: distclean-local: rm -f stamp-gd $(BUILT_SOURCES) -## Eventually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index 2d8d22b862e..f9b9ea79940 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -190,9 +190,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(GD_TREE) Makefile.in.orig configure.in.orig +EXTRA_DIST = $(GD_TREE) INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) @build_TRUE@noinst_LIBRARIES = libgd.a +EXTRA_LIBRARIES = libgd.a nodist_libgd_a_SOURCES = \ $(GD_TREE)/gd.c \ $(GD_TREE)/gd_gd.c \ @@ -238,7 +239,6 @@ BUILT_SOURCES = \ jisx0208.h \ wbmp.h -libgd_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1037,11 +1037,13 @@ uninstall-am: dist-hook: rm -rf `find $(distdir)/$(GD_TREE) -name .svn` -$(BUILT_SOURCES): stamp-gd +$(libgd_a_OBJECTS): $(BUILT_SOURCES) $(ZLIB_DEPEND) $(LIBPNG_DEPEND) @ZLIB_RULE@ @LIBPNG_RULE@ +$(BUILT_SOURCES): stamp-gd + stamp-gd: @for file in $(BUILT_SOURCES); do \ test -f $$file || { \ diff --git a/Build/source/libs/gd/ac/gd.ac b/Build/source/libs/gd/ac/gd.ac index 97242870e1b..6b297620e9f 100644 --- a/Build/source/libs/gd/ac/gd.ac +++ b/Build/source/libs/gd/ac/gd.ac @@ -1,3 +1,7 @@ -## libs/gd/ac/gd.ac +## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system gd KPSE_CHECK_LIB([gd], [gdImageCreate], [gd.h]) diff --git a/Build/source/libs/gd/ac/withenable.ac b/Build/source/libs/gd/ac/withenable.ac index 24637010b52..be03732231b 100644 --- a/Build/source/libs/gd/ac/withenable.ac +++ b/Build/source/libs/gd/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/gd/kpse/withenable.ac +## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for gd KPSE_WITH_LIB([gd], [libpng]) diff --git a/Build/source/libs/graphite/ac/graphite.ac b/Build/source/libs/graphite/ac/graphite.ac index 8f6a683247c..da6b30aedda 100644 --- a/Build/source/libs/graphite/ac/graphite.ac +++ b/Build/source/libs/graphite/ac/graphite.ac @@ -1,3 +1,7 @@ -## libs/graphite/ac/graphite.ac +## libs/graphite/ac/graphite.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system graphite KPSE_CHECK_LIBXX([graphite], [free], [graphite/GrClient.h]) diff --git a/Build/source/libs/graphite/ac/withenable.ac b/Build/source/libs/graphite/ac/withenable.ac index a27017bfdb9..d91792f3f81 100644 --- a/Build/source/libs/graphite/ac/withenable.ac +++ b/Build/source/libs/graphite/ac/withenable.ac @@ -1,3 +1,12 @@ -## libs/graphite/ac/withenable.ac +## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl +## XeTeX can be built without graphite support +AC_ARG_WITH([graphite], + AS_HELP_STRING([--without-graphite], + [build XeTeX without graphite support])) +test "x$with_graphite" = xno && need_graphite=no ## configure options and TL libraries required for graphite KPSE_WITH_LIB([graphite]) diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 09b99a10429..e6215891fa6 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -23,17 +23,9 @@ INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) AM_CPPFLAGS = $(LIBPNG_DEFINES) if build - noinst_LIBRARIES=libpng.a - -TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) - -check_PROGRAMS = pngtest -dist_check_SCRIPTS = libpng.test - endif build - -TESTS = libpng.test +EXTRA_LIBRARIES=libpng.a nodist_libpng_a_SOURCES = \ $(LIBPNG_TREE)/png.c \ @@ -52,11 +44,18 @@ nodist_libpng_a_SOURCES = \ $(LIBPNG_TREE)/pngerror.c \ $(LIBPNG_TREE)/pngpread.c -libpng_a_DEPENDENCIES = $(ZLIB_DEPEND) +$(libpng_a_OBJECTS): $(ZLIB_DEPEND) ## Rebuild zlib @ZLIB_RULE@ +if build +TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) +TESTS = libpng.test +check_PROGRAMS = pngtest +dist_check_SCRIPTS = libpng.test +endif build + CLEANFILES = pngout.png nodist_pngtest_SOURCES = $(LIBPNG_TREE)/pngtest.c diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index 02eb5931b66..ed8d3e441a4 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -194,9 +194,7 @@ EXTRA_DIST = $(LIBPNG_TREE) INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) AM_CPPFLAGS = $(LIBPNG_DEFINES) @build_TRUE@noinst_LIBRARIES = libpng.a -@build_TRUE@TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) -@build_TRUE@dist_check_SCRIPTS = libpng.test -TESTS = libpng.test +EXTRA_LIBRARIES = libpng.a nodist_libpng_a_SOURCES = \ $(LIBPNG_TREE)/png.c \ $(LIBPNG_TREE)/pngset.c \ @@ -214,7 +212,9 @@ nodist_libpng_a_SOURCES = \ $(LIBPNG_TREE)/pngerror.c \ $(LIBPNG_TREE)/pngpread.c -libpng_a_DEPENDENCIES = $(ZLIB_DEPEND) +@build_TRUE@TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) +@build_TRUE@TESTS = libpng.test +@build_TRUE@dist_check_SCRIPTS = libpng.test CLEANFILES = pngout.png nodist_pngtest_SOURCES = $(LIBPNG_TREE)/pngtest.c pngtest_LDADD = libpng.a $(ZLIB_LIBS) @@ -930,6 +930,8 @@ uninstall-am: dist-hook: rm -rf `find $(distdir)/$(LIBPNG_TREE) -name .svn` +$(libpng_a_OBJECTS): $(ZLIB_DEPEND) + @ZLIB_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. diff --git a/Build/source/libs/libpng/ac/libpng.ac b/Build/source/libs/libpng/ac/libpng.ac index 009eb29cd33..fcf51aadf7c 100644 --- a/Build/source/libs/libpng/ac/libpng.ac +++ b/Build/source/libs/libpng/ac/libpng.ac @@ -1,3 +1,7 @@ -## libs/libpng/ac/libpng.ac +## libs/libpng/ac/libpng.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system libpng KPSE_CHECK_LIB([libpng], [png_set_read_fn], [png.h]) diff --git a/Build/source/libs/libpng/ac/withenable.ac b/Build/source/libs/libpng/ac/withenable.ac index 37489800b6c..bd585135b96 100644 --- a/Build/source/libs/libpng/ac/withenable.ac +++ b/Build/source/libs/libpng/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/libpng/kpse/withenable.ac +## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for libpng KPSE_WITH_LIB([libpng], [zlib]) diff --git a/Build/source/libs/obsdcompat/Makefile.am b/Build/source/libs/obsdcompat/Makefile.am index 42ee5c1fd0a..3c61bb47084 100644 --- a/Build/source/libs/obsdcompat/Makefile.am +++ b/Build/source/libs/obsdcompat/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory libs/obsdcompat/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -22,7 +26,3 @@ libopenbsd_compat_a_SOURCES = \ includes.h \ openbsd-compat.h -## Eventually delete these files -## -EXTRA_DIST = libobsd-compat.ac - diff --git a/Build/source/libs/obsdcompat/Makefile.in b/Build/source/libs/obsdcompat/Makefile.in index 9ce9048dee1..b1b66532117 100644 --- a/Build/source/libs/obsdcompat/Makefile.in +++ b/Build/source/libs/obsdcompat/Makefile.in @@ -208,7 +208,6 @@ libopenbsd_compat_a_SOURCES = \ includes.h \ openbsd-compat.h -EXTRA_DIST = libobsd-compat.ac all: all-am .SUFFIXES: diff --git a/Build/source/libs/obsdcompat/ac/withenable.ac b/Build/source/libs/obsdcompat/ac/withenable.ac index 6e52d310e91..09d3cb98e2d 100644 --- a/Build/source/libs/obsdcompat/ac/withenable.ac +++ b/Build/source/libs/obsdcompat/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/obsdcompat/ac/withenable.ac +## libs/obsdcompat/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/obsdcompat/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for obsdcompat KPSE_WITH_LIB([obsdcompat], , [tree]) diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am index 5a644c78636..28f158968c8 100644 --- a/Build/source/libs/t1lib/Makefile.am +++ b/Build/source/libs/t1lib/Makefile.am @@ -29,10 +29,9 @@ AM_CFLAGS = $(T1LIB_CFLAGS) LDADD = libt1.a if build - noinst_LIBRARIES = libt1.a - endif build +EXTRA_LIBRARIES = libt1.a nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources) @@ -71,12 +70,9 @@ lib_type1_sources = \ $(T1LIB_TREE)/lib/type1/util.c if build - check_PROGRAMS = type1afm dist_check_SCRIPTS = type1afm.test - TESTS = type1afm.test - endif build nodist_type1afm_SOURCES = $(T1LIB_TREE)/type1afm/type1afm.c diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in index c01f53a4b37..569b9351530 100644 --- a/Build/source/libs/t1lib/Makefile.in +++ b/Build/source/libs/t1lib/Makefile.in @@ -202,6 +202,7 @@ AM_CPPFLAGS = $(T1LIB_DEFINES) -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" \ AM_CFLAGS = $(T1LIB_CFLAGS) LDADD = libt1.a @build_TRUE@noinst_LIBRARIES = libt1.a +EXTRA_LIBRARIES = libt1.a nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources) lib_t1lib_sources = \ $(T1LIB_TREE)/lib/t1lib/parseAFM.c \ diff --git a/Build/source/libs/t1lib/ac/t1lib.ac b/Build/source/libs/t1lib/ac/t1lib.ac index 1e8d0bcdc66..5d7290b909e 100644 --- a/Build/source/libs/t1lib/ac/t1lib.ac +++ b/Build/source/libs/t1lib/ac/t1lib.ac @@ -1,4 +1,8 @@ -## libs/t1lib/ac/t1lib.ac +## libs/t1lib/ac/t1lib.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system t1lib KPSE_CHECK_LIB([t1lib], [T1_AddFont T1_CheckForInit], [t1lib.h]) diff --git a/Build/source/libs/t1lib/ac/withenable.ac b/Build/source/libs/t1lib/ac/withenable.ac index c67aca06b4c..cb53db398bb 100644 --- a/Build/source/libs/t1lib/ac/withenable.ac +++ b/Build/source/libs/t1lib/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/t1lib/ac/withenable.ac +## libs/t1lib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for t1lib KPSE_WITH_LIB([t1lib]) diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index d6db6f345e2..84b1ed618e5 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory libs/teckit/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -5,9 +9,9 @@ INCLUDES = -I$(top_srcdir)/source/Public-headers $(ZLIB_INCLUDES) AM_CPPFLAGS = -DNDEBUG if build -EXTRA_LIBRARIES = libTECkit_Compiler.a noinst_LIBRARIES = libTECkit.a endif +EXTRA_LIBRARIES = libTECkit_Compiler.a libTECkit.a libTECkit_Compiler_a_SOURCES = \ source/Compiler.cpp \ @@ -80,7 +84,7 @@ EXTRA_DIST += \ dist-hook: rm -rf `find $(distdir) -name .svn` -## Eventually delete these files +## Original files ## EXTRA_DIST += Makefile.am.orig configure.ac.orig diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 9a3b691bda7..d12f9c33853 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -187,8 +187,8 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 INCLUDES = -I$(top_srcdir)/source/Public-headers $(ZLIB_INCLUDES) AM_CPPFLAGS = -DNDEBUG -@build_TRUE@EXTRA_LIBRARIES = libTECkit_Compiler.a @build_TRUE@noinst_LIBRARIES = libTECkit.a +EXTRA_LIBRARIES = libTECkit_Compiler.a libTECkit.a libTECkit_Compiler_a_SOURCES = \ source/Compiler.cpp \ source/UnicodeNames.cpp diff --git a/Build/source/libs/teckit/ac/teckit.ac b/Build/source/libs/teckit/ac/teckit.ac index 490becdb5a2..cd866e9040d 100644 --- a/Build/source/libs/teckit/ac/teckit.ac +++ b/Build/source/libs/teckit/ac/teckit.ac @@ -1,3 +1,7 @@ -## libs/teckit/ac/teckit.ac +## libs/teckit/ac/teckit.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system teckit KPSE_CHECK_LIB([teckit], [TECkit_CreateConverter], [TECkit_Engine.h]) diff --git a/Build/source/libs/teckit/ac/withenable.ac b/Build/source/libs/teckit/ac/withenable.ac index 536220e52ce..0d910ae81b2 100644 --- a/Build/source/libs/teckit/ac/withenable.ac +++ b/Build/source/libs/teckit/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/teckit/ac/withenable.ac +## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for teckit KPSE_WITH_LIB([teckit], [zlib]) diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index 6798ad21e2b..060b39fdbd2 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -98,24 +98,23 @@ xpdf_libxpdf_a_sources = \ $(XPDF_SRC)/UnicodeMap.cc \ $(XPDF_SRC)/XRef.cc -## ###### ## Patch for xpdf-3.02pl2 - +## EXTRA_DIST += xpdf-3.02-pl2.patch ## Patch required to build with -DPDF_PARSER_ONLY - +## EXTRA_DIST += xpdf-3.02-PDF_PARSER_ONLY.patch ## Patch required for pdftex - +## EXTRA_DIST += xpdf-3.02-pdftex.patch ## Patch required for some systems - +## EXTRA_DIST += xpdf-3.02-time_h.patch -## Patch required for some mingw32 - +## Patch required for mingw32 +## EXTRA_DIST += xpdf-3.02-mingw32.patch diff --git a/Build/source/libs/xpdf/ac/withenable.ac b/Build/source/libs/xpdf/ac/withenable.ac index 84f89f7d835..1bb24c7b6d5 100644 --- a/Build/source/libs/xpdf/ac/withenable.ac +++ b/Build/source/libs/xpdf/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/xpdf/ac/withenable.ac +## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for xpdf KPSE_WITH_LIB([xpdf], , [tree]) diff --git a/Build/source/libs/xpdf/fofi/Makefile.in b/Build/source/libs/xpdf/fofi/Makefile.in index 82b4acf1ca2..4ecb6a28056 100644 --- a/Build/source/libs/xpdf/fofi/Makefile.in +++ b/Build/source/libs/xpdf/fofi/Makefile.in @@ -298,15 +298,6 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - -# Makefile.am fragment to create header symlinks. -# -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -# -# This file is free software; the copyright holder -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# all-local: @for file in $(SRCDIR)/*.h; do \ inst=`echo $$file | sed -e 's/^.*\///'`; \ diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in index 2ff8cdb2511..d1be34901a9 100644 --- a/Build/source/libs/xpdf/goo/Makefile.in +++ b/Build/source/libs/xpdf/goo/Makefile.in @@ -298,15 +298,6 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - -# Makefile.am fragment to create header symlinks. -# -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -# -# This file is free software; the copyright holder -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# all-local: @for file in $(SRCDIR)/*.h; do \ inst=`echo $$file | sed -e 's/^.*\///'`; \ diff --git a/Build/source/libs/xpdf/hdrs.am b/Build/source/libs/xpdf/hdrs.am index f912939fbc5..80876177a35 100644 --- a/Build/source/libs/xpdf/hdrs.am +++ b/Build/source/libs/xpdf/hdrs.am @@ -1,11 +1,11 @@ -# Makefile.am fragment to create header symlinks. -# -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -# -# This file is free software; the copyright holder -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# +## libs/xpdf/hdrs.am: Makefile fragment to create header symlinks. +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## +## This file is free software; the copyright holder +## gives unlimited permission to copy and/or distribute it, +## with or without modifications, as long as this notice is preserved. +## all-local: @for file in $(SRCDIR)/*.h; do \ inst=`echo $$file | sed -e 's/^.*\///'`; \ diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in index b78ab9f4d73..1109e1a2bb6 100644 --- a/Build/source/libs/xpdf/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/xpdf/Makefile.in @@ -298,15 +298,6 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am - -# Makefile.am fragment to create header symlinks. -# -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -# -# This file is free software; the copyright holder -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# all-local: @for file in $(SRCDIR)/*.h; do \ inst=`echo $$file | sed -e 's/^.*\///'`; \ diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am index 5d126bb4135..6f188a23e3d 100644 --- a/Build/source/libs/zlib/Makefile.am +++ b/Build/source/libs/zlib/Makefile.am @@ -23,17 +23,9 @@ INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE) AM_CPPFLAGS = $(ZLIB_DEFINES) if build - noinst_LIBRARIES = libz.a - -BUILT_SOURCES = zconf.h - -check_PROGRAMS = example minigzip -dist_check_SCRIPTS = zlib.test - -TESTS = zlib.test - endif build +EXTRA_LIBRARIES = libz.a nodist_libz_a_SOURCES = \ $(ZLIB_TREE)/adler32.c \ @@ -57,6 +49,14 @@ nodist_libz_a_SOURCES = \ $(ZLIB_TREE)/zutil.h \ $(ZLIB_TREE)/zutil.c +$(libz_a_OBJECTS): zconf.h + +if build +check_PROGRAMS = example minigzip +dist_check_SCRIPTS = zlib.test +TESTS = zlib.test +endif build + LDADD = libz.a nodist_example_SOURCES = $(ZLIB_TREE)/example.c diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index 5c77f8bfaba..9e87426ff21 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -190,9 +190,7 @@ EXTRA_DIST = $(ZLIB_TREE) INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE) AM_CPPFLAGS = $(ZLIB_DEFINES) @build_TRUE@noinst_LIBRARIES = libz.a -@build_TRUE@BUILT_SOURCES = zconf.h -@build_TRUE@dist_check_SCRIPTS = zlib.test -@build_TRUE@TESTS = zlib.test +EXTRA_LIBRARIES = libz.a nodist_libz_a_SOURCES = \ $(ZLIB_TREE)/adler32.c \ $(ZLIB_TREE)/compress.c \ @@ -215,12 +213,14 @@ nodist_libz_a_SOURCES = \ $(ZLIB_TREE)/zutil.h \ $(ZLIB_TREE)/zutil.c +@build_TRUE@dist_check_SCRIPTS = zlib.test +@build_TRUE@TESTS = zlib.test LDADD = libz.a nodist_example_SOURCES = $(ZLIB_TREE)/example.c nodist_minigzip_SOURCES = $(ZLIB_TREE)/minigzip.c DISTCLEANFILES = zconf.h CLEANFILES = foo.gz foo_gz -all: $(BUILT_SOURCES) config.h +all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -794,12 +794,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \ $(dist_check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am +check: check-am all-am: Makefile $(LIBRARIES) config.h installdirs: -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am +install: install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -825,7 +823,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \ @@ -909,6 +906,8 @@ uninstall-am: dist-hook: rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn` +$(libz_a_OBJECTS): zconf.h + zconf.h: $(ZLIB_TREE)/zconf.in.h Makefile sed < $< '/HAVE_UNISTD_H/s%^#if [01]%#if $(WITH_UNISTD)%' >$@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/libs/zlib/ac/withenable.ac b/Build/source/libs/zlib/ac/withenable.ac index 0e61eac2e51..aa0adc23561 100644 --- a/Build/source/libs/zlib/ac/withenable.ac +++ b/Build/source/libs/zlib/ac/withenable.ac @@ -1,3 +1,7 @@ -## libs/zlib/ac/withenable.ac +## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for zlib KPSE_WITH_LIB([zlib]) diff --git a/Build/source/libs/zlib/ac/zlib.ac b/Build/source/libs/zlib/ac/zlib.ac index aea063a2250..e5d0efb3f1a 100644 --- a/Build/source/libs/zlib/ac/zlib.ac +++ b/Build/source/libs/zlib/ac/zlib.ac @@ -1,3 +1,7 @@ -## libs/zlib/ac/zlib.ac +## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## define required functions and headers from system zlib KPSE_CHECK_LIB([zlib], [inflate], [zlib.h]) diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am index e37ad692836..b913d3f6c07 100644 --- a/Build/source/texk/Makefile.am +++ b/Build/source/texk/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../m4 diff --git a/Build/source/texk/ac/withenable.ac b/Build/source/texk/ac/withenable.ac index e1f03b94b67..74eb1ee4c57 100644 --- a/Build/source/texk/ac/withenable.ac +++ b/Build/source/texk/ac/withenable.ac @@ -1 +1,4 @@ -## texk/ac/withenable.ac +## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. diff --git a/Build/source/texk/afm2pl/Makefile.am b/Build/source/texk/afm2pl/Makefile.am index 5789438a2f0..18791d541cb 100644 --- a/Build/source/texk/afm2pl/Makefile.am +++ b/Build/source/texk/afm2pl/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/afm2pl/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -17,16 +21,10 @@ LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = afm2pl.1 -## Not (yet) used +## Not used ## EXTRA_DIST = \ afm2pl.html \ afm2pl.txt \ - afm2pl.xml \ - c-auto.in - -## Eventually delete these files -## - -EXTRA_DIST += Makefile.in.orig configure.in.orig + afm2pl.xml diff --git a/Build/source/texk/afm2pl/Makefile.in b/Build/source/texk/afm2pl/Makefile.in index c8137ec6048..b568e991ff8 100644 --- a/Build/source/texk/afm2pl/Makefile.in +++ b/Build/source/texk/afm2pl/Makefile.in @@ -221,8 +221,11 @@ afm2pl_SOURCES = afm2pl.c afm2pl_DEPENDENCIES = $(KPATHSEA_DEPEND) LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = afm2pl.1 -EXTRA_DIST = afm2pl.html afm2pl.txt afm2pl.xml c-auto.in \ - Makefile.in.orig configure.in.orig +EXTRA_DIST = \ + afm2pl.html \ + afm2pl.txt \ + afm2pl.xml + all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/afm2pl/ac/withenable.ac b/Build/source/texk/afm2pl/ac/withenable.ac index 95940e87ebd..7d7539504f6 100644 --- a/Build/source/texk/afm2pl/ac/withenable.ac +++ b/Build/source/texk/afm2pl/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/afm2pl/ac/withenable.ac +## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for afm2pl KPSE_WITH_PROG([afm2pl], [kpathsea]) diff --git a/Build/source/texk/bibtex8/ac/withenable.ac b/Build/source/texk/bibtex8/ac/withenable.ac index b65ab681b70..93a32cec26c 100644 --- a/Build/source/texk/bibtex8/ac/withenable.ac +++ b/Build/source/texk/bibtex8/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/bibtex8/ac/withenable.ac +## texk/bibtex8/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex8/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for bibtex8 KPSE_WITH_PROG([bibtex8], [kpathsea]) diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index f9f29975519..adcc55bbe26 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/afm2pl/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 diff --git a/Build/source/texk/cjkutils/ac/withenable.ac b/Build/source/texk/cjkutils/ac/withenable.ac index 9bbe9162d29..723c8a1ab3c 100644 --- a/Build/source/texk/cjkutils/ac/withenable.ac +++ b/Build/source/texk/cjkutils/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/cjkutils/ac/withenable.ac +## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for cjkutils KPSE_WITH_PROG([cjkutils], [kpathsea]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 790682ad92c..ae418ab913e 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -774,6 +774,7 @@ enable_mktextex_default with_system_teckit with_teckit_includes with_teckit_libdir +with_graphite with_system_graphite with_graphite_includes with_graphite_libdir @@ -1571,6 +1572,7 @@ Optional Packages: teckit headers installed in DIR --with-teckit-libdir=DIR teckit library installed in DIR + --without-graphite build XeTeX without graphite support --with-system-graphite use installed graphite headers and library --with-graphite-includes=DIR graphite headers installed in DIR @@ -2196,11 +2198,11 @@ if test "x$enable_multiplatform" = xyes; then fi -## ac/withenable.ac +## ac/withenable.ac: configure.ac fragment for the TeX Live top-level -## utils/ac/withenable.ac +## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ -## utils/dialog/ac/withenable.ac +## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. if test "${enable_dialog+set}" = set; then @@ -2215,7 +2217,7 @@ $as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;} esac -## utils/pdfopen/ac/withenable.ac +## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then @@ -2230,7 +2232,7 @@ $as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;} esac -## utils/ps2eps/ac/withenable.ac +## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/ ## configure options and TL libraries required for ps2eps # Check whether --enable-ps2eps was given. if test "${enable_ps2eps+set}" = set; then @@ -2245,7 +2247,7 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;} esac -## utils/psutils/ac/withenable.ac +## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/ ## configure options and TL libraries required for psutils # Check whether --enable-psutils was given. if test "${enable_psutils+set}" = set; then @@ -2260,7 +2262,7 @@ $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;} esac -## utils/t1utils/ac/withenable.ac +## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/ ## configure options and TL libraries required for t1utils # Check whether --enable-t1utils was given. if test "${enable_t1utils+set}" = set; then @@ -2275,7 +2277,7 @@ $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;} esac -## utils/tpic2pdftex/ac/withenable.ac +## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/ ## configure options and TL libraries required for tpic2pdftex # Check whether --enable-tpic2pdftex was given. if test "${enable_tpic2pdftex+set}" = set; then @@ -2290,7 +2292,7 @@ $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;} esac -## utils/vlna/ac/withenable.ac +## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/ ## configure options and TL libraries required for vlna # Check whether --enable-vlna was given. if test "${enable_vlna+set}" = set; then @@ -2306,7 +2308,7 @@ esac -## texk/ac/withenable.ac +## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options and TL libraries required for web2c @@ -2478,7 +2480,7 @@ if test "${enable_web_progs+set}" = set; then fi -## texk/afm2pl/ac/withenable.ac +## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/ ## configure options and TL libraries required for afm2pl # Check whether --enable-afm2pl was given. if test "${enable_afm2pl+set}" = set; then @@ -2497,7 +2499,7 @@ test "x$enable_afm2pl" = xno || { } -## texk/bibtex8/ac/withenable.ac +## texk/bibtex8/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex8/ ## configure options and TL libraries required for bibtex8 # Check whether --enable-bibtex8 was given. if test "${enable_bibtex8+set}" = set; then @@ -2516,7 +2518,7 @@ test "x$enable_bibtex8" = xno || { } -## texk/cjkutils/ac/withenable.ac +## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/ ## configure options and TL libraries required for cjkutils # Check whether --enable-cjkutils was given. if test "${enable_cjkutils+set}" = set; then @@ -2535,7 +2537,7 @@ test "x$enable_cjkutils" = xno || { } -## texk/detex/ac/withenable.ac +## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/ ## configure options and TL libraries required for detex # Check whether --enable-detex was given. if test "${enable_detex+set}" = set; then @@ -2554,7 +2556,7 @@ test "x$enable_detex" = xno || { } -## texk/devnag/ac/withenable.ac +## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/ ## configure options and TL libraries required for devnag # Check whether --enable-devnag was given. if test "${enable_devnag+set}" = set; then @@ -2569,7 +2571,7 @@ $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;} esac -## texk/dtl/ac/withenable.ac +## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/ ## configure options and TL libraries required for dtl # Check whether --enable-dtl was given. if test "${enable_dtl+set}" = set; then @@ -2588,7 +2590,7 @@ test "x$enable_dtl" = xno || { } -## texk/dvi2tty/ac/withenable.ac +## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/ ## configure options and TL libraries required for dvi2tty # Check whether --enable-dvi2tty was given. if test "${enable_dvi2tty+set}" = set; then @@ -2607,7 +2609,7 @@ test "x$enable_dvi2tty" = xno || { } -## texk/dvidvi/ac/withenable.ac +## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/ ## configure options and TL libraries required for dvidvi # Check whether --enable-dvidvi was given. if test "${enable_dvidvi+set}" = set; then @@ -2626,7 +2628,7 @@ test "x$enable_dvidvi" = xno || { } -## texk/dviljk/ac/withenable.ac +## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/ ## configure options and TL libraries required for dviljk # Check whether --enable-dviljk was given. if test "${enable_dviljk+set}" = set; then @@ -2645,7 +2647,7 @@ test "x$enable_dviljk" = xno || { } -## texk/dvipdfm/ac/withenable.ac +## texk/dvipdfm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm/ ## configure options and TL libraries required for dvipdfm # Check whether --enable-dvipdfm was given. if test "${enable_dvipdfm+set}" = set; then @@ -2665,7 +2667,7 @@ test "x$enable_dvipdfm" = xno || { } -## texk/dvipdfmx/ac/withenable.ac +## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/ ## configure options and TL libraries required for dvipdfmx # Check whether --enable-dvipdfmx was given. if test "${enable_dvipdfmx+set}" = set; then @@ -2685,7 +2687,7 @@ test "x$enable_dvipdfmx" = xno || { } -## texk/dvipng/ac/withenable.ac +## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options and TL libraries required for dvipng # Check whether --enable-dvipng was given. if test "${enable_dvipng+set}" = set; then @@ -2706,7 +2708,7 @@ test "x$enable_dvipng" = xno || { need_t1lib=yes } -## texk/dvipng/ac/dvipng.ac +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options for dvipng # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then @@ -2726,7 +2728,7 @@ fi -## texk/dvipos/ac/withenable.ac +## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/ ## configure options and TL libraries required for dvipos # Check whether --enable-dvipos was given. if test "${enable_dvipos+set}" = set; then @@ -2745,7 +2747,7 @@ test "x$enable_dvipos" = xno || { } -## texk/dvipsk/ac/withenable.ac +## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/ ## configure options and TL libraries required for dvipsk # Check whether --enable-dvipsk was given. if test "${enable_dvipsk+set}" = set; then @@ -2764,7 +2766,7 @@ test "x$enable_dvipsk" = xno || { } -## texk/gsftopk/ac/withenable.ac +## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/ ## configure options and TL libraries required for gsftopk # Check whether --enable-gsftopk was given. if test "${enable_gsftopk+set}" = set; then @@ -2783,7 +2785,7 @@ test "x$enable_gsftopk" = xno || { } -## texk/lacheck/ac/withenable.ac +## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/ ## configure options and TL libraries required for lacheck # Check whether --enable-lacheck was given. if test "${enable_lacheck+set}" = set; then @@ -2802,7 +2804,7 @@ test "x$enable_lacheck" = xno || { } -## texk/lcdf-typetools/ac/withenable.ac +## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options and TL libraries required for lcdf-typetools # Check whether --enable-lcdf-typetools was given. if test "${enable_lcdf_typetools+set}" = set; then @@ -2820,7 +2822,7 @@ test "x$enable_lcdf_typetools" = xno || { need_kpathsea=yes } -## texk/lcdf-typetools/ac/lcdf-typetools.ac +## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then @@ -2882,7 +2884,7 @@ fi -## texk/makeindexk/ac/withenable.ac +## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/ ## configure options and TL libraries required for makeindexk # Check whether --enable-makeindexk was given. if test "${enable_makeindexk+set}" = set; then @@ -2901,7 +2903,7 @@ test "x$enable_makeindexk" = xno || { } -## texk/musixflx/ac/withenable.ac +## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ ## configure options and TL libraries required for musixflx # Check whether --enable-musixflx was given. if test "${enable_musixflx+set}" = set; then @@ -2916,7 +2918,7 @@ $as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;} esac -## texk/ps2pkm/ac/withenable.ac +## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ ## configure options and TL libraries required for ps2pkm # Check whether --enable-ps2pkm was given. if test "${enable_ps2pkm+set}" = set; then @@ -2935,7 +2937,7 @@ test "x$enable_ps2pkm" = xno || { } -## texk/seetexk/ac/withenable.ac +## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ ## configure options and TL libraries required for seetexk # Check whether --enable-seetexk was given. if test "${enable_seetexk+set}" = set; then @@ -2954,7 +2956,7 @@ test "x$enable_seetexk" = xno || { } -## texk/tex4htk/ac/withenable.ac +## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/ ## configure options and TL libraries required for tex4htk # Check whether --enable-tex4htk was given. if test "${enable_tex4htk+set}" = set; then @@ -2973,7 +2975,7 @@ test "x$enable_tex4htk" = xno || { } -## texk/ttf2pk/ac/withenable.ac +## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/ ## configure options and TL libraries required for ttf2pk # Check whether --enable-ttf2pk was given. if test "${enable_ttf2pk+set}" = set; then @@ -2993,7 +2995,7 @@ test "x$enable_ttf2pk" = xno || { } -## texk/ttfdump/ac/withenable.ac +## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ ## configure options and TL libraries required for ttfdump # Check whether --enable-ttfdump was given. if test "${enable_ttfdump+set}" = set; then @@ -3012,7 +3014,7 @@ test "x$enable_ttfdump" = xno || { } -## texk/xdv2pdf/ac/withenable.ac +## texk/xdv2pdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdv2pdf/ ## configure options and TL libraries required for xdv2pdf # Check whether --enable-xdv2pdf was given. if test "${enable_xdv2pdf+set}" = set; then @@ -3031,7 +3033,7 @@ test "x$enable_xdv2pdf" = xno || { } -## texk/xdvik/ac/withenable.ac +## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then @@ -3050,7 +3052,7 @@ test "x$enable_xdvik" = xno || { need_t1lib=yes } -## texk/xdvik/ac/xdvik.ac +## 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. @@ -3060,7 +3062,7 @@ fi -## texk/xdvipdfmx/ac/withenable.ac +## texk/xdvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvipdfmx/ ## configure options and TL libraries required for xdvipdfmx # Check whether --enable-xdvipdfmx was given. if test "${enable_xdvipdfmx+set}" = set; then @@ -3081,7 +3083,7 @@ test "x$enable_xdvipdfmx" = xno || { } -## texk/tetex/ac/withenable.ac +## texk/tetex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tetex/ ## configure options and TL libraries required for tetex # Check whether --enable-tetex was given. if test "${enable_tetex+set}" = set; then @@ -3096,7 +3098,7 @@ $as_echo "$as_me: Assuming \`--enable-tetex=$enable_tetex'" >&6;} esac -## texk/texlive/ac/withenable.ac +## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ ## configure options and TL libraries required for texlive # Check whether --enable-texlive was given. if test "${enable_texlive+set}" = set; then @@ -3202,13 +3204,13 @@ case $enable_mktextex_default in esac -## libs/ac/withenable.ac +## libs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/ ## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/ ## configure options and TL libraries required for icu (modified for XeTeX) -## libs/teckit/ac/withenable.ac +## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ ## configure options and TL libraries required for teckit # Check whether --with-system-teckit was given. @@ -3255,7 +3257,15 @@ test "x$need_teckit" = xyes && { } -## libs/graphite/ac/withenable.ac +## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ +## XeTeX can be built without graphite support + +# Check whether --with-graphite was given. +if test "${with_graphite+set}" = set; then + withval=$with_graphite; +fi + +test "x$with_graphite" = xno && need_graphite=no ## configure options and TL libraries required for graphite # Check whether --with-system-graphite was given. @@ -3286,11 +3296,11 @@ $as_echo "$as_me: Assuming installed \`graphite' headers and library" >&6;} fi -## libs/xpdf/ac/withenable.ac +## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf -## libs/gd/kpse/withenable.ac +## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd # Check whether --with-system-gd was given. @@ -3337,7 +3347,7 @@ test "x$need_gd" = xyes && { } -## libs/freetype2/ac/withenable.ac +## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ ## configure options and TL libraries required for freetype2 # Check whether --with-system-freetype2 was given. @@ -3384,7 +3394,7 @@ test "x$need_freetype2" = xyes && { } -## libs/freetype/ac/withenable.ac +## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ ## configure options and TL libraries required for freetype # Check whether --with-system-freetype was given. @@ -3415,7 +3425,7 @@ $as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;} fi -## libs/t1lib/ac/withenable.ac +## libs/t1lib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/ ## configure options and TL libraries required for t1lib # Check whether --with-system-t1lib was given. @@ -3446,11 +3456,11 @@ $as_echo "$as_me: Assuming installed \`t1lib' headers and library" >&6;} fi -## libs/obsdcompat/ac/withenable.ac +## libs/obsdcompat/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/obsdcompat/ ## configure options and TL libraries required for obsdcompat -## libs/libpng/kpse/withenable.ac +## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ ## configure options and TL libraries required for libpng # Check whether --with-system-libpng was given. @@ -3497,7 +3507,7 @@ test "x$need_libpng" = xyes && { } -## libs/zlib/ac/withenable.ac +## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ ## configure options and TL libraries required for zlib # Check whether --with-system-zlib was given. diff --git a/Build/source/texk/detex/Makefile.am b/Build/source/texk/detex/Makefile.am index 87c4ddd5082..a59576e49df 100644 --- a/Build/source/texk/detex/Makefile.am +++ b/Build/source/texk/detex/Makefile.am @@ -1,3 +1,8 @@ +## Makefile.am for the TeX Live subdirectory texk/detex/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. +## ACLOCAL_AMFLAGS = -I ../../m4 INCLUDES = $(KPATHSEA_INCLUDES) diff --git a/Build/source/texk/detex/ac/withenable.ac b/Build/source/texk/detex/ac/withenable.ac index 5b309bf5c99..3c1c983f3ad 100644 --- a/Build/source/texk/detex/ac/withenable.ac +++ b/Build/source/texk/detex/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/detex/ac/withenable.ac +## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for detex KPSE_WITH_PROG([detex], [kpathsea]) diff --git a/Build/source/texk/devnag/ChangeLog b/Build/source/texk/devnag/ChangeLog index be28ac8ef4e..e07449b1ce7 100644 --- a/Build/source/texk/devnag/ChangeLog +++ b/Build/source/texk/devnag/ChangeLog @@ -1,5 +1,12 @@ 2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> + * configure.in (removed): moved ... + * configure.ac (new): ... to here and adapted for TeX Live: + axiliary files in ../../build-aux, added AM_MAINTAINER_MODE, + modernized Autoconf idioms. + +2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> + * Autoreconfed. Version 2.01 is a bugfix release, containing two changes in diff --git a/Build/source/texk/devnag/Makefile.in b/Build/source/texk/devnag/Makefile.in index 493ffddc0ed..121aa1b808f 100644 --- a/Build/source/texk/devnag/Makefile.in +++ b/Build/source/texk/devnag/Makefile.in @@ -30,17 +30,22 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = README $(am__configure_deps) \ + $(srcdir)/../../build-aux/install-sh \ + $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - depcomp install-sh missing mkinstalldirs + $(top_srcdir)/configure ../../build-aux/config.guess \ + ../../build-aux/config.sub ../../build-aux/depcomp \ + ../../build-aux/install-sh ../../build-aux/ltmain.sh \ + ../../build-aux/missing ../../build-aux/texinfo.tex \ + ../../build-aux/ylwrap AUTHORS COPYING ChangeLog INSTALL NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = SOURCES = @@ -64,7 +69,7 @@ am__remove_distdir = \ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -97,6 +102,7 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ @@ -160,19 +166,19 @@ all: config.h .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -187,9 +193,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -201,7 +207,7 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ @@ -392,7 +398,6 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) - dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -416,6 +421,7 @@ dist-zip: distdir dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then diff --git a/Build/source/texk/devnag/ac/withenable.ac b/Build/source/texk/devnag/ac/withenable.ac index 1391d6e9e70..1927321a1d7 100644 --- a/Build/source/texk/devnag/ac/withenable.ac +++ b/Build/source/texk/devnag/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/devnag/ac/withenable.ac +## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for devnag KPSE_WITH_PROG([devnag]) diff --git a/Build/source/texk/devnag/aclocal.m4 b/Build/source/texk/devnag/aclocal.m4 index cc5936eb1b3..542504c5f15 100644 --- a/Build/source/texk/devnag/aclocal.m4 +++ b/Build/source/texk/devnag/aclocal.m4 @@ -379,18 +379,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file 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. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -552,6 +540,35 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file 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. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. diff --git a/Build/source/texk/devnag/config.h.in b/Build/source/texk/devnag/config.h.in index f88ef3c23df..258edeb84b0 100644 --- a/Build/source/texk/devnag/config.h.in +++ b/Build/source/texk/devnag/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the `strstr' function. */ #undef HAVE_STRSTR diff --git a/Build/source/texk/devnag/configure b/Build/source/texk/devnag/configure index 8cf77739a71..d529b068062 100755 --- a/Build/source/texk/devnag/configure +++ b/Build/source/texk/devnag/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. +# Generated by GNU Autoconf 2.63 for devnag for TeX Live 2.01. +# +# Report bugs to <tex-k@tug.org>. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -592,11 +594,11 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='devnag for TeX Live' +PACKAGE_TARNAME='devnag-for-tex-live' +PACKAGE_VERSION='2.01' +PACKAGE_STRING='devnag for TeX Live 2.01' +PACKAGE_BUGREPORT='tex-k@tug.org' ac_unique_file="src/devnag.c" ac_subst_vars='LTLIBOBJS @@ -620,6 +622,9 @@ CPPFLAGS LDFLAGS CFLAGS CC +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -683,6 +688,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_maintainer_mode enable_dependency_tracking ' ac_precious_vars='build_alias @@ -734,7 +740,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1246,7 +1252,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures devnag for TeX Live 2.01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,7 +1300,8 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root + [DATAROOTDIR/doc/devnag-for-tex-live] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1311,13 +1318,17 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of devnag for TeX Live 2.01:";; + esac cat <<\_ACEOF Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors @@ -1334,6 +1345,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to <tex-k@tug.org>. _ACEOF ac_status=$? fi @@ -1396,7 +1408,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +devnag for TeX Live configure 2.01 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1410,7 +1422,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by devnag for TeX Live $as_me 2.01, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1763,6 +1775,14 @@ fi + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1770,12 +1790,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers config.h" -am__api_version='1.10' ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1791,8 +1809,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../build-aux \"$srcdir\"/../../build-aux" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in ../../build-aux \"$srcdir\"/../../build-aux" >&2;} { (exit 1); exit 1; }; } fi @@ -1805,6 +1823,12 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + +ac_config_headers="$ac_config_headers config.h" + + +am__api_version='1.10' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2119,8 +2143,8 @@ fi # Define the identity of the package. - PACKAGE=devnag - VERSION=2.01 + PACKAGE='devnag-for-tex-live' + VERSION='2.01' cat >>confdefs.h <<_ACEOF @@ -2262,6 +2286,28 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4117,6 +4163,7 @@ done ac_config_files="$ac_config_files Makefile src/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4214,6 +4261,13 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -4550,7 +4604,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by devnag for TeX Live $as_me 2.01, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4613,7 +4667,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +devnag for TeX Live config.status 2.01 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Build/source/texk/devnag/configure.ac b/Build/source/texk/devnag/configure.ac new file mode 100644 index 00000000000..785f0da76b1 --- /dev/null +++ b/Build/source/texk/devnag/configure.ac @@ -0,0 +1,35 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl +dnl This file is free software; the copyright holder +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +AC_INIT([devnag for TeX Live], [2.01], [tex-k@tug.org]) +AC_PREREQ([2.63]) +AC_CONFIG_SRCDIR([src/devnag.c]) +AC_CONFIG_AUX_DIR([../../build-aux]) + +AC_CONFIG_HEADERS([config.h]) + +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL + +dnl Checks for libraries. + +dnl Checks for header files. +AC_HEADER_STDC + +dnl Checks for typedefs, structures, and compiler characteristics. + +dnl Checks for library functions. +AC_CHECK_FUNCS([strstr]) + +AC_CONFIG_FILES([Makefile src/Makefile]) + +AC_OUTPUT diff --git a/Build/source/texk/devnag/configure.in b/Build/source/texk/devnag/configure.in deleted file mode 100644 index 79e81dcb098..00000000000 --- a/Build/source/texk/devnag/configure.in +++ /dev/null @@ -1,20 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/devnag.c) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(devnag, 2.01) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL - -dnl Checks for libraries. - -dnl Checks for header files. -AC_HEADER_STDC - -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl Checks for library functions. -AC_CHECK_FUNCS(strstr) - -AC_OUTPUT([Makefile src/Makefile]) diff --git a/Build/source/texk/devnag/depcomp b/Build/source/texk/devnag/depcomp deleted file mode 100755 index e5f9736c723..00000000000 --- a/Build/source/texk/devnag/depcomp +++ /dev/null @@ -1,589 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2007-03-29.01 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Build/source/texk/devnag/install-sh b/Build/source/texk/devnag/install-sh deleted file mode 100755 index a5897de6ea7..00000000000 --- a/Build/source/texk/devnag/install-sh +++ /dev/null @@ -1,519 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2006-12-25.00 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Build/source/texk/devnag/missing b/Build/source/texk/devnag/missing deleted file mode 100755 index f359dae7a87..00000000000 --- a/Build/source/texk/devnag/missing +++ /dev/null @@ -1,375 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2008-12-21.33 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - -Send bug reports to <bug-automake@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Build/source/texk/devnag/mkinstalldirs b/Build/source/texk/devnag/mkinstalldirs deleted file mode 100755 index ef7e16fdafe..00000000000 --- a/Build/source/texk/devnag/mkinstalldirs +++ /dev/null @@ -1,161 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2006-05-11.19 - -# Original author: Noah Friedman <friedman@prep.ai.mit.edu> -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to <bug-automake@gnu.org>." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Build/source/texk/devnag/src/Makefile.in b/Build/source/texk/devnag/src/Makefile.in index 0cea2864db2..620c687e553 100644 --- a/Build/source/texk/devnag/src/Makefile.in +++ b/Build/source/texk/devnag/src/Makefile.in @@ -34,10 +34,10 @@ bin_PROGRAMS = devnag$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" @@ -47,7 +47,7 @@ am_devnag_OBJECTS = devnag.$(OBJEXT) devnag_OBJECTS = $(am_devnag_OBJECTS) devnag_LDADD = $(LDADD) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -87,6 +87,7 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ @@ -148,7 +149,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -157,9 +158,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -173,9 +174,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) diff --git a/Build/source/texk/dtl/Makefile.am b/Build/source/texk/dtl/Makefile.am index 47ca5c1df62..561f8f6b069 100644 --- a/Build/source/texk/dtl/Makefile.am +++ b/Build/source/texk/dtl/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dtl/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 diff --git a/Build/source/texk/dtl/ac/withenable.ac b/Build/source/texk/dtl/ac/withenable.ac index 532a2ac77bc..89606bf9304 100644 --- a/Build/source/texk/dtl/ac/withenable.ac +++ b/Build/source/texk/dtl/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dtl/ac/withenable.ac +## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dtl KPSE_WITH_PROG([dtl], [kpathsea]) diff --git a/Build/source/texk/dummy/Makefile.am b/Build/source/texk/dummy/Makefile.am index 7ab40d9192e..0fb413a8f9f 100644 --- a/Build/source/texk/dummy/Makefile.am +++ b/Build/source/texk/dummy/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dummy/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## noinst_DATA = ../subtexkdir-configure diff --git a/Build/source/texk/dummy/README b/Build/source/texk/dummy/README index b53857161a7..d103a4e9962 100644 --- a/Build/source/texk/dummy/README +++ b/Build/source/texk/dummy/README @@ -1,3 +1,6 @@ +Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +You may freely use, modify and/or distribute this file. + This directory texk/dummy does not build or install anything. Its purpose is to record the command line used to invoke texk/dummy/configure from texk/configure. This information is then used by texk/Makefile to invoke diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am index ea6f0f46047..8082c0aa0d1 100644 --- a/Build/source/texk/dvi2tty/Makefile.am +++ b/Build/source/texk/dvi2tty/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dvi2tty/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -24,9 +28,8 @@ dvi2tty_DEPENDENCIES = $(KPATHSEA_DEPEND) dist_man1_MANS = dvi2tty.1 -## ################## -## Not yet used - +## Not used +## EXTRA_DIST = \ DVI.format \ MANIFEST \ diff --git a/Build/source/texk/dvi2tty/ac/withenable.ac b/Build/source/texk/dvi2tty/ac/withenable.ac index a68df38b816..2a6c817a08d 100644 --- a/Build/source/texk/dvi2tty/ac/withenable.ac +++ b/Build/source/texk/dvi2tty/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dvi2tty/ac/withenable.ac +## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dvi2tty KPSE_WITH_PROG([dvi2tty], [kpathsea]) diff --git a/Build/source/texk/dvidvi/Makefile.am b/Build/source/texk/dvidvi/Makefile.am index 145e3bdce9c..1c2785e1588 100644 --- a/Build/source/texk/dvidvi/Makefile.am +++ b/Build/source/texk/dvidvi/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dvidvi/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 diff --git a/Build/source/texk/dvidvi/ac/withenable.ac b/Build/source/texk/dvidvi/ac/withenable.ac index 9beeb86107a..78579276db8 100644 --- a/Build/source/texk/dvidvi/ac/withenable.ac +++ b/Build/source/texk/dvidvi/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dvidvi/ac/withenable.ac +## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dvidvi KPSE_WITH_PROG([dvidvi], [kpathsea]) diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am index 4bfb2e98326..442e4b4f480 100644 --- a/Build/source/texk/dviljk/Makefile.am +++ b/Build/source/texk/dviljk/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dviljk/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -76,10 +80,5 @@ dvilj.ps: dvilj.man EXTRA_DIST = dvilj.pod -DISTCLEANFILES = dvilj.ps libdvilj.a - -## Eventually delete these files -## - -EXTRA_DIST += Makefile.in.orig configure.in.orig +DISTCLEANFILES = dvilj.ps diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in index e304706d25d..83a19c3d01d 100644 --- a/Build/source/texk/dviljk/Makefile.in +++ b/Build/source/texk/dviljk/Makefile.in @@ -279,8 +279,8 @@ dvilj4l_SOURCES = \ LDADD = libdvilj.a $(KPATHSEA_LIBS) dist_man1_MANS = dvihp.man dvilj.man man1_links = dvilj2p.1 dvilj4.1 dvilj4l.1 dvilj6.1 -EXTRA_DIST = dvilj.pod Makefile.in.orig configure.in.orig -DISTCLEANFILES = dvilj.ps libdvilj.a +EXTRA_DIST = dvilj.pod +DISTCLEANFILES = dvilj.ps all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/dviljk/ac/withenable.ac b/Build/source/texk/dviljk/ac/withenable.ac index 3f25facbd84..b76e05d6c47 100644 --- a/Build/source/texk/dviljk/ac/withenable.ac +++ b/Build/source/texk/dviljk/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dviljk/ac/withenable.ac +## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dviljk KPSE_WITH_PROG([dviljk], [kpathsea]) diff --git a/Build/source/texk/dviljk/configure.ac b/Build/source/texk/dviljk/configure.ac index a744c11a3c2..78bac073670 100644 --- a/Build/source/texk/dviljk/configure.ac +++ b/Build/source/texk/dviljk/configure.ac @@ -18,7 +18,7 @@ KPSE_COMMON([dviljk], [no-define]) AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) AC_C_CHAR_UNSIGNED -AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF([long]) AC_CHECK_FUNCS([rmdir unlink mkdtemp mktemp]) KPSE_KPATHSEA_FLAGS diff --git a/Build/source/texk/dvipdfm/ac/withenable.ac b/Build/source/texk/dvipdfm/ac/withenable.ac index ecfa3e417c5..6dea45665b8 100644 --- a/Build/source/texk/dvipdfm/ac/withenable.ac +++ b/Build/source/texk/dvipdfm/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dvipdfm/ac/withenable.ac +## texk/dvipdfm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dvipdfm KPSE_WITH_PROG([dvipdfm], [kpathsea libpng]) diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure index 9534feb1a10..c7f60eb525b 100755 --- a/Build/source/texk/dvipdfm/configure +++ b/Build/source/texk/dvipdfm/configure @@ -15141,6 +15141,28 @@ $as_echo "$kpse_cv_have_type1_format" >&6; } if test "x$kpse_cv_have_type1_format" = xyes; then : else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipdfm has been disabled and would fail because +Required file formats not found in Kpathsea header files. + +This version of dvipdfm requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&5 +$as_echo "$as_me: WARNING: building dvipdfm has been disabled and would fail because +Required file formats not found in Kpathsea header files. + +This version of dvipdfm requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&2;} +else { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. This version of dvipdfm requires that kpathsea and its headers be available. @@ -15163,6 +15185,9 @@ the file \"kpathsea/kpathsea.h\" fi +fi + + { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_ofm_format" >&5 $as_echo_n "checking whether kpathsea declares the kpse_ofm_format... " >&6; } if test "${kpse_cv_have_ofm_format+set}" = set; then diff --git a/Build/source/texk/dvipdfm/configure.ac b/Build/source/texk/dvipdfm/configure.ac index 3a1e1f4eb5f..c78be4f0b26 100644 --- a/Build/source/texk/dvipdfm/configure.ac +++ b/Build/source/texk/dvipdfm/configure.ac @@ -46,7 +46,8 @@ dnl Check for required file formats. dnl We need tex-ps_header, type1, and vf; dnl of these type1 was introduced last (Feb 1996). KPSE_CHECK_KPSE_FORMAT([type1], , - [AC_MSG_ERROR([Required file formats not found in Kpathsea header files. + [KPSE_MSG_ERROR([dvipdfm], + [Required file formats not found in Kpathsea header files. This version of dvipdfm requires that kpathsea and its headers be available. If you are sure they are installed and in a standard place, maybe you need a diff --git a/Build/source/texk/dvipdfmx/ac/withenable.ac b/Build/source/texk/dvipdfmx/ac/withenable.ac index 201550211fa..a41e7d396ee 100644 --- a/Build/source/texk/dvipdfmx/ac/withenable.ac +++ b/Build/source/texk/dvipdfmx/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dvipdfmx/ac/withenable.ac +## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dvipdfmx KPSE_WITH_PROG([dvipdfmx], [kpathsea libpng]) diff --git a/Build/source/texk/dvipng/ac/dvipng.ac b/Build/source/texk/dvipng/ac/dvipng.ac index b1b8c1ac0a7..27d4bf31525 100644 --- a/Build/source/texk/dvipng/ac/dvipng.ac +++ b/Build/source/texk/dvipng/ac/dvipng.ac @@ -1,4 +1,8 @@ -## texk/dvipng/ac/dvipng.ac +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options for dvipng m4_define_default([kpse_indent_26], [26])[]dnl AC_ARG_ENABLE([debug], diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac index 7dd79a2f509..102fcee7cf4 100644 --- a/Build/source/texk/dvipng/ac/withenable.ac +++ b/Build/source/texk/dvipng/ac/withenable.ac @@ -1,4 +1,8 @@ -## texk/dvipng/ac/withenable.ac +## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dvipng KPSE_WITH_PROG([dvipng], [kpathsea freetype2 gd t1lib]) m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac]) diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index c3e450ff5f0..e4f5a7ec9cc 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -12902,7 +12902,7 @@ _ACEOF fi -## texk/dvipng/ac/dvipng.ac +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options for dvipng # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then @@ -18391,12 +18391,21 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use libpng" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use libpng" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use libpng" >&5 $as_echo "$as_me: error: cannot find/use libpng" >&2;} { (exit 1); exit 1; }; } fi +fi + + CPPFLAGS="$CPPFLAGS $GD_INCLUDES" LIBS="$GD_LIBS $LIBS" @@ -18492,6 +18501,14 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use libgd +This drawing library can be downloaded at http://www.boutell.com/gd" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use libgd +This drawing library can be downloaded at http://www.boutell.com/gd" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use libgd This drawing library can be downloaded at http://www.boutell.com/gd" >&5 $as_echo "$as_me: error: cannot find/use libgd @@ -18500,6 +18517,9 @@ This drawing library can be downloaded at http://www.boutell.com/gd" >&2;} fi +fi + + CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" LIBS="$KPATHSEA_LIBS $LIBS" @@ -18595,12 +18615,21 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use libkpathsea" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use libkpathsea" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use libkpathsea" >&5 $as_echo "$as_me: error: cannot find/use libkpathsea" >&2;} { (exit 1); exit 1; }; } fi +fi + + { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5 $as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; } if test "${kpse_cv_have_opentype_format+set}" = set; then @@ -19037,11 +19066,20 @@ as_val=`eval 'as_val=${'$as_ac_Header'} _ACEOF else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building dvipng has been disabled and would fail because +cannot find/use $ac_header" >&5 +$as_echo "$as_me: WARNING: building dvipng has been disabled and would fail because +cannot find/use $ac_header" >&2;} +else { { $as_echo "$as_me:$LINENO: error: cannot find/use $ac_header" >&5 $as_echo "$as_me: error: cannot find/use $ac_header" >&2;} { (exit 1); exit 1; }; } fi + +fi + done diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 724086829f5..44d552c2970 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -115,20 +115,20 @@ KPSE_ADD_FLAGS([libpng]) AC_CHECK_FUNC([png_read_image], [AC_DEFINE([HAVE_LIBPNG], 1, [Define to 1 if you have the `png' library (-lpng).])], - [AC_MSG_ERROR([cannot find/use libpng])]) + [KPSE_MSG_ERROR([dvipng], [cannot find/use libpng])]) KPSE_ADD_FLAGS([gd]) AC_CHECK_FUNC([gdImageCreate], [AC_DEFINE([HAVE_LIBGD], 1, [Define to 1 if you have the `gd' library (-lgd).])], - [AC_MSG_ERROR([cannot find/use libgd + [KPSE_MSG_ERROR([dvipng], [cannot find/use libgd This drawing library can be downloaded at http://www.boutell.com/gd])]) KPSE_ADD_FLAGS([kpathsea]) AC_CHECK_FUNC([kpse_set_progname], [AC_DEFINE([HAVE_LIBKPATHSEA], 1, [Define to 1 if you have the `kpathsea' library (-lkpathsea).])], - [AC_MSG_ERROR([cannot find/use libkpathsea])]) + [KPSE_MSG_ERROR([dvipng], [cannot find/use libkpathsea])]) dnl We need enc, cmap, and sfd formats. dnl Introduced together with opentype format (Dec 2003). @@ -154,7 +154,7 @@ AM_CONDITIONAL([have_ft2_or_t1], [test "x$have_ft2_or_t1" = xyes]) dnl Checks for more header files. AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h], , - [AC_MSG_ERROR([cannot find/use $ac_header])]) + [KPSE_MSG_ERROR([dvipng], [cannot find/use $ac_header])]) AC_CHECK_HEADERS([t1lib.h]) dnl Checks for library functions. diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog index 5ee394b78cf..9f48cc4b489 100644 --- a/Build/source/texk/dvipos/ChangeLog +++ b/Build/source/texk/dvipos/ChangeLog @@ -1,3 +1,7 @@ +2009-04-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * dvipos.1 (BUGS): added a missing "\fB=\fP". + 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.in: added AC_CONFIG_HEADERS (moved diff --git a/Build/source/texk/dvipos/Makefile.am b/Build/source/texk/dvipos/Makefile.am index b69a320d140..2519a29bd40 100644 --- a/Build/source/texk/dvipos/Makefile.am +++ b/Build/source/texk/dvipos/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/dvipos/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 diff --git a/Build/source/texk/dvipos/ac/withenable.ac b/Build/source/texk/dvipos/ac/withenable.ac index 6419f1fef39..c4b7525dfba 100644 --- a/Build/source/texk/dvipos/ac/withenable.ac +++ b/Build/source/texk/dvipos/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dvipos/ac/withenable.ac +## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dvipos KPSE_WITH_PROG([dvipos], [kpathsea]) diff --git a/Build/source/texk/dvipos/dvipos.1 b/Build/source/texk/dvipos/dvipos.1 index 14e726b578f..b62172e3fae 100644 --- a/Build/source/texk/dvipos/dvipos.1 +++ b/Build/source/texk/dvipos/dvipos.1 @@ -136,7 +136,7 @@ the .SH BUGS If you specify a file for the \fB-b\fP option, you must join the -option and name with rather than (the more common) space: +option and name with \fB=\fP rather than (the more common) space: .EX dvipos -b=/tmp/debug.pos notes.dvi .EE diff --git a/Build/source/texk/dvipsk/ac/withenable.ac b/Build/source/texk/dvipsk/ac/withenable.ac index 251dfa955fc..82596630bfc 100644 --- a/Build/source/texk/dvipsk/ac/withenable.ac +++ b/Build/source/texk/dvipsk/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/dvipsk/ac/withenable.ac +## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dvipsk KPSE_WITH_PROG([dvipsk], [kpathsea]) diff --git a/Build/source/texk/gsftopk/Makefile.am b/Build/source/texk/gsftopk/Makefile.am index 3684b62d52a..3c5a8b05c34 100644 --- a/Build/source/texk/gsftopk/Makefile.am +++ b/Build/source/texk/gsftopk/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/gsftopk/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -33,7 +37,3 @@ DISTCLEANFILES = gsftopk.1 sedscript EXTRA_DIST = gsftopk1.sed mksedscript -## Eventually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/texk/gsftopk/Makefile.in b/Build/source/texk/gsftopk/Makefile.in index d9af9dc878a..4ab884e0b97 100644 --- a/Build/source/texk/gsftopk/Makefile.in +++ b/Build/source/texk/gsftopk/Makefile.in @@ -237,8 +237,7 @@ dist_gsftopkpsheader_DATA = render.ps gsftopkpsheaderdir = ${prefix}/texmf/dvips/gsftopk nodist_man1_MANS = gsftopk.1 DISTCLEANFILES = gsftopk.1 sedscript -EXTRA_DIST = gsftopk1.sed mksedscript Makefile.in.orig \ - configure.in.orig +EXTRA_DIST = gsftopk1.sed mksedscript all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/gsftopk/ac/withenable.ac b/Build/source/texk/gsftopk/ac/withenable.ac index 94468941099..323fe7654fe 100644 --- a/Build/source/texk/gsftopk/ac/withenable.ac +++ b/Build/source/texk/gsftopk/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/gsftopk/ac/withenable.ac +## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for gsftopk KPSE_WITH_PROG([gsftopk], [kpathsea]) diff --git a/Build/source/texk/gsftopk/c-auto.in b/Build/source/texk/gsftopk/c-auto.in index 2ae77f6e804..5255871b6bb 100644 --- a/Build/source/texk/gsftopk/c-auto.in +++ b/Build/source/texk/gsftopk/c-auto.in @@ -161,6 +161,9 @@ */ #undef LT_OBJDIR +/* Name of package */ +#undef PACKAGE + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -185,6 +188,9 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME +/* Version number of package */ +#undef VERSION + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure index eca543aa4ee..d61053975a4 100755 --- a/Build/source/texk/gsftopk/configure +++ b/Build/source/texk/gsftopk/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for gsftopk for TeX Live 1.19. +# Generated by GNU Autoconf 2.63 for gsftopk for TeX Live 1.19.2. # # Report bugs to <tex-k@tug.org>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gsftopk for TeX Live' PACKAGE_TARNAME='gsftopk-for-tex-live' -PACKAGE_VERSION='1.19' -PACKAGE_STRING='gsftopk for TeX Live 1.19' +PACKAGE_VERSION='1.19.2' +PACKAGE_STRING='gsftopk for TeX Live 1.19.2' PACKAGE_BUGREPORT='tex-k@tug.org' ac_unique_file="gsftopk.c" @@ -1476,7 +1476,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gsftopk for TeX Live 1.19 to adapt to many kinds of systems. +\`configure' configures gsftopk for TeX Live 1.19.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1547,7 +1547,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gsftopk for TeX Live 1.19:";; + short | recursive ) echo "Configuration of gsftopk for TeX Live 1.19.2:";; esac cat <<\_ACEOF @@ -1654,7 +1654,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gsftopk for TeX Live configure 1.19 +gsftopk for TeX Live configure 1.19.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1668,7 +1668,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gsftopk for TeX Live $as_me 1.19, which was +It was created by gsftopk for TeX Live $as_me 1.19.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -6761,9 +6761,18 @@ fi # Define the identity of the package. PACKAGE='gsftopk-for-tex-live' - VERSION='1.19' + VERSION='1.19.2' +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} @@ -7419,11 +7428,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7431: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7426: \$? = $ac_status" >&5 + echo "$as_me:7435: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7758,11 +7767,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7761: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7770: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7765: \$? = $ac_status" >&5 + echo "$as_me:7774: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7863,11 +7872,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7866: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7875: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7870: \$? = $ac_status" >&5 + echo "$as_me:7879: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7918,11 +7927,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7921: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7930: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7925: \$? = $ac_status" >&5 + echo "$as_me:7934: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10718,7 +10727,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10721 "configure" +#line 10730 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10814,7 +10823,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10817 "configure" +#line 10826 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14374,7 +14383,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -gsftopk for TeX Live config.lt 1.19 +gsftopk for TeX Live config.lt 1.19.2 configured by $0, generated by GNU Autoconf 2.63. Copyright (C) 2008 Free Software Foundation, Inc. @@ -15817,7 +15826,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gsftopk for TeX Live $as_me 1.19, which was +This file was extended by gsftopk for TeX Live $as_me 1.19.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15880,7 +15889,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -gsftopk for TeX Live config.status 1.19 +gsftopk for TeX Live config.status 1.19.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Build/source/texk/gsftopk/configure.ac b/Build/source/texk/gsftopk/configure.ac index dffe3176a5f..bbad624ce69 100644 --- a/Build/source/texk/gsftopk/configure.ac +++ b/Build/source/texk/gsftopk/configure.ac @@ -6,14 +6,14 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([gsftopk for TeX Live], [1.19], [tex-k@tug.org]) +AC_INIT([gsftopk for TeX Live], [1.19.2], [tex-k@tug.org]) AC_PREREQ([2.63]) AC_CONFIG_SRCDIR([gsftopk.c]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) dnl Common code for all programs using libkpathsea. -KPSE_COMMON([gsftopk], [no-define]) +KPSE_COMMON([gsftopk]) AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) diff --git a/Build/source/texk/lacheck/Makefile.am b/Build/source/texk/lacheck/Makefile.am index b86f725aa5d..3ac1f44050f 100644 --- a/Build/source/texk/lacheck/Makefile.am +++ b/Build/source/texk/lacheck/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/lacheck/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 diff --git a/Build/source/texk/lacheck/ac/withenable.ac b/Build/source/texk/lacheck/ac/withenable.ac index b1e20cd2fae..ec65f8d6623 100644 --- a/Build/source/texk/lacheck/ac/withenable.ac +++ b/Build/source/texk/lacheck/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/lacheck/ac/withenable.ac +## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for lacheck KPSE_WITH_PROG([lacheck], [kpathsea]) diff --git a/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac b/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac index 22adc8a8b9d..7df15574618 100644 --- a/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac +++ b/Build/source/texk/lcdf-typetools/ac/lcdf-typetools.ac @@ -1,4 +1,8 @@ -## texk/lcdf-typetools/ac/lcdf-typetools.ac +## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options for lcdf-typetools m4_define_default([kpse_indent_26], [26])[]dnl m4_define([kpse_lcdf_typetools_progs], diff --git a/Build/source/texk/lcdf-typetools/ac/withenable.ac b/Build/source/texk/lcdf-typetools/ac/withenable.ac index ea825fd10e1..fdefd1ed472 100644 --- a/Build/source/texk/lcdf-typetools/ac/withenable.ac +++ b/Build/source/texk/lcdf-typetools/ac/withenable.ac @@ -1,4 +1,8 @@ -## texk/lcdf-typetools/ac/withenable.ac +## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for lcdf-typetools KPSE_WITH_PROG([lcdf-typetools], [kpathsea]) m4_include(kpse_TL[texk/lcdf-typetools/ac/lcdf-typetools.ac]) diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index be732244e31..53003774c77 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -17325,7 +17325,6 @@ if test "${enable_cxx_runtime_hack+set}" = set; then fi -cpp_link_hack=false if test "x$GXX:$enable_cxx_runtime_hack" = xyes:yes; then ac_ext=cpp @@ -17857,7 +17856,7 @@ fi -## texk/lcdf-typetools/ac/lcdf-typetools.ac +## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then @@ -19717,6 +19716,28 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "x$with_kpathsea" = xno; then + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +I can't find the kpathsea header and/or library files. Tell me where to look +using the --with-kpathsea-includes=DIR option (header files under +DIR/kpathsea) and --with-kpathsea-libdir=DIR option (library under DIR), or +disable support using --without-kpathsea. + +=========================================" >&5 +$as_echo "$as_me: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +I can't find the kpathsea header and/or library files. Tell me where to look +using the --with-kpathsea-includes=DIR option (header files under +DIR/kpathsea) and --with-kpathsea-libdir=DIR option (library under DIR), or +disable support using --without-kpathsea. + +=========================================" >&2;} +else { { $as_echo "$as_me:$LINENO: error: ========================================= @@ -19736,6 +19757,9 @@ disable support using --without-kpathsea. =========================================" >&2;} { (exit 1); exit 1; }; } +fi + + fi fi if test "x$with_kpathsea" != xno; then @@ -22824,7 +22848,23 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi if test $ac_ntoh_defined = no; then - { { $as_echo "$as_me:$LINENO: error: + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +Cannot find a definition for ntohs and/or ntohl! + +=========================================" >&5 +$as_echo "$as_me: WARNING: building lcdf-typetools has been disabled and would fail because + +========================================= + +Cannot find a definition for ntohs and/or ntohl! + +=========================================" >&2;} +else + { { $as_echo "$as_me:$LINENO: error: ========================================= Cannot find a definition for ntohs and/or ntohl! @@ -22838,6 +22878,9 @@ Cannot find a definition for ntohs and/or ntohl! =========================================" >&2;} { (exit 1); exit 1; }; } fi + + +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index fcd61407b1c..d0870155c1d 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -73,7 +73,7 @@ if test "x$with_kpathsea" != xno; then with_kpathsea=no]) if test "x$with_kpathsea" = xno; then - AC_MSG_ERROR([ + KPSE_MSG_ERROR([lcdf-typetools], [ ========================================= I can't find the kpathsea header and/or library files. Tell me where to look @@ -245,7 +245,7 @@ ac_ntoh_defined=yes], fi fi if test $ac_ntoh_defined = no; then - AC_MSG_ERROR([ + KPSE_MSG_ERROR([lcdf-typetools], [ ========================================= Cannot find a definition for ntohs and/or ntohl! diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am index fb4b84be96f..bd79df8b929 100644 --- a/Build/source/texk/makeindexk/Makefile.am +++ b/Build/source/texk/makeindexk/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/makeindexk/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -31,8 +35,3 @@ dist_man1_MANS = makeindex.1 mkindex.1 EXTRA_DIST = ACK CONTRIB FILES NOTES PORTING -## Eventually delete these files -## - -EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in index 40605344e00..ec258fc48a7 100644 --- a/Build/source/texk/makeindexk/Makefile.in +++ b/Build/source/texk/makeindexk/Makefile.in @@ -239,8 +239,7 @@ makeindex_SOURCES = \ makeindex_DEPENDENCIES = $(KPATHSEA_DEPEND) LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = makeindex.1 mkindex.1 -EXTRA_DIST = ACK CONTRIB FILES NOTES PORTING Makefile.in.orig \ - configure.in.orig +EXTRA_DIST = ACK CONTRIB FILES NOTES PORTING all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/makeindexk/ac/withenable.ac b/Build/source/texk/makeindexk/ac/withenable.ac index ca58bc1bbe5..d00b0ab0a42 100644 --- a/Build/source/texk/makeindexk/ac/withenable.ac +++ b/Build/source/texk/makeindexk/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/makeindexk/ac/withenable.ac +## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for makeindexk KPSE_WITH_PROG([makeindexk], [kpathsea]) diff --git a/Build/source/texk/musixflx/Makefile.am b/Build/source/texk/musixflx/Makefile.am index 38b41323824..4f1a2b295be 100644 --- a/Build/source/texk/musixflx/Makefile.am +++ b/Build/source/texk/musixflx/Makefile.am @@ -1,9 +1,9 @@ +## Makefile.am for the TeX Live subdirectory texk/musixflx/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 bin_PROGRAMS = musixflx -## Eventually delete these files -## -EXTRA_DIST = Makefile.in.orig configure.in.orig - diff --git a/Build/source/texk/musixflx/Makefile.in b/Build/source/texk/musixflx/Makefile.in index 8ff62dd6366..60010024425 100644 --- a/Build/source/texk/musixflx/Makefile.in +++ b/Build/source/texk/musixflx/Makefile.in @@ -162,7 +162,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = Makefile.in.orig configure.in.orig all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/musixflx/ac/withenable.ac b/Build/source/texk/musixflx/ac/withenable.ac index 520e1ed0b12..7fcb84a537b 100644 --- a/Build/source/texk/musixflx/ac/withenable.ac +++ b/Build/source/texk/musixflx/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/musixflx/ac/withenable.ac +## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for musixflx KPSE_WITH_PROG([musixflx]) diff --git a/Build/source/texk/ps2pkm/Makefile.am b/Build/source/texk/ps2pkm/Makefile.am index d44f26eb843..f9aa20a7caf 100644 --- a/Build/source/texk/ps2pkm/Makefile.am +++ b/Build/source/texk/ps2pkm/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/ps2pkm/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -121,7 +125,3 @@ EXTRA_DIST = \ types.h \ usenet -## Eventually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/texk/ps2pkm/Makefile.in b/Build/source/texk/ps2pkm/Makefile.in index c2ffb62accf..c46eedf0cfd 100644 --- a/Build/source/texk/ps2pkm/Makefile.in +++ b/Build/source/texk/ps2pkm/Makefile.in @@ -300,14 +300,47 @@ ps2pk_SOURCES = \ ps2pk_DEPENDENCIES = $(KPATHSEA_DEPEND) LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1 -EXTRA_DIST = CHANGES.type1 INSTALLATION README.14m README.type1 \ - Xstuff.h basename.c blues.h cluts.h digit.h ffilest.h \ - flisearch.c font.h fontfile.h fontmisc.h fonts.h fontstruct.h \ - fontxlfd.h fsmasks.h hdigit.h pictures.h pktest.c protos.h \ - psearch.c psearch.h sexpr.c strexpr.c strexpr.h strokes.h \ - t1hdigit.h t1imager.h t1intf.h t1stdio.h t1test.c texfiles.c \ - texfiles.h tokst.h trig.h types.h usenet Makefile.in.orig \ - configure.in.orig +EXTRA_DIST = \ + CHANGES.type1 \ + INSTALLATION \ + README.14m \ + README.type1 \ + Xstuff.h \ + basename.c \ + blues.h \ + cluts.h \ + digit.h \ + ffilest.h \ + flisearch.c \ + font.h \ + fontfile.h \ + fontmisc.h \ + fonts.h \ + fontstruct.h \ + fontxlfd.h \ + fsmasks.h \ + hdigit.h \ + pictures.h \ + pktest.c \ + protos.h \ + psearch.c \ + psearch.h \ + sexpr.c \ + strexpr.c \ + strexpr.h \ + strokes.h \ + t1hdigit.h \ + t1imager.h \ + t1intf.h \ + t1stdio.h \ + t1test.c \ + texfiles.c \ + texfiles.h \ + tokst.h \ + trig.h \ + types.h \ + usenet + all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/ps2pkm/ac/withenable.ac b/Build/source/texk/ps2pkm/ac/withenable.ac index 72351528f8d..d517dcb468d 100644 --- a/Build/source/texk/ps2pkm/ac/withenable.ac +++ b/Build/source/texk/ps2pkm/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/ps2pkm/ac/withenable.ac +## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for ps2pkm KPSE_WITH_PROG([ps2pkm], [kpathsea]) diff --git a/Build/source/texk/seetexk/Makefile.am b/Build/source/texk/seetexk/Makefile.am index 73976e00fab..7fe873c1e04 100644 --- a/Build/source/texk/seetexk/Makefile.am +++ b/Build/source/texk/seetexk/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/deetexk/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 diff --git a/Build/source/texk/seetexk/ac/withenable.ac b/Build/source/texk/seetexk/ac/withenable.ac index 75c55e50ffc..e4b11948e59 100644 --- a/Build/source/texk/seetexk/ac/withenable.ac +++ b/Build/source/texk/seetexk/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/seetexk/ac/withenable.ac +## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for seetexk KPSE_WITH_PROG([seetexk], [kpathsea]) diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am index e258ee1fbc2..6aa2b88b715 100644 --- a/Build/source/texk/tetex/Makefile.am +++ b/Build/source/texk/tetex/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/tetex/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -103,6 +107,7 @@ install-exec-hook: && $(LN_S) allcm allec \ && $(LN_S) fmtutil mktexfmt \ && $(LN_S) kpsetool kpsexpand \ + && $(LN_S) kpsetool kpsepath \ && $(LN_S) mktexlsr texhash install-data-hook: @@ -138,7 +143,7 @@ EXTRA_DIST = \ README.a2ping \ README.texdoctk -## Not yet used +## Not used ## EXTRA_DIST += \ doc/Makefile \ @@ -150,23 +155,12 @@ EXTRA_DIST += \ win32/epstopdf.c \ win32/epstopdf.txt -## Evenyually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig - -################# - -# Auxiliary files. -extra-install-data:: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texpooldir) $(texmf)/doc/tetex - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x - -# -# This target is invoked by the top-level make, -# to create the per-format engine symlinks in $(bindir), -# after everything else is installed. We explicitly specify the -# fmtutil.cnf file to use for the sake of distro builds. Also, that way -# we don't have to run mktexlsr also. +## +## This target is invoked by the top-level make, +## to create the per-format engine symlinks in $(bindir), +## after everything else is installed. We explicitly specify the +## fmtutil.cnf file to use for the sake of distro builds. Also, that way +## we don't have to run mktexlsr also. run_texlinks = $(bindir)/texlinks -f $(web2cdir)/fmtutil.cnf run-texlinks: PATH="$(bindir):$(PATH)"; export PATH; $(run_texlinks) diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index 1cca3f126c3..26f99774950 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -263,15 +263,7 @@ web2cdir = ${prefix}/texmf/web2c dist_web2c_DATA = fmtutil.cnf EXTRA_DIST = README.a2ping README.texdoctk doc/Makefile \ doc/TETEXDOC.bib doc/TETEXDOC.tex fontinst.bat pdfetex-pl.pool \ - updmap.pl win32/epstopdf.c win32/epstopdf.txt Makefile.in.orig \ - configure.in.orig - -# -# This target is invoked by the top-level make, -# to create the per-format engine symlinks in $(bindir), -# after everything else is installed. We explicitly specify the -# fmtutil.cnf file to use for the sake of distro builds. Also, that way -# we don't have to run mktexlsr also. + updmap.pl win32/epstopdf.c win32/epstopdf.txt run_texlinks = $(bindir)/texlinks -f $(web2cdir)/fmtutil.cnf all: all-am @@ -754,6 +746,7 @@ install-exec-hook: && $(LN_S) allcm allec \ && $(LN_S) fmtutil mktexfmt \ && $(LN_S) kpsetool kpsexpand \ + && $(LN_S) kpsetool kpsepath \ && $(LN_S) mktexlsr texhash install-data-hook: @@ -784,13 +777,6 @@ uninstall-hook: && rm -f allec.1 ctangle.1 cweave.1 fmtutil-sys.1 kpsexpand.1 \ kpsepath.1 lambda.1 mf-nowin.1 mktexfmt.1 odvicopy.1 \ odvitype.1 pdflatex.1 texconfig-sys.1 texhash.1 updmap-sys.1 - -################# - -# Auxiliary files. -extra-install-data:: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texpooldir) $(texmf)/doc/tetex - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x run-texlinks: PATH="$(bindir):$(PATH)"; export PATH; $(run_texlinks) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/texk/tetex/ac/withenable.ac b/Build/source/texk/tetex/ac/withenable.ac index 56eef59d965..91ceb8cf219 100644 --- a/Build/source/texk/tetex/ac/withenable.ac +++ b/Build/source/texk/tetex/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/tetex/ac/withenable.ac +## texk/tetex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tetex/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for tetex KPSE_WITH_PROG([tetex], , , [teTeX scripts]) diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index 5cdc69a7e15..407782f8d36 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/tex4htk/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -24,8 +28,14 @@ shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex EXTRA_DIST = $(perl_scripts) $(shell_scripts) -install-exec-hook: - $(mkdir_p) "$(DESTDIR)$(tex4htdir)" "$(DESTDIR)$(bindir)" +## Make sure $(tex4htdir) exists +## +tex4ht_subdir = texmf-dist/scripts/tex4ht +tex4htdir = ${prefix}/$(tex4ht_subdir) +tex4ht_SCRIPTS = + +## We support both multiplatform and non-multiplatform builds. +install-data-hook: @for p in $(perl_scripts); do \ echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \ $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.pl"; \ @@ -34,25 +44,41 @@ install-exec-hook: echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.sh'"; \ $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \ done + case "$(bindir)" in \ + */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ + */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \ + *) echo "strange directory '$(bindir)' for linked scripts" >&2; \ + exit 1;; \ + esac + +## Make sure $(bindir) exists +## +bin_SCRIPTS = + +## Link to the basename, removing the extension, +.PHONY: install-links +install-links: @cd $(DESTDIR)$(bindir) && \ for p in $(perl_scripts); do \ - echo "$(LN_S) $(tex4htrel)/$$p.pl $$p"; \ - rm -f $$p; $(LN_S) $(tex4htrel)/$$p.pl $$p; \ - done; \ + rm -f $$p; \ + echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \ + $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \ + done && \ for p in $(shell_scripts); do \ - echo "$(LN_S) $(tex4htrel)/$$p.sh $$p"; \ - rm -f $$p; $(LN_S) $(tex4htrel)/$$p.sh $$p; \ + rm -f $$p; \ + echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \ + $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \ done uninstall-hook: - @for p in $(perl_scripts) $(shell_scripts); do \ - echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \ - rm -f "$(DESTDIR)$(bindir)/$$p"; \ - done @for p in $(perl_scripts:=.pl) $(shell_scripts:=.sh); do \ echo "rm -f '$(DESTDIR)$(tex4htdir)/$$p'"; \ rm -f "$(DESTDIR)$(tex4htdir)/$$p"; \ done + @for p in $(perl_scripts) $(shell_scripts); do \ + echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \ + rm -f "$(DESTDIR)$(bindir)/$$p"; \ + done ## Not used ## @@ -175,7 +201,3 @@ EXTRA_DIST += \ dist-hook: rm -rf `find $(distdir) -name .svn` -## Eventually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 7fd946adb9b..f56c6e38df7 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -14,6 +14,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,7 +64,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = c-auto.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(tex4htdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_t4ht_OBJECTS = t4ht.$(OBJEXT) @@ -73,6 +75,9 @@ am__DEPENDENCIES_1 = am_tex4ht_OBJECTS = tex4ht.$(OBJEXT) tex4ht_OBJECTS = $(am_tex4ht_OBJECTS) tex4ht_LDADD = $(LDADD) +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +tex4htSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) $(tex4ht_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -211,8 +216,6 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -tex4htdir = @tex4htdir@ -tex4htrel = @tex4htrel@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -242,8 +245,11 @@ EXTRA_DIST = $(perl_scripts) $(shell_scripts) dbcontext dblatex \ uxhcontext uxhlatex uxhmex uxhtex uxhtexi uxhxelatex uxhxetex \ wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \ xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \ - xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java \ - Makefile.in.orig configure.in.orig + xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java +tex4ht_subdir = texmf-dist/scripts/tex4ht +tex4htdir = ${prefix}/$(tex4ht_subdir) +tex4ht_SCRIPTS = +bin_SCRIPTS = all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -333,6 +339,44 @@ t4ht$(EXEEXT): $(t4ht_OBJECTS) $(t4ht_DEPENDENCIES) tex4ht$(EXEEXT): $(tex4ht_OBJECTS) $(tex4ht_DEPENDENCIES) @rm -f tex4ht$(EXEEXT) $(LINK) $(tex4ht_OBJECTS) $(tex4ht_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done +install-tex4htSCRIPTS: $(tex4ht_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(tex4htdir)" || $(MKDIR_P) "$(DESTDIR)$(tex4htdir)" + @list='$(tex4ht_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(tex4htSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(tex4htdir)/$$f'"; \ + $(tex4htSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(tex4htdir)/$$f"; \ + else :; fi; \ + done + +uninstall-tex4htSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(tex4ht_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(tex4htdir)/$$f'"; \ + rm -f "$(DESTDIR)$(tex4htdir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -556,9 +600,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) c-auto.h +all-am: Makefile $(PROGRAMS) $(SCRIPTS) c-auto.h installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(tex4htdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -606,13 +650,13 @@ info: info-am info-am: -install-data-am: +install-data-am: install-tex4htSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am -install-exec-am: install-binPROGRAMS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-html: install-html-am @@ -646,11 +690,12 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-tex4htSCRIPTS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: install-am install-exec-am install-strip uninstall-am +.MAKE: install-am install-data-am install-strip uninstall-am .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool ctags dist \ @@ -659,21 +704,22 @@ uninstall-am: uninstall-binPROGRAMS distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ - 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 uninstall-binPROGRAMS uninstall-hook + install-binPROGRAMS install-binSCRIPTS install-data \ + install-data-am install-data-hook 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 \ + install-tex4htSCRIPTS 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 \ + uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-hook \ + uninstall-tex4htSCRIPTS @KPATHSEA_RULE@ -install-exec-hook: - $(mkdir_p) "$(DESTDIR)$(tex4htdir)" "$(DESTDIR)$(bindir)" +install-data-hook: @for p in $(perl_scripts); do \ echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \ $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.pl"; \ @@ -682,25 +728,36 @@ install-exec-hook: echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.sh'"; \ $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \ done + case "$(bindir)" in \ + */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ + */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \ + *) echo "strange directory '$(bindir)' for linked scripts" >&2; \ + exit 1;; \ + esac + +.PHONY: install-links +install-links: @cd $(DESTDIR)$(bindir) && \ for p in $(perl_scripts); do \ - echo "$(LN_S) $(tex4htrel)/$$p.pl $$p"; \ - rm -f $$p; $(LN_S) $(tex4htrel)/$$p.pl $$p; \ - done; \ + rm -f $$p; \ + echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \ + $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \ + done && \ for p in $(shell_scripts); do \ - echo "$(LN_S) $(tex4htrel)/$$p.sh $$p"; \ - rm -f $$p; $(LN_S) $(tex4htrel)/$$p.sh $$p; \ + rm -f $$p; \ + echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \ + $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \ done uninstall-hook: - @for p in $(perl_scripts) $(shell_scripts); do \ - echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \ - rm -f "$(DESTDIR)$(bindir)/$$p"; \ - done @for p in $(perl_scripts:=.pl) $(shell_scripts:=.sh); do \ echo "rm -f '$(DESTDIR)$(tex4htdir)/$$p'"; \ rm -f "$(DESTDIR)$(tex4htdir)/$$p"; \ done + @for p in $(perl_scripts) $(shell_scripts); do \ + echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \ + rm -f "$(DESTDIR)$(bindir)/$$p"; \ + done dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/tex4htk/ac/withenable.ac b/Build/source/texk/tex4htk/ac/withenable.ac index d2396d98304..e79a0d42611 100644 --- a/Build/source/texk/tex4htk/ac/withenable.ac +++ b/Build/source/texk/tex4htk/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/tex4htk/ac/withenable.ac +## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for tex4htk KPSE_WITH_PROG([tex4htk], [kpathsea]) diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index 1e8d4a2f5d7..491c4f69731 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -788,8 +788,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS -tex4htrel -tex4htdir KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS @@ -4171,13 +4169,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4174: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4172: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4177: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4175: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4180: output\"" >&5) + (eval echo "\"\$as_me:4178: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5383,7 +5381,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5386 "configure"' > conftest.$ac_ext + echo '#line 5384 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7430,11 +7428,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7433: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7431: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7437: \$? = $ac_status" >&5 + echo "$as_me:7435: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7769,11 +7767,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7772: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7770: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7776: \$? = $ac_status" >&5 + echo "$as_me:7774: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7874,11 +7872,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7877: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7875: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7881: \$? = $ac_status" >&5 + echo "$as_me:7879: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7929,11 +7927,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7932: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7930: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7936: \$? = $ac_status" >&5 + echo "$as_me:7934: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10729,7 +10727,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10732 "configure" +#line 10730 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10825,7 +10823,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10828 "configure" +#line 10826 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14532,16 +14530,6 @@ ${top_builddir}/../kpathsea/paths.h: fi -tex4ht_subdir='texmf-dist/scripts/tex4ht' -tex4htdir="\${prefix}/$tex4ht_subdir" - -if test "x$bindir" = 'x${exec_prefix}/bin'; then - tex4htrel="../$tex4ht_subdir" -else - tex4htrel="../../$tex4ht_subdir" -fi - - ac_config_files="$ac_config_files Makefile" diff --git a/Build/source/texk/tex4htk/configure.ac b/Build/source/texk/tex4htk/configure.ac index f997cc9dde6..a55f6ff90dc 100644 --- a/Build/source/texk/tex4htk/configure.ac +++ b/Build/source/texk/tex4htk/configure.ac @@ -21,17 +21,6 @@ AC_CHECK_SIZEOF([int]) KPSE_KPATHSEA_FLAGS -tex4ht_subdir='texmf-dist/scripts/tex4ht' -tex4htdir="\${prefix}/$tex4ht_subdir" -AC_SUBST([tex4htdir]) -dnl This is not quite right, should actually be decided by 'make install' -if test "x$bindir" = 'x${exec_prefix}/bin'; then - tex4htrel="../$tex4ht_subdir" -else - tex4htrel="../../$tex4ht_subdir" -fi -AC_SUBST([tex4htrel]) - AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/texk/tex4htk/java/DbUtilities.java b/Build/source/texk/tex4htk/java/DbUtilities.java index 887d22b16be..887d22b16be 100755..100644 --- a/Build/source/texk/tex4htk/java/DbUtilities.java +++ b/Build/source/texk/tex4htk/java/DbUtilities.java diff --git a/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java b/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java index 28eff6c12b3..28eff6c12b3 100755..100644 --- a/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java +++ b/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am index d09b751a307..7bb044d9d83 100644 --- a/Build/source/texk/texlive/Makefile.am +++ b/Build/source/texk/texlive/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/texlive/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -85,7 +89,3 @@ EXTRA_DIST = \ xevirtex \ xmltex -## Evenyually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig c-auto.in - diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in index 3ce1547c0e3..44c67d7d7db 100644 --- a/Build/source/texk/texlive/Makefile.in +++ b/Build/source/texk/texlive/Makefile.in @@ -162,26 +162,84 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = linked_scripts dist_man1_MANS = getnonfreefonts-sys.man getnonfreefonts.man -EXTRA_DIST = amstex amstex.bat blue.bat cont-cz.bat cont-de \ - cont-de.bat cont-en cont-en.bat cont-nl cont-nl.bat \ - cont-ro.bat cont-uk.bat cslatex cslatex.bat cslatexd.bat \ - cslatexi.bat cslatexk.bat csplain csplain.bat csplaind.bat \ - csplaini.bat csplaink.bat einitex elatex elatex.bat eplain \ - eplain.bat evirtex giftopng hugelatex hugelatex.bat hugetex \ - hugetex.bat inimf inimpost iniomega initex jadetex jadetex.bat \ - lambda lamstex.bat latex lollipop.bat mex mex.bat mex-pl.bat \ - mllatex mllatex.bat mltex mltex.bat mptopdf nts pdfcslatex \ - pdfcslatex.bat pdfcslatexd.bat pdfcslatexi.bat pdfcslatexk.bat \ - pdfcsplain pdfcsplain.bat pdfcsplaind.bat pdfcsplaini.bat \ - pdfcsplaink.bat pdfeinitex pdfemex-pl.bat pdfevirtex pdfinitex \ - pdfjadetex pdfjadetex.bat pdflatex pdfmex pdfmex.bat \ - pdfmex-pl.bat pdfplatex pdfplatex-pl.bat pdftexinfo \ - pdftexinfo.bat pdfvirtex pdfxmltex physe physe.bat phyzzx \ - phyzzx.bat platex platex.bat platex-pl.bat startex startex.bat \ - texinfo texinfo.bat texsis texsis.bat text1 text1.bat \ - tl-w32-starter.bat tl-w32-wrapper.texlua virmf virmpost \ - viromega virtex xeinitex xelatex xevirtex xmltex \ - Makefile.in.orig configure.in.orig c-auto.in +EXTRA_DIST = \ + amstex amstex.bat \ + blue.bat \ + cont-cz.bat \ + cont-de cont-de.bat \ + cont-en cont-en.bat \ + cont-nl cont-nl.bat \ + cont-ro.bat \ + cont-uk.bat \ + cslatex cslatex.bat \ + cslatexd.bat \ + cslatexi.bat \ + cslatexk.bat \ + csplain csplain.bat \ + csplaind.bat \ + csplaini.bat \ + csplaink.bat \ + einitex \ + elatex elatex.bat \ + eplain eplain.bat \ + evirtex \ + giftopng \ + hugelatex hugelatex.bat \ + hugetex hugetex.bat \ + inimf \ + inimpost \ + iniomega \ + initex \ + jadetex jadetex.bat \ + lambda lamstex.bat \ + latex \ + lollipop.bat \ + mex mex.bat \ + mex-pl.bat \ + mllatex mllatex.bat \ + mltex mltex.bat \ + mptopdf \ + nts \ + pdfcslatex pdfcslatex.bat \ + pdfcslatexd.bat \ + pdfcslatexi.bat \ + pdfcslatexk.bat \ + pdfcsplain pdfcsplain.bat \ + pdfcsplaind.bat \ + pdfcsplaini.bat \ + pdfcsplaink.bat \ + pdfeinitex \ + pdfemex-pl.bat \ + pdfevirtex \ + pdfinitex \ + pdfjadetex pdfjadetex.bat \ + pdflatex \ + pdfmex pdfmex.bat \ + pdfmex-pl.bat \ + pdfplatex \ + pdfplatex-pl.bat \ + pdftexinfo pdftexinfo.bat \ + pdfvirtex \ + pdfxmltex \ + physe physe.bat \ + phyzzx phyzzx.bat \ + platex platex.bat \ + platex-pl.bat \ + startex startex.bat \ + texinfo texinfo.bat \ + texsis texsis.bat \ + text1 text1.bat \ + tl-w32-starter.bat \ + tl-w32-wrapper.texlua \ + virmf \ + virmpost \ + viromega \ + virtex \ + xeinitex \ + xelatex \ + xevirtex \ + xmltex + all: all-recursive .SUFFIXES: diff --git a/Build/source/texk/texlive/ac/withenable.ac b/Build/source/texk/texlive/ac/withenable.ac index f8d4a113a92..974153136a2 100644 --- a/Build/source/texk/texlive/ac/withenable.ac +++ b/Build/source/texk/texlive/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/texlive/ac/withenable.ac +## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for texlive KPSE_WITH_PROG([texlive], , , [TeX Live scripts]) diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 963df8bd689..20877952a41 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/texlive/linked_scripts/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ## TeX Live's extra scripts. @@ -123,21 +127,21 @@ install-links: rm -f $$target; \ echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \ $(LN_S) $(REL)/texmf/scripts/$$s $$target; \ - done; \ + done && \ for s in $(nobase_dist_script_SCRIPTS); do \ target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ target=$$target; \ rm -f $$target; \ echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \ $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target; \ - done; \ - rm -rf getnonfreefonts-sys; \ - echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'"; \ - $(LN_S) getnonfreefonts getnonfreefonts-sys; \ + done && \ + rm -rf getnonfreefonts-sys && \ + echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'" && \ + $(LN_S) getnonfreefonts getnonfreefonts-sys && \ ## man dir link for those mans which can use it. - rm -f man; \ - echo "creating link 'man' -> '$(REL)/texmf/doc/man'"; \ - ln -s $(REL)/texmf/doc/man man || : + rm -f man && \ + echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \ + (ln -s $(REL)/texmf/doc/man man || :) uninstall-hook: @for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 4f1c129dac5..954857b620b 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -212,6 +212,7 @@ nobase_dist_script_SCRIPTS = \ splitindex/perl/splitindex.pl \ svn-multi/svn-multi.pl \ texcount/TeXcount.pl \ + texdirflatten/texdirflatten \ texloganalyser/texloganalyser \ thumbpdf/thumbpdf.pl \ vpe/vpe.pl @@ -476,20 +477,20 @@ install-links: rm -f $$target; \ echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \ $(LN_S) $(REL)/texmf/scripts/$$s $$target; \ - done; \ + done && \ for s in $(nobase_dist_script_SCRIPTS); do \ target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ target=$$target; \ rm -f $$target; \ echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \ $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target; \ - done; \ - rm -rf getnonfreefonts-sys; \ - echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'"; \ - $(LN_S) getnonfreefonts getnonfreefonts-sys; \ - rm -f man; \ - echo "creating link 'man' -> '$(REL)/texmf/doc/man'"; \ - ln -s $(REL)/texmf/doc/man man || : + done && \ + rm -rf getnonfreefonts-sys && \ + echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'" && \ + $(LN_S) getnonfreefonts getnonfreefonts-sys && \ + rm -f man && \ + echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \ + (ln -s $(REL)/texmf/doc/man man || :) uninstall-hook: @for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \ diff --git a/Build/source/texk/ttf2pk/Makefile.am b/Build/source/texk/ttf2pk/Makefile.am index b62e57fc11c..976e0a634a0 100644 --- a/Build/source/texk/ttf2pk/Makefile.am +++ b/Build/source/texk/ttf2pk/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/ttf2pk/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -70,7 +74,7 @@ LDADD = $(KPATHSEA_LIBS) $(FREETYPE_LIBS) dist_man1_MANS = ttf2pk.1 ttf2tfm.1 -## Not yet used +## Not used ## EXTRA_DIST = \ data \ @@ -89,7 +93,3 @@ EXTRA_DIST = \ dist-hook: rm -rf `find $(distdir) -name .svn` -## Eventually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in index 8fb369026b1..79e9ebe8cb8 100644 --- a/Build/source/texk/ttf2pk/Makefile.in +++ b/Build/source/texk/ttf2pk/Makefile.in @@ -286,9 +286,19 @@ ttf2tfm_SOURCES = \ ttf2tfm_DEPENDENCIES = $(KPATHSEA_DEPEND) $(FREETYPE_DEPEND) LDADD = $(KPATHSEA_LIBS) $(FREETYPE_LIBS) dist_man1_MANS = ttf2pk.1 ttf2tfm.1 -EXTRA_DIST = data BUGS MakeSub.in Makefile.dm dvidrv.btm dvidrv.doc \ - emdir.c emdir.h emtexdir.c emtexdir.h ttf2pk.doc \ - Makefile.in.orig configure.in.orig +EXTRA_DIST = \ + data \ + BUGS \ + MakeSub.in \ + Makefile.dm \ + dvidrv.btm \ + dvidrv.doc \ + emdir.c \ + emdir.h \ + emtexdir.c \ + emtexdir.h \ + ttf2pk.doc + all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/ttf2pk/ac/withenable.ac b/Build/source/texk/ttf2pk/ac/withenable.ac index 1e64469d4de..6709c989f42 100644 --- a/Build/source/texk/ttf2pk/ac/withenable.ac +++ b/Build/source/texk/ttf2pk/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/ttf2pk/ac/withenable.ac +## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for ttf2pk KPSE_WITH_PROG([ttf2pk], [kpathsea freetype]) diff --git a/Build/source/texk/ttfdump/ac/withenable.ac b/Build/source/texk/ttfdump/ac/withenable.ac index 5cd30903341..14dcb612872 100644 --- a/Build/source/texk/ttfdump/ac/withenable.ac +++ b/Build/source/texk/ttfdump/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/ttfdump/ac/withenable.ac +## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for ttfdump KPSE_WITH_PROG([ttfdump], [kpathsea]) diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am index 6b3ec3846e5..36d4d1b71b8 100644 --- a/Build/source/texk/web2c/alephdir/am/aleph.am +++ b/Build/source/texk/web2c/alephdir/am/aleph.am @@ -8,9 +8,11 @@ endif ALEPH EXTRA_PROGRAMS += aleph ## With --enable-ipc, Aleph may need to link with -lsocket. -aleph_LDADD = $(LDADD) $(socketlibs) +aleph_LDADD = $(LDADD) $(ipc_socketlibs) aleph_CPPFLAGS = -I$(srcdir)/alephdir $(AM_CPPFLAGS) + +## Aleph C sources aleph_c_h = alephini.c aleph0.c aleph1.c aleph2.c aleph3.c alephcoerce.h alephd.h nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c alephextra.c aleph_SOURCES = \ @@ -28,15 +30,18 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines $(web2c) aleph echo timestamp >$@ touch $(aleph_c_h) +aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h + $(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@ alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@ + +## Tangling Aleph aleph.p aleph.pool: aleph-tangle aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch $(otangle) aleph aleph echo timestamp >$@ touch aleph.p aleph.pool -aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h - $(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@ + ## Generate aleph.web aleph_web_srcs = \ tex.web \ @@ -64,6 +69,7 @@ aleph_web_srcs = \ alephdir/eochar.ch aleph.web: $(TIE) $(aleph_web_srcs) $(tie) -m aleph.web $(aleph_web_srcs) + ## Generate aleph.ch aleph_ch_srcs = \ alephdir/com16bit.ch \ @@ -80,7 +86,10 @@ aleph_ch_srcs = \ alephdir/ceostuff.ch aleph.ch: $(TIE) aleph.web $(aleph_ch_srcs) $(tie) -c aleph.ch aleph.web $(aleph_ch_srcs) + +## EXTRA_DIST += $(aleph_web_srcs) $(aleph_ch_srcs) lib/texmfmp.c + DISTCLEANFILES += $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c \ aleph.p aleph.pool aleph-tangle diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index b43eeeed711..bcecb570e5f 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -19,7 +19,7 @@ EXTRA_PROGRAMS += tex tex_CPPFLAGS = ## With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(socketlibs) +tex_LDADD = $(LDADD) $(ipc_socketlibs) tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 29c033eb7c7..d6a6d066686 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -10,33 +10,42 @@ EXTRA_PROGRAMS += etex etex_CPPFLAGS = ## With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(socketlibs) +etex_LDADD = $(LDADD) $(ipc_socketlibs) +## e-TeX C sources etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c etexdir/etexextra.h + $(etex_c_h): etex-web2c etex-web2c: etex.p $(web2c_texmf) $(web2c) etex : $(synctex_convert_etex) echo timestamp >$@ touch $(etex_c_h) + +etex-pool.c: etex.pool $(makecpool) tmf-pool.h + $(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ + etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@ + +etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version + sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \ + $(srcdir)/etexdir/etexextra.in >$@ + +## Tangling e-TeX etex.p etex.pool: etex-tangle etex-tangle: tangle$(EXEEXT) etex.web etex.ch $(tangle) etex etex echo timestamp >$@ touch etex.p etex.pool -etex-pool.c: etex.pool $(makecpool) tmf-pool.h - $(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ + ## Extract etex version etexdir/etex.version: etexdir/etex.ch $(mkdir_p) etexdir grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version -etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version - sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \ - $(srcdir)/etexdir/etexextra.in >$@ + ## Generate etex.web etex.web: $(TIE) $(etex_web_srcs) $(tie) -m etex.web $(etex_web_srcs) @@ -44,6 +53,7 @@ etex_web_srcs = \ tex.web \ etexdir/etex.ch \ etexdir/etex.fix + ## Generate etex.ch etex.ch: $(TIE) etex.web $(etex_ch_srcs) $(tie) -c etex.ch etex.web $(etex_ch_srcs) @@ -55,6 +65,7 @@ etex_ch_srcs = \ etexdir/tex.ch1 \ etexdir/tex.ech \ etexdir/etex-binpool.ch + ## EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \ lib/texmfmp.c tmf-pool.h diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am index 4e26a01fe5d..578a49ace02 100644 --- a/Build/source/texk/web2c/synctexdir/am/synctex.am +++ b/Build/source/texk/web2c/synctexdir/am/synctex.am @@ -160,11 +160,45 @@ EXTRA_DIST += \ ## SyncTeX infrastructure: XeTeX +if XETEX_SYNCTEX + +xetex_CPPFLAGS += -I$(srcdir)/synctexdir + +xetex_ch_synctex = \ + synctexdir/synctex-mem.ch0 \ + synctexdir/synctex-e-mem.ch0 \ + synctexdir/synctex-e-mem.ch1 \ + synctexdir/synctex-xe-mem.ch2 \ + synctexdir/synctex-rec.ch0 \ + synctexdir/synctex-e-rec.ch0 \ + synctexdir/synctex-xe-rec.ch2 + +xetex_post_ch_synctex = \ + synctexdir/synctex-xe-rec.ch3 + +dist_xetex_SOURCES = \ + synctexdir/synctex.h \ + synctexdir/synctex-common.h \ + synctexdir/synctex-xetex.h + +nodist_xetex_SOURCES += \ + synctex-xe.c + +synctex_convert_xetex = && $(SHELL) $(srcdir)/synctexdir/synctex-convert.sh xetex + +else !XETEX_SYNCTEX + +synctex_convert_xetex = && echo "warning: SyncTeX for e-TeX is NOT enabled" + +endif !XETEX_SYNCTEX + +synctex-xe.c: xetexd.h synctexdir/synctex.c $(dist_xetex_SOURCES) + sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/synctexdir/synctex.c >$@ + EXTRA_DIST += \ synctexdir/synctex-xe-mem.ch2 \ synctexdir/synctex-xe-rec.ch2 \ - synctexdir/synctex-xe-rec.ch3 \ - synctexdir/synctex-xetex.h + synctexdir/synctex-xe-rec.ch3 ## Eventually delete these files ## diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog index f7d72f90706..4c6aafa2047 100644 --- a/Build/source/texk/web2c/web2c/ChangeLog +++ b/Build/source/texk/web2c/web2c/ChangeLog @@ -1,3 +1,9 @@ +2009-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> + + * convert: use ${basefile}coerce.hx, not x${basefile}coerce.h + as temp file name such that coverting etex does not destroy + xetexcoerce.h. + 2009-03-29 Peter Breitenlohner <peb@mppmu.mpg.de> * common.defines, convert, fixwrites.c, splitup.c: remove all diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert index 82f2cd3fe83..38f350ada57 100755 --- a/Build/source/texk/web2c/web2c/convert +++ b/Build/source/texk/web2c/web2c/convert @@ -148,8 +148,8 @@ case $basefile in ;; tex|etex|luatex|pdftex|aleph|mf|mp|xetex) sleep 2 # so timestamps are definitely later, to avoid make weirdness - cat ${basefile}coerce.h $srcdir/web2c/coerce.h >x${basefile}coerce.h - mv x${basefile}coerce.h ${basefile}coerce.h + cat ${basefile}coerce.h $srcdir/web2c/coerce.h >${basefile}coerce.hx + mv ${basefile}coerce.hx ${basefile}coerce.h touch ${basefile}d.h ;; esac diff --git a/Build/source/texk/xdv2pdf/ac/withenable.ac b/Build/source/texk/xdv2pdf/ac/withenable.ac index 5cf14d7e517..a543a2b1dd3 100644 --- a/Build/source/texk/xdv2pdf/ac/withenable.ac +++ b/Build/source/texk/xdv2pdf/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/xdv2pdf/ac/withenable.ac +## texk/xdv2pdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdv2pdf/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for xdv2pdf KPSE_WITH_PROG([xdv2pdf], [kpathsea]) diff --git a/Build/source/texk/xdvik/CHANGES b/Build/source/texk/xdvik/CHANGES index 6d35196a501..140079efa46 100644 --- a/Build/source/texk/xdvik/CHANGES +++ b/Build/source/texk/xdvik/CHANGES @@ -9,7 +9,7 @@ Versions containing major changes are marked as `beta'; these may contain undetected bugs. Such versions shouldn't be used by distributors. - * 22.84.15: + * 22.84.15 (2009-03-02): + Fixed #2067614: Re-introduced default binding for key 0 which had been forgotten in previous changes + Fixed #1502137 (compiler warnings on 64bit systems) diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL index b94b7e7f4a2..a6b82ec8956 100644 --- a/Build/source/texk/xdvik/ChangeLog.TL +++ b/Build/source/texk/xdvik/ChangeLog.TL @@ -1,16 +1,27 @@ -ChangeLog: Changes for xdvik (teTeX / TeX Live) -=============================================== +ChangeLog.TL: Changes for xdvik (teTeX / TeX Live) +================================================== + +2009-04-18 Peter Breitenlohner <peb@mppmu.mpg.de> + + * CHANGES: fixed version/relase-date such that mksedscript can + extract them. + + * xdvi.1.in (warnspecials): fixed duplicate entry, removing + an #ifkpathsea without matching #endif. + +2009-03-31 Peter Breitenlohner <peb@mppmu.mpg.de> -2009-03-31 Imported ftp://tug.org/tex/xdvik-22.84.15.tar.gz and adapted to new TeX Live build system (Automake & Co.). + Renamed original files XXX -> XXX-22.84.15. * squeeze.c (removed): File moved ... * squeeze/squeeze.c (new): ... to here. Don't include any system dependent kpathsea headers, such that squeeze/ can be configured separately for the build system. -2008-07-01 +2008-07-01 Peter Breitenlohner <peb@mppmu.mpg.de> + Imported ftp://tug.org/tex/xdvik-22.84.14.tar.gz and adapted to new TeX Live build system (autoconf-2.59+). @@ -47,6 +58,7 @@ ChangeLog: Changes for xdvik (teTeX / TeX Live) * aclocal.m4, c-auto.in, configure: Regenerated. 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> + * acinclude.m4: added quotes to DEFUN's first args, added AC_DEFINES's third arg to provide autoheader templates ... * configure.in, withenable.ac: added AC_DEFINES's third arg to provide @@ -54,6 +66,7 @@ ChangeLog: Changes for xdvik (teTeX / TeX Live) * acconfig.h: ... removed. 2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> + Convert from autoconf-2.13 to autoconf-2.59+: * configure.in (AC_PREREQ): Require autoconf-2.59. * Makefile.in, gui/Makefile.in: Add @configure_input@ lines. diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am index 3946ec9e04a..9bfee87afca 100644 --- a/Build/source/texk/xdvik/Makefile.am +++ b/Build/source/texk/xdvik/Makefile.am @@ -1,118 +1,105 @@ +## Makefile.am for the TeX Live subdirectory texk/xdvik/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -SUBDIRS = squeeze gui - -INCLUDES = -I$(srcdir)/gui -INCLUDES += $(PS_DEF) -INCLUDES += $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) -INCLUDES += $(X_CFLAGS) +SUBDIRS = squeeze gui . tests -bin_SCRIPTS = xdvi - -bin_PROGRAMS = xdvi-bin +include common.am -nodist_xdvi_bin_SOURCES = psheader.c +INCLUDES = -I$(srcdir)/gui $(common_includes) -xdvi_bin_SOURCES = \ +noinst_HEADERS = \ 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 \ - main.c \ - 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-config.h \ xdvi-debug.h \ - xdvi.c \ xdvi.h \ - xserver-info.c \ xserver-info.h -xdvi_bin_DEPENDENCIES = gui/libgui.a $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) +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 + +bin_SCRIPTS = xdvi -# Make `#include <X11/...>' and `-lX...' work. -# This matches web2c (needed only for Metafont). -## x_cppflags=@X_CFLAGS@ @iconv_includes@ -## x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@ -## x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@ +bin_PROGRAMS = xdvi-bin -# Follow the library order used in X11R6 itself. -# It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put -# x_xpm_libs after the tool_libs -- but before -lX11, since on MacOSX it -# uses XGrabServer and XUngrabServer, which would otherwise be -# unresolved with static libraries. -# Xmu needs to come before Xt and after the toolkit libs. -xdvi_x_libs = $(X_LIBS) $(x_tool_libs) $(x_xmu_lib) -lXt $(X_PRE_LIBS) -xdvi_x_libs += $(x_ext_lib) $(x_xpm_libs) -lX11 $(X_EXTRA_LIBS) +xdvi_bin_SOURCES = main.c -LDADD = gui/libgui.a $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) +xdvi_bin_DEPENDENCIES = libxdvi.a gui/libgui.a libxdvi.a $(common_dependencies) -gui/libgui.a: - cd gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a +LDADD = libxdvi.a gui/libgui.a $(common_ldadd) -## Rebuild libkpathsea -@KPATHSEA_RULE@ -## Rebuild libt1 -@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 $@ @@ -123,6 +110,17 @@ squeeze/squeeze$(EXEEXT): EXTRA_DIST = psheader.txt CLEANFILES = psheader.c +nodist_man1_MANS = xdvi.1 + +xdvi.1: xdvi.1.in sedscript + sed -f sedscript <$(srcdir)/xdvi.1.in >$@ + +sedscript: mksedscript CHANGES Makefile c-auto.h + $(SHELL) $(srcdir)/mksedscript $(srcdir) $(DEFS) $(PS_DEF) >$@ + +EXTRA_DIST += mksedscript xdvi.1.in +CLEANFILES += sedscript xdvi.1 + xdvidir = ${prefix}/texmf/xdvi dist_xdvi_DATA = texmf/XDvi @@ -156,7 +154,6 @@ EXTRA_DIST += \ README.t1fonts \ README.t1mapper \ m4/acinclude.m4 \ - mksedscript \ pixmaps/drag_horiz.xbm \ pixmaps/drag_horiz_mask.xbm \ pixmaps/drag_omni.xbm \ @@ -176,15 +173,6 @@ EXTRA_DIST += \ pixmaps/xdvi48x48.xpm \ t1mapper \ t1mapper.1 \ - tests/Makefile.in \ - tests/README \ - tests/run_tests.c \ - tests/run_tests.h \ - tests/test1.c \ - tests/test_dl_list.c \ - tests/test_string_list.c \ - tests/test_string_utils.c \ - tests/test_util.c \ texmf-alt/README \ texmf-alt/charter2.map \ texmf-alt/lucida.map \ @@ -193,7 +181,6 @@ EXTRA_DIST += \ texmf-alt/xdvifont.map \ texmf-alt/xypic.map \ xdvi-search.el \ - xdvi.1.in \ xdvi.icon \ xdvizilla \ xdvizilla.1 @@ -224,13 +211,6 @@ EXTRA_DIST += \ ## Eventually delete these files ## EXTRA_DIST += \ - Makefile.in.orig \ Makefile.in.work \ - configure.in.orig \ - configure.in.work \ - gui/Makefile.in.orig \ - kpathsea.ac.orig \ - tests/Makefile.in.orig \ - withenable.ac.orig \ - withenable.ac.work + configure.in.work diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in index 261fb60e109..ec9f621caa4 100644 --- a/Build/source/texk/xdvik/Makefile.in +++ b/Build/source/texk/xdvik/Makefile.in @@ -16,6 +16,8 @@ + + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,25 +36,24 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = xdvi-bin$(EXEEXT) -subdir = . DIST_COMMON = $(am__configure_deps) $(dist_noinst_DATA) \ - $(dist_pixmap_DATA) $(dist_xdvi_DATA) \ + $(dist_pixmap_DATA) $(dist_xdvi_DATA) $(noinst_HEADERS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/c-auto.in $(srcdir)/xdvi-sh.in \ - $(top_srcdir)/configure ../../build-aux/config.guess \ - ../../build-aux/config.sub ../../build-aux/depcomp \ - ../../build-aux/install-sh ../../build-aux/ltmain.sh \ - ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap + $(srcdir)/Makefile.in $(srcdir)/c-auto.in $(srcdir)/common.am \ + $(srcdir)/xdvi-sh.in $(top_srcdir)/configure \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/ltmain.sh ../../build-aux/missing \ + ../../build-aux/texinfo.tex ../../build-aux/ylwrap +bin_PROGRAMS = xdvi-bin$(EXEEXT) +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-arg-string.m4 \ - $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \ +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 \ @@ -82,29 +83,43 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = c-auto.h CONFIG_CLEAN_FILES = xdvi -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_xdvi_bin_OBJECTS = browser.$(OBJEXT) dl_list.$(OBJEXT) \ +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +libxdvi_a_AR = $(AR) $(ARFLAGS) +libxdvi_a_LIBADD = +am_libxdvi_a_OBJECTS = browser.$(OBJEXT) dl_list.$(OBJEXT) \ dvi-draw.$(OBJEXT) dvi-init.$(OBJEXT) dvisel.$(OBJEXT) \ encodings.$(OBJEXT) events.$(OBJEXT) exit-handlers.$(OBJEXT) \ filehist.$(OBJEXT) font-open.$(OBJEXT) gf.$(OBJEXT) \ - hypertex.$(OBJEXT) image-magick.$(OBJEXT) main.$(OBJEXT) \ - mime.$(OBJEXT) my-snprintf.$(OBJEXT) my-vsnprintf.$(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) -nodist_xdvi_bin_OBJECTS = psheader.$(OBJEXT) -xdvi_bin_OBJECTS = $(am_xdvi_bin_OBJECTS) $(nodist_xdvi_bin_OBJECTS) + 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) +nodist_libxdvi_a_OBJECTS = psheader.$(OBJEXT) +libxdvi_a_OBJECTS = $(am_libxdvi_a_OBJECTS) \ + $(nodist_libxdvi_a_OBJECTS) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pixmapdir)" \ + "$(DESTDIR)$(xdvidir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_xdvi_bin_OBJECTS = main.$(OBJEXT) +xdvi_bin_OBJECTS = $(am_xdvi_bin_OBJECTS) xdvi_bin_LDADD = $(LDADD) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_3) +am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_4) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ @@ -119,8 +134,9 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(xdvi_bin_SOURCES) $(nodist_xdvi_bin_SOURCES) -DIST_SOURCES = $(xdvi_bin_SOURCES) +SOURCES = $(libxdvi_a_SOURCES) $(nodist_libxdvi_a_SOURCES) \ + $(xdvi_bin_SOURCES) +DIST_SOURCES = $(libxdvi_a_SOURCES) $(xdvi_bin_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -128,6 +144,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +man1dir = $(mandir)/man1 +NROFF = nroff +MANS = $(nodist_man1_MANS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -137,6 +156,7 @@ 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 @@ -166,10 +186,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -235,7 +251,6 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -288,130 +303,127 @@ 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@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 -SUBDIRS = squeeze gui -INCLUDES = -I$(srcdir)/gui $(PS_DEF) $(KPATHSEA_INCLUDES) \ - $(T1LIB_INCLUDES) $(X_CFLAGS) -bin_SCRIPTS = xdvi -nodist_xdvi_bin_SOURCES = psheader.c -xdvi_bin_SOURCES = \ +SUBDIRS = squeeze gui . 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) +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$(srcdir)/gui $(common_includes) +noinst_HEADERS = \ 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 \ - main.c \ - 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-config.h \ xdvi-debug.h \ - xdvi.c \ xdvi.h \ - xserver-info.c \ xserver-info.h -xdvi_bin_DEPENDENCIES = gui/libgui.a $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) - -# Make `#include <X11/...>' and `-lX...' work. -# This matches web2c (needed only for Metafont). - -# Follow the library order used in X11R6 itself. -# It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put -# x_xpm_libs after the tool_libs -- but before -lX11, since on MacOSX it -# uses XGrabServer and XUngrabServer, which would otherwise be -# unresolved with static libraries. -# Xmu needs to come before Xt and after the toolkit libs. -xdvi_x_libs = $(X_LIBS) $(x_tool_libs) $(x_xmu_lib) -lXt $(X_PRE_LIBS) \ - $(x_ext_lib) $(x_xpm_libs) -lX11 $(X_EXTRA_LIBS) -LDADD = gui/libgui.a $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs) -EXTRA_DIST = psheader.txt BUGS CHANGES ChangeLog.TL FAQ LESSTIF-BUGS \ - README.t1fonts README.t1mapper m4/acinclude.m4 mksedscript \ - pixmaps/drag_horiz.xbm pixmaps/drag_horiz_mask.xbm \ - pixmaps/drag_omni.xbm pixmaps/drag_omni_mask.xbm \ - pixmaps/drag_vert.xbm pixmaps/drag_vert_mask.xbm \ - pixmaps/fist.xbm pixmaps/fist_mask.xbm pixmaps/hand.xbm \ - pixmaps/hand_mask.xbm pixmaps/magglass.xbm \ - pixmaps/magglass_mask.xbm pixmaps/time16.xbm \ - pixmaps/time16_mask.xbm pixmaps/xdvi16x16.xpm \ - pixmaps/xdvi32x32.xpm pixmaps/xdvi48x48.xpm t1mapper \ - t1mapper.1 tests/Makefile.in tests/README tests/run_tests.c \ - tests/run_tests.h tests/test1.c tests/test_dl_list.c \ - tests/test_string_list.c tests/test_string_utils.c \ - tests/test_util.c texmf-alt/README texmf-alt/charter2.map \ - texmf-alt/lucida.map texmf-alt/marvosym.map texmf-alt/xdvi.cfg \ +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 + +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) +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 \ + pixmaps/drag_horiz_mask.xbm pixmaps/drag_omni.xbm \ + pixmaps/drag_omni_mask.xbm pixmaps/drag_vert.xbm \ + pixmaps/drag_vert_mask.xbm pixmaps/fist.xbm \ + pixmaps/fist_mask.xbm pixmaps/hand.xbm pixmaps/hand_mask.xbm \ + pixmaps/magglass.xbm pixmaps/magglass_mask.xbm \ + pixmaps/time16.xbm pixmaps/time16_mask.xbm \ + pixmaps/xdvi16x16.xpm pixmaps/xdvi32x32.xpm \ + pixmaps/xdvi48x48.xpm t1mapper t1mapper.1 texmf-alt/README \ + texmf-alt/charter2.map texmf-alt/lucida.map \ + texmf-alt/marvosym.map texmf-alt/xdvi.cfg \ texmf-alt/xdvifont.map texmf-alt/xypic.map xdvi-search.el \ - xdvi.1.in xdvi.icon xdvizilla xdvizilla.1 Makefile.in-22.84.14 \ + xdvi.icon xdvizilla xdvizilla.1 Makefile.in-22.84.14 \ acconfig.h-22.84.14 acinclude.m4-22.84.14 aclocal.m4-22.84.14 \ configure.in-22.84.14 kpathsea.ac-22.84.14 \ withenable.ac-22.84.14 Makefile.in-22.84.15 \ acconfig.h-22.84.15 aclocal.m4-22.84.15 configure.in-22.84.15 \ gui/Makefile.in-22.84.15 kpathsea.ac-22.84.15 \ tests/Makefile.in-22.84.15 withenable.ac-22.84.15 \ - Makefile.in.orig Makefile.in.work configure.in.orig \ - configure.in.work gui/Makefile.in.orig kpathsea.ac.orig \ - tests/Makefile.in.orig withenable.ac.orig withenable.ac.work -CLEANFILES = psheader.c + Makefile.in.work configure.in.work +CLEANFILES = psheader.c sedscript xdvi.1 +nodist_man1_MANS = xdvi.1 xdvidir = ${prefix}/texmf/xdvi dist_xdvi_DATA = texmf/XDvi pixmapdir = ${prefix}/texmf/xdvi/pixmap @@ -424,7 +436,7 @@ all: c-auto.h .SUFFIXES: .c .lo .o .obj am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(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*) \ @@ -474,6 +486,13 @@ distclean-hdr: -rm -f c-auto.h stamp-h1 xdvi: $(top_builddir)/config.status $(srcdir)/xdvi-sh.in cd $(top_builddir) && $(SHELL) ./config.status $@ + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +libxdvi.a: $(libxdvi_a_OBJECTS) $(libxdvi_a_DEPENDENCIES) + -rm -f libxdvi.a + $(libxdvi_a_AR) libxdvi.a $(libxdvi_a_OBJECTS) $(libxdvi_a_LIBADD) + $(RANLIB) libxdvi.a install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -550,7 +569,6 @@ distclean-compile: @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)/pk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-internal.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@ @@ -596,6 +614,39 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +install-man1: $(nodist_man1_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(nodist_man1_MANS)'; \ + for i in $$list; do \ + if test -f $$i; then file=$$i; \ + else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(nodist_man1_MANS)'; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done install-dist_pixmapDATA: $(dist_pixmap_DATA) @$(NORMAL_INSTALL) test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)" @@ -911,10 +962,11 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) c-auto.h +all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ + $(HEADERS) c-auto.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xdvidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -944,7 +996,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstLIBRARIES mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -963,7 +1016,8 @@ info: info-recursive info-am: -install-data-am: install-dist_pixmapDATA install-dist_xdviDATA +install-data-am: install-dist_pixmapDATA install-dist_xdviDATA \ + install-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -975,7 +1029,7 @@ install-html: install-html-recursive install-info: install-info-recursive -install-man: +install-man: install-man1 install-pdf: install-pdf-recursive @@ -1004,48 +1058,58 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-dist_pixmapDATA uninstall-dist_xdviDATA + uninstall-dist_pixmapDATA uninstall-dist_xdviDATA \ + uninstall-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +uninstall-man: uninstall-man1 + .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ install-data-am install-strip uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ - dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-binSCRIPTS install-data \ - install-data-am install-data-hook install-dist_pixmapDATA \ - install-dist_xdviDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-generic clean-libtool clean-noinstLIBRARIES ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-binSCRIPTS \ + install-data install-data-am install-data-hook \ + install-dist_pixmapDATA install-dist_xdviDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-dist_pixmapDATA uninstall-dist_xdviDATA \ - uninstall-hook + uninstall-hook uninstall-man uninstall-man1 -gui/libgui.a: - cd gui && $(MAKE) $(AM_MAKEFLAGS) libgui.a - @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 $@ squeeze/squeeze$(EXEEXT): cd squeeze && $(MAKE) $(AM_MAKEFLAGS) +xdvi.1: xdvi.1.in sedscript + sed -f sedscript <$(srcdir)/xdvi.1.in >$@ + +sedscript: mksedscript CHANGES Makefile c-auto.h + $(SHELL) $(srcdir)/mksedscript $(srcdir) $(DEFS) $(PS_DEF) >$@ + install-data-hook: @if grep "original xdvi.cfg --" "$(DESTDIR)$(xdvidir)/xdvi.cfg" >/dev/null 2>&1 \ || test ! -r "$(DESTDIR)$(xdvidir)/xdvi.cfg"; then \ diff --git a/Build/source/texk/xdvik/Makefile.in.work b/Build/source/texk/xdvik/Makefile.in.work index ebe2efcbe40..217b7488978 100644 --- a/Build/source/texk/xdvik/Makefile.in.work +++ b/Build/source/texk/xdvik/Makefile.in.work @@ -1,57 +1,3 @@ -# @configure_input@ -# Makefile for xdvik -# - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -### hack to prevent linking with kpathsea by default -kpathsea= -kpse_include ../make/programs.mk -kpse_include ../make/cross.mk - -all_subdirs = gui tests - -CPP = @CPP@ - -# Make `#include <X11/...>' and `-lX...' work. -# This matches web2c (needed only for Metafont). -x_cppflags=@X_CFLAGS@ @iconv_includes@ -x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@ -x_pre_libs=@X_PRE_LIBS@ -x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@ -x_tool_libs=@x_tool_libs@ -x_xmu_lib=@x_xmu_lib@ -x_xpm_libs=@x_xpm_libs@ -# -lXp and -lXext -x_ext_lib=@x_ext_lib@ - -LDLIBT1=@LDLIBT1@ -LIBT1CPPFLAGS=@LIBT1CPPFLAGS@ -LIBT1DEP=@LIBT1DEP@ -LIBT1DIR=../../libs/t1lib -LIBTYPE1DIR=$(LIBT1DIR)/../type1 -LIBT1SRCDIR=$(srcdir)/$(LIBT1DIR) - -# additional flags for kpathsea -LDLIBKPATHSEA=@LDLIBKPATHSEA@ -LIBKPATHSEACPPFLAGS=@LIBKPATHSEACPPFLAGS@ -LIBKPATHSEADEP=@LIBKPATHSEADEP@ - -# Follow the library order used in X11R6 itself. -# It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put -# x_xpm_libs after the tool_libs -- but before -lX11, since on MacOSX it -# uses XGrabServer and XUngrabServer, which would otherwise be -# unresolved with static libraries. -# Xmu needs to come before Xt and after the toolkit libs. -x_link = $(LDLIBT1) $(LDLIBKPATHSEA) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) - -TESTS=./tests/run_tests -TESTS_DEP=$(TESTS) - -# various xdvik GUI elements -LIBGUI=./gui/libgui.a -LIBGUIDEP=$(LIBGUI) - # Extra xdvi-specific compiler options. # xdvi_defs = @PS_DEF@ -DXSERVER_INFO -DNEW_MENU_CREATION @@ -60,83 +6,16 @@ xdvi_defs = @PS_DEF@ -DXDVI_KPSE_PROG_NAME=@wrapper_script@ prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(LIBKPATHSEACPPFLAGS) $(xdvi_defs) \ -I$(srcdir)/gui $(x_cppflags) -# Note: to be able to use one depend.mk file for both Motif/Xaw (which -# is needed since only maintainers are supposed to invoke `make depend') -# we include *all* object files and have tests for #ifdef MOTIF/XAW inside -# the files. -objects = \ - browser.o \ - dl_list.o \ - dvi-draw.o \ - dvi-init.o \ - dvisel.o \ - encodings.o \ - events.o \ - exit-handlers.o \ - filehist.o \ - font-open.o \ - gf.o \ - string_list.o \ - hypertex.o \ - image-magick.o \ - main.o \ - mime.o \ - my-snprintf.o \ - my-vsnprintf.o \ - pagehist.o \ - pk.o \ - print-internal.o \ - psdps.o \ - psgs.o \ - psheader.o \ - psnews.o \ - read-mapfile.o \ - search-internal.o \ - special.o \ - string-utils.o \ - tfmload.o \ - util.o \ - vf.o \ - xdvi.o \ - xserver-info.o \ - x_util.o # t1mapper or its man page are currently not being installed, since they # aren't needed on most current (teTeX) systems perlprog = t1mapper -manpage = xdvi - -default all: libguibuild @final_exec_name@ $(manpage).1 - -$(LIBGUI): - cd gui; $(MAKE) $(makeargs) libgui.a -$(TESTS): - cd tests; $(MAKE) $(makeargs) - -### we need this additional target so that libgui is always checked to be up-to-date ... -libguibuild: - cd gui; $(MAKE) $(makeargs) libgui.a - -test: - cd tests; $(MAKE) $(makeargs) test - -test_verbose: - cd tests; $(MAKE) $(makeargs) test_verbose +default all: @final_exec_name@ @final_exec_name@: $(LIBKPATHSEADEP) $(objects) $(LIBT1DEP) $(LIBGUIDEP) $(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES) -$(manpage).1: xdvi.1.in sedscript - sed -f sedscript <$(srcdir)/xdvi.1.in >$@ - -sedscript: mksedscript c-auto.h - $(SHELL) $(srcdir)/mksedscript $(srcdir) pkpath sizes vfpath \ - figpath headerpath $(DEFS) $(prog_cflags) >$@ - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - install-exec: @final_exec_name@ $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(INSTALL_LIBTOOL_PROG) @final_exec_name@ $(bindir) @@ -149,24 +28,6 @@ uninstall-exec: for p in @wrapper_script@ o@wrapper_script@; do rm -f $(scriptdir)/$$p; done install-data: $(manpage).1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps - $(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext) rm -f $(man1dir)/o$(manpage).$(manext) ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext) -uninstall-data: - rm -f $(man1dir)/$(manpage).$(manext) - -distname = xdvik -program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \ - MOTIF -version_files = xdvi.c - - -clean:: - rm -f $(manpage).1 *.flc @final_exec_name@ - -distclean:: - rm -f psheader.c sedscript $(manpage).1 *.flc *~ @final_exec_name@ xdvi-sh - diff --git a/Build/source/texk/xdvik/ac/withenable.ac b/Build/source/texk/xdvik/ac/withenable.ac index 1ca6258613f..1156ac51f71 100644 --- a/Build/source/texk/xdvik/ac/withenable.ac +++ b/Build/source/texk/xdvik/ac/withenable.ac @@ -1,4 +1,8 @@ -## texk/xdvik/ac/withenable.ac +## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for xdvik KPSE_WITH_PROG([xdvik], [kpathsea t1lib]) m4_include(kpse_TL[texk/xdvik/ac/xdvik.ac]) diff --git a/Build/source/texk/xdvik/ac/xdvik.ac b/Build/source/texk/xdvik/ac/xdvik.ac index 6b27c444ba2..424c50e6375 100644 --- a/Build/source/texk/xdvik/ac/xdvik.ac +++ b/Build/source/texk/xdvik/ac/xdvik.ac @@ -1,4 +1,8 @@ -## texk/xdvik/ac/xdvik.ac +## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options for xdvik AC_ARG_WITH([xdvi-x-toolkit], AS_HELP_STRING([--with-xdvi-x-toolkit=KIT], diff --git a/Build/source/texk/xdvik/aclocal.m4 b/Build/source/texk/xdvik/aclocal.m4 index 11918b73fde..98d54f98a33 100644 --- a/Build/source/texk/xdvik/aclocal.m4 +++ b/Build/source/texk/xdvik/aclocal.m4 @@ -904,7 +904,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/xdvi-arg-string.m4]) m4_include([m4/xdvi-c-bitmap-type.m4]) m4_include([m4/xdvi-cc-concat.m4]) m4_include([m4/xdvi-find-motif.m4]) diff --git a/Build/source/texk/xdvik/c-auto.in b/Build/source/texk/xdvik/c-auto.in index 4e7ffe41bb5..284e99a20b1 100644 --- a/Build/source/texk/xdvik/c-auto.in +++ b/Build/source/texk/xdvik/c-auto.in @@ -114,12 +114,18 @@ /* Define to 1 if you have the <iconv.h> header file. */ #undef HAVE_ICONV_H +/* Define to 1 if you have the <ieeefp.h> header file. */ +#undef HAVE_IEEEFP_H + /* Define to 1 if you have the `index' function. */ #undef HAVE_INDEX /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `isinf' function. */ +#undef HAVE_ISINF + /* Define to 1 if you have the <langinfo.h> header file. */ #undef HAVE_LANGINFO_H @@ -323,6 +329,9 @@ */ #undef LT_OBJDIR +/* Define to use ImageMagick */ +#undef MAGICK + /* Define to use the Motif toolkit. */ #undef MOTIF @@ -347,6 +356,18 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE +/* The size of `unsigned char', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_CHAR + +/* The size of `unsigned int', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_INT + +/* The size of `unsigned long', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG + +/* The size of `unsigned short', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_SHORT + /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. diff --git a/Build/source/texk/xdvik/common.am b/Build/source/texk/xdvik/common.am new file mode 100644 index 00000000000..f2b19aa6e50 --- /dev/null +++ b/Build/source/texk/xdvik/common.am @@ -0,0 +1,35 @@ +## texk/xdvik/common.am: Makefile fragment for the TeX Live subdirectory texk/xdvik/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. +## +## Make `#include <X11/...>' work. +x_cppflags = $(X_CFLAGS) $(iconv_includes) +common_includes = $(PS_DEF) $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) $(x_cppflags) + +## Make `-lX...' work. Follow the library order used in X11R6 itself. +## +## Since libXaw7 needs libXpm we put x_xpm_libs after the tool_libs, +## but before -lX11. +## libXp may be needed by libXm and libXaw (the now defunct libXaw8), +## if required libXp has been added to x_ext_lib. +## libXmu needs to come before Xt and after the toolkit libs. +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) +xdvi_x_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) + +## Dependencies for libxdvi.a and gui/libgui.a +## +libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_builddir}/psheader.c +libgui_dependencies = ${top_srcdir}/*.h ${top_srcdir}/print-internal.c ${top_srcdir}/gui/*.[ch] + +## Rebuild libkpathsea +@KPATHSEA_RULE@ +## Rebuild libt1 +@T1LIB_RULE@ + diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure index a4c4f171094..9a49616890f 100755 --- a/Build/source/texk/xdvik/configure +++ b/Build/source/texk/xdvik/configure @@ -804,6 +804,7 @@ iconv_libpath final_exec_name x_tool_libs x_xpm_libs +x_ext_lib x_xmu_lib x_linker_options X_EXTRA_LIBS @@ -813,13 +814,6 @@ X_CFLAGS XMKMF LIBOBJS ALLOCA -CXXCPP -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -ac_ct_CXX -CXXFLAGS -CXX PS_DEF CPP OTOOL64 @@ -943,8 +937,8 @@ enable_largefile with_xdvi_x_toolkit with_ps enable_a4 -enable_magick with_x +enable_magick with_xpm with_xpm_includes with_xpm_libraries @@ -970,10 +964,6 @@ LDFLAGS LIBS CPPFLAGS CPP -CXX -CXXFLAGS -CCC -CXXCPP XMKMF' ac_subdirs_all='squeeze' @@ -1644,8 +1634,7 @@ Optional Packages: --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-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 @@ -1671,9 +1660,6 @@ Some influential environment variables: CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help @@ -4257,13 +4243,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4260: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4246: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4263: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4249: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4266: output\"" >&5) + (eval echo "\"\$as_me:4252: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5469,7 +5455,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5472 "configure"' > conftest.$ac_ext + echo '#line 5458 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7516,11 +7502,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7519: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7505: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7523: \$? = $ac_status" >&5 + echo "$as_me:7509: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7855,11 +7841,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7858: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7844: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7862: \$? = $ac_status" >&5 + echo "$as_me:7848: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7960,11 +7946,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7963: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7949: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7967: \$? = $ac_status" >&5 + echo "$as_me:7953: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8015,11 +8001,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8018: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8004: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8022: \$? = $ac_status" >&5 + echo "$as_me:8008: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10815,7 +10801,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10818 "configure" +#line 10804 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10911,7 +10897,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10914 "configure" +#line 10900 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12916,1760 +12902,42 @@ _ACEOF fi -## texk/xdvik/ac/xdvik.ac -## 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 - withval=$with_ps; -fi - -case $with_ps in - "" | yes | gs) PS_DEF=-DPS_GS ;; - no) PS_DEF= ;; - dps) PS_DEF=-DPS_DPS ;; - news) PS_DEF=-DPS_NEWS ;; - *) { $as_echo "$as_me:$LINENO: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&5 -$as_echo "$as_me: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&2;} - PS_DEF=-DPS_GS ;; -esac - - - - -cat >>confdefs.h <<\_ACEOF -#define GREY 1 -_ACEOF - - - -cat >>confdefs.h <<\_ACEOF -#define COLOR 1 -_ACEOF - - - - - -cat >>confdefs.h <<\_ACEOF -#define T1LIB 1 -_ACEOF - - - -# Check whether --enable-a4 was given. -if test "${enable_a4+set}" = set; then - enableval=$enable_a4; -fi - -if test "x$enable_a4" = xno; then - { $as_echo "$as_me:$LINENO: Disabled a4/cm, using letter/in instead" >&5 -$as_echo "$as_me: Disabled a4/cm, using letter/in instead" >&6;} -else - -cat >>confdefs.h <<\_ACEOF -#define A4 1 -_ACEOF - -fi - - -# Check whether --enable-magick was given. -if test "${enable_magick+set}" = set; then - enableval=$enable_magick; -fi - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -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_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -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_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -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_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+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. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -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_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -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_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -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_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +{ $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 $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + 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. */ -int -main () -{ -#ifndef __GNUC__ - choke me +/* 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 - - ; - 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - +char pow (); int main () { - +return pow (); ; 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -_lt_caught_CXX_error=yes; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - - ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX +for ac_lib in '' m; do + if test -z "$ac_lib"; then + ac_res="none required" else - $as_unset lt_cv_path_LD + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' - else - lt_prog_compiler_no_builtin_flag_CXX= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break - ;; - *) - test "$with_gnu_ld" != yes && break - ;; - esac - fi - done - IFS="$lt_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi - -LD="$lt_cv_path_LD" -if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -*) - lt_cv_prog_gnu_ld=no - ;; -esac -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec_CXX='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -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 conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -14684,25 +12952,13 @@ $as_echo "$ac_try_echo") >&5 cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + 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 - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + ac_cv_search_pow=$ac_res else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -14712,2422 +12968,106 @@ fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - - - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - - else - ld_shlibs_CXX=no - fi - - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no - ;; - - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - - gnu*) - ;; - - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - inherit_rpath_CXX=yes - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 will use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - xl*) - # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_CXX=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - ld_shlibs_CXX=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=echo - else - ld_shlibs_CXX=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; - esac - - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - - { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" - LD_CXX="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - # Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF - -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - compiler_lib_search_dirs_CXX= -if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_CXX='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - - - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16016: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:16020: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $RM conftest* - + conftest$ac_exeext + if test "${ac_cv_search_pow+set}" = set; then + break fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac +done +if test "${ac_cv_search_pow+set}" = set; then + : else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - + ac_cv_search_pow=no fi - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5 +$as_echo "$ac_cv_search_pow" >&6; } +ac_res=$ac_cv_search_pow +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= fi +## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ +## configure options for xdvik - - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16115: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:16119: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - +# 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: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16167: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:16171: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - +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 -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no +# Check whether --with-ps was given. +if test "${with_ps+set}" = set; then + withval=$with_ps; fi - - - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -with_gnu_ld_CXX=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; +case $with_ps in + "" | yes | gs) PS_DEF=-DPS_GS ;; + no) PS_DEF= ;; + dps) PS_DEF=-DPS_DPS ;; + news) PS_DEF=-DPS_NEWS ;; + *) { $as_echo "$as_me:$LINENO: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&5 +$as_echo "$as_me: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&2;} + PS_DEF=-DPS_GS ;; esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib<name>.so - # instead of lib<name>.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<\_ACEOF +#define GREY 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes -fi - -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 conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; +cat >>confdefs.h <<\_ACEOF +#define COLOR 1 +_ACEOF -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; +cat >>confdefs.h <<\_ACEOF +#define T1LIB 1 +_ACEOF -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +# Check whether --enable-a4 was given. +if test "${enable_a4+set}" = set; then + enableval=$enable_a4; fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || - test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi +if test "x$enable_a4" = xno; then + { $as_echo "$as_me:$LINENO: Disabled a4/cm, using letter/in instead" >&5 +$as_echo "$as_me: Disabled a4/cm, using letter/in instead" >&6;} else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - +cat >>confdefs.h <<\_ACEOF +#define A4 1 +_ACEOF - fi # test -n "$compiler" - - CC=$lt_save_CC - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +fi ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" @@ -20759,19 +16699,268 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi -{ $as_echo "$as_me:$LINENO: checking for integer type to use in bitmaps" >&5 -$as_echo_n "checking for integer type to use in bitmaps... " >&6; } -if test "${xdvi_cv_bitmap_type+set}" = set; then +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5 +$as_echo_n "checking size of unsigned long... " >&6; } +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)]; +test_array [0] = 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_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +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. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)]; +test_array [0] = 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_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)]; +test_array [0] = 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_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_long=$ac_lo;; +'') if test "$ac_cv_type_unsigned_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +$as_echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi ;; +esac else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20779,20 +16968,38 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (unsigned long)); } +static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); } #include <stdio.h> -main() +#include <stdlib.h> +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - if ((sizeof(unsigned long) == 4 || sizeof(unsigned long) == 2) - && sizeof(unsigned long) != sizeof(unsigned int)) - fprintf(f, "BMTYPE=long BMBYTES=%d\n", sizeof(unsigned long)); - if (sizeof(unsigned int) == 4 || sizeof(unsigned int) == 2) - fprintf(f, "BMTYPE=int BMBYTES=%d\n", sizeof(unsigned int)); - else if (sizeof(unsigned short) == 4 || sizeof(unsigned short) == 2) - fprintf(f, "BMTYPE=short BMBYTES=%d\n", sizeof(unsigned short)); - else fprintf(f, "BMTYPE=char BMBYTES=%d\n", sizeof(unsigned char)); - exit(0); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (unsigned long))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (unsigned long)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (unsigned long)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; } _ACEOF rm -f conftest$ac_exeext @@ -20817,21 +17024,1128 @@ $as_echo "$ac_try_echo") >&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - xdvi_cv_bitmap_type="`cat conftestval`" + ac_cv_sizeof_unsigned_long=`cat conftest.val` else $as_echo "$as_me: program exited with status $ac_status" >&5 $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { $as_echo "$as_me:$LINENO: error: could not determine integer type for bitmap" >&5 -$as_echo "$as_me: error: could not determine integer type for bitmap" >&2;} - { (exit 1); exit 1; }; } +if test "$ac_cv_type_unsigned_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long +_ACEOF + + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of unsigned int" >&5 +$as_echo_n "checking size of unsigned int... " >&6; } +if test "${ac_cv_sizeof_unsigned_int+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= 0)]; +test_array [0] = 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_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +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. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) < 0)]; +test_array [0] = 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_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= $ac_mid)]; +test_array [0] = 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_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_int=$ac_lo;; +'') if test "$ac_cv_type_unsigned_int" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_int=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (unsigned int)); } +static unsigned long int ulongval () { return (long int) (sizeof (unsigned int)); } +#include <stdio.h> +#include <stdlib.h> +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (unsigned int))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (unsigned int)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (unsigned int)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_int=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_unsigned_int" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_int=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5 +$as_echo "$ac_cv_sizeof_unsigned_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int +_ACEOF + + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of unsigned short" >&5 +$as_echo_n "checking size of unsigned short... " >&6; } +if test "${ac_cv_sizeof_unsigned_short+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned short))) >= 0)]; +test_array [0] = 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_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned short))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +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. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned short))) < 0)]; +test_array [0] = 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_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned short))) >= $ac_mid)]; +test_array [0] = 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_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned short))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_short=$ac_lo;; +'') if test "$ac_cv_type_unsigned_short" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (unsigned short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_short=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (unsigned short)); } +static unsigned long int ulongval () { return (long int) (sizeof (unsigned short)); } +#include <stdio.h> +#include <stdlib.h> +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (unsigned short))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (unsigned short)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (unsigned short)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_short=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_unsigned_short" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned short) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (unsigned short) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_short=0 + fi fi rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_short" >&5 +$as_echo "$ac_cv_sizeof_unsigned_short" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short +_ACEOF + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of unsigned char" >&5 +$as_echo_n "checking size of unsigned char... " >&6; } +if test "${ac_cv_sizeof_unsigned_char+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned char))) >= 0)]; +test_array [0] = 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_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned char))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +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. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned char))) < 0)]; +test_array [0] = 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_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned char))) >= $ac_mid)]; +test_array [0] = 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_lo=$ac_mid; break +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (unsigned char))) <= $ac_mid)]; +test_array [0] = 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_hi=$ac_mid +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_char=$ac_lo;; +'') if test "$ac_cv_type_unsigned_char" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned char) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (unsigned char) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_char=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +static long int longval () { return (long int) (sizeof (unsigned char)); } +static unsigned long int ulongval () { return (long int) (sizeof (unsigned char)); } +#include <stdio.h> +#include <stdlib.h> +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (unsigned char))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (unsigned char)))) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (unsigned char)))) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f 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>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_char=`cat conftest.val` +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_unsigned_char" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned char) +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: cannot compute sizeof (unsigned char) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_unsigned_char=0 + fi +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_char" >&5 +$as_echo "$ac_cv_sizeof_unsigned_char" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_CHAR $ac_cv_sizeof_unsigned_char +_ACEOF + +{ $as_echo "$as_me:$LINENO: checking for integer type to use in bitmaps" >&5 +$as_echo_n "checking for integer type to use in bitmaps... " >&6; } +if test "${xdvi_cv_bitmap_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if (test $ac_cv_sizeof_unsigned_long = 4 || test $ac_cv_sizeof_unsigned_long = 2) \ + && test $ac_cv_sizeof_unsigned_long != $ac_cv_sizeof_unsigned_int; then + xdvi_cv_bitmap_type="BMTYPE=long BMBYTES=$ac_cv_sizeof_unsigned_long" +elif test $ac_cv_sizeof_unsigned_int = 4 || test $ac_cv_sizeof_unsigned_int = 2; then + xdvi_cv_bitmap_type="BMTYPE=int BMBYTES=$ac_cv_sizeof_unsigned_int" +elif test $ac_cv_sizeof_unsigned_short = 4 || test $ac_cv_sizeof_unsigned_short = 2; then + xdvi_cv_bitmap_type="BMTYPE=short BMBYTES=$ac_cv_sizeof_unsigned_short" +else + xdvi_cv_bitmap_type="BMTYPE=char BMBYTES=$ac_cv_sizeof_unsigned_cher" +fi fi @@ -20848,6 +18162,7 @@ _ACEOF { $as_echo "$as_me:$LINENO: result: unsigned $BMTYPE, size = $BMBYTES" >&5 $as_echo "unsigned $BMTYPE, size = $BMBYTES" >&6; } + { $as_echo "$as_me:$LINENO: checking for stropts.h and isastream()" >&5 $as_echo_n "checking for stropts.h and isastream()... " >&6; } if test "${xdvi_cv_sys_streams+set}" = set; then @@ -22199,6 +19514,44 @@ 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 + if test "${with_xdvi_x_toolkit}" = xaw; then { $as_echo "$as_me:$LINENO: checking for Xaw library" >&5 @@ -22525,6 +19878,157 @@ fi +if test -n "$x_libraries"; then + XLFLAG="-L$x_libraries" +else + XLFLAG= +fi + +if test -z "$x_ext_lib"; then # allow envvar override + { $as_echo "$as_me:$LINENO: checking for XpQueryVersion in -lXp" >&5 +$as_echo_n "checking for XpQueryVersion in -lXp... " >&6; } +if test "${ac_cv_lib_Xp_XpQueryVersion+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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. */ + +/* 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; +} +_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_Xp_XpQueryVersion=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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 +{ $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 + + { $as_echo "$as_me:$LINENO: checking for XextCreateExtension in -lXext" >&5 +$as_echo_n "checking for XextCreateExtension in -lXext... " >&6; } +if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-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. */ + +/* 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 () +{ +return XextCreateExtension (); + ; + 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_Xext_XextCreateExtension=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +$as_echo "$ac_cv_lib_Xext_XextCreateExtension" >&6; } +if test "x$ac_cv_lib_Xext_XextCreateExtension" = x""yes; then + x_ext_lib='-lXext' +else + : +fi + +fi + @@ -23742,6 +21246,8 @@ 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 @@ -23894,13 +21400,11 @@ else iconv_libs= fi - fi - fi -if test XXX"$iconv_libs" != "XXX"; then +if test "x$iconv_libs" != x; then cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 @@ -23924,32 +21428,16 @@ fi - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -# AC_LANG_PUSH(C++) # in newer autoconf -# -xdvi_iconv_save_libs="$LIBS" -xdvi_iconv_save_cxxflags="$CXXFLAGS" -xdvi_iconv_save_ldflags="$LDFLAGS" -# -LIBS="$LIBS $iconv_libs" -CXXFLAGS="$CXXFLAGS $iconv_includes" -LDFLAGS="$LDFLAGS $iconv_libpath" -# { $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 - if test "$cross_compiling" = yes; then - # `correct' default for cross-compiling ... -xdvi_cv_iconv_char_pptr_type="char_pptr" -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 @@ -23975,127 +21463,163 @@ cat >>conftest.$ac_ext <<_ACEOF #include <iconv.h> - // Define two iconv_adapter() functions, one with a const char **, the other with - // a char ** argument. The compiler will figure out which one to use, and we can - // check the exit value to see which it was. - // Idea taken from http://gcc.gnu.org/ml/libstdc++/2000-11/msg00127.html - - typedef const char ** ConstCharPtrT; - typedef char ** CharPtrT; - - inline int - iconv_adapter(size_t(*iconv_func)(iconv_t, ConstCharPtrT, size_t *, char**, size_t*), - iconv_t cd, char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) - { - return 1; // 1 = false = const char ** - } - - - inline int - iconv_adapter(size_t(*iconv_func)(iconv_t, CharPtrT, size_t *, char**, size_t*), - iconv_t cd, char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) - { - return 0; // 0 = true = char ** - } - - - int main(void) - { - iconv_t testconv = (iconv_t)-1; - char *ptr1 = 0; - char *ptr2 = 0; - size_t len1 = 0; - size_t len2 = 0; - - return iconv_adapter(iconv, testconv, - (char**)&ptr1, &len1, - (char**)&ptr2, &len2); - } - +int +main () +{ +extern size_t iconv(iconv_t, char **, size_t *, char**, size_t*); + ; + return 0; +} _ACEOF -rm -f 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>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&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); }; }; then - xdvi_cv_iconv_char_pptr_type="char_pptr" + (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: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -xdvi_cv_iconv_char_pptr_type="const_char_pptr" + xdvi_cv_iconv_char_pptr_type='const char **' fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$xdvi_iconv_save_cppflags + LIBS=$xdvi_iconv_save_libs 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 -fi -# -LIBS="$xdvi_iconv_save_libs" -CXXFLAGS="$xdvi_iconv_save_cxxflags" -LDFLAGS="$xdvi_iconv_save_ldflags" -# -if test $xdvi_cv_iconv_char_pptr_type = "const_char_pptr"; then -cat >>confdefs.h <<\_ACEOF -#define ICONV_CHAR_PPTR_TYPE const char ** -_ACEOF - { $as_echo "$as_me:$LINENO: result: const char **" >&5 -$as_echo "const char **" >&6; } + +if echo "$PS_DEF" | grep PS_DPS >/dev/null; then + if test "`(uname) 2>/dev/null`" = SunOS \ + && uname -r | grep '^5' >/dev/null; then + { $as_echo "$as_me:$LINENO: adding DPS includes and libraries for Solaris" >&5 +$as_echo "$as_me: adding DPS includes and libraries for Solaris" >&6;} + X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11" + X_LIBS="$X_LIBS -R/usr/openwin/lib /usr/openwin/lib/libdps.so $ac_sunmath" + { $as_echo "$as_me:$LINENO: checking for isinf in -lsunmath" >&5 +$as_echo_n "checking for isinf in -lsunmath... " >&6; } +if test "${ac_cv_lib_sunmath_isinf+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >>confdefs.h <<\_ACEOF -#define ICONV_CHAR_PPTR_TYPE char ** + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsunmath $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - { $as_echo "$as_me:$LINENO: result: char **" >&5 -$as_echo "char **" >&6; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +/* 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 isinf (); +int +main () +{ +return isinf (); + ; + 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_sunmath_isinf=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -#AC_LANG_POP(C++) # in newer autoconf + ac_cv_lib_sunmath_isinf=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_sunmath_isinf" >&5 +$as_echo "$ac_cv_lib_sunmath_isinf" >&6; } +if test "x$ac_cv_lib_sunmath_isinf" = x""yes; then + X_LIBS="$X_LIBS -lsunmath" +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 +for ac_func in isinf +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 - ac_func_search_save_LIBS=$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. */ +/* 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 @@ -24103,23 +21627,23 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char pow (); +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 pow (); +return $ac_func (); ; return 0; } _ACEOF -for ac_lib in '' m; 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 +rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -24140,37 +21664,193 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_search_pow=$ac_res + 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 - if test "${ac_cv_search_pow+set}" = set; then - break + 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 -if test "${ac_cv_search_pow+set}" = set; then - : + + +for ac_header in ieeefp.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_cv_search_pow=no + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm conftest.$ac_ext -LIBS=$ac_func_search_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_search_pow" >&5 -$as_echo "$ac_cv_search_pow" >&6; } -ac_res=$ac_cv_search_pow -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ---------------------------- ## +## Report this to tex-k@tug.org ## +## ---------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi +done + + else + { $as_echo "$as_me:$LINENO: adding DPS libraries for SunOS 4.x" >&5 +$as_echo "$as_me: adding DPS libraries for SunOS 4.x" >&6;} + X_LIBS="$X_LIBS -ldps" + fi +elif echo "$PS_DEF" | grep PS_NEWS >/dev/null; then + { $as_echo "$as_me:$LINENO: adding NeWS libraries" >&5 +$as_echo "$as_me: adding NeWS libraries" >&6;} + X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps" +fi ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` @@ -24678,59 +22358,6 @@ enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quot enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' @@ -24794,39 +22421,7 @@ library_names_spec \ soname_spec \ finish_eval \ old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ -hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; do +striplib; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" @@ -24855,16 +22450,7 @@ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX; do +sys_lib_dlsearch_path_spec; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" @@ -24900,8 +22486,6 @@ fi - - _LTEOF cat >>"$CONFIG_LT" <<\_LTEOF @@ -24956,7 +22540,7 @@ $as_echo "$as_me: creating $ofile" >&6;} # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags="" # ### BEGIN LIBTOOL CONFIG @@ -25306,20 +22890,6 @@ file_list_spec=$lt_file_list_spec # How to hardcode a shared library path into an executable. hardcode_action=$hardcode_action -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - # ### END LIBTOOL CONFIG _LT_EOF @@ -25556,159 +23126,6 @@ _LT_EOF chmod +x "$ofile" - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - - { (exit 0); exit 0; } _LTEOF chmod +x "$CONFIG_LT" @@ -25813,42 +23230,124 @@ ${top_builddir}/../../libs/t1lib/t1lib.h: fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS -# Check whether --with-default-dvips-path was given. -if test "${with_default_dvips_path+set}" = set; then - withval=$with_default_dvips_path; -cat >>confdefs.h <<_ACEOF -#define DEFAULT_DVIPS_PATH "$withval" -_ACEOF +CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" +LIBS="$KPATHSEA_LIBS $LIBS" +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_enc_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_enc_format... " >&6; } +if test "${kpse_cv_have_enc_format+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >>confdefs.h <<\_ACEOF -#define DEFAULT_DVIPS_PATH "dvips" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <kpathsea/kpathsea.h> +int +main () +{ +kpse_enc_format + ; + 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 + kpse_cv_have_enc_format=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + kpse_cv_have_enc_format=no +fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_enc_format" >&5 +$as_echo "$kpse_cv_have_enc_format" >&6; } +if test "x$kpse_cv_have_enc_format" = xyes; then + : +else + if test "x$enable_build" = xno; then + { $as_echo "$as_me:$LINENO: WARNING: building xdvik has been disabled and would fail because +your kpathsea has no kpse_enc_format." >&5 +$as_echo "$as_me: WARNING: building xdvik has been disabled and would fail because +your kpathsea has no kpse_enc_format." >&2;} +else + { { $as_echo "$as_me:$LINENO: error: your kpathsea has no kpse_enc_format." >&5 +$as_echo "$as_me: error: your kpathsea has no kpse_enc_format." >&2;} + { (exit 1); exit 1; }; } fi +fi + + +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS -# Check whether --with-default-ps2pdf-path was given. -if test "${with_default_ps2pdf_path+set}" = set; then - withval=$with_default_ps2pdf_path; -cat >>confdefs.h <<_ACEOF -#define DEFAULT_PS2PDF_PATH "$withval" -_ACEOF +# Check whether --with-default-dvips-path was given. +if test "${with_default_dvips_path+set}" = set; then + withval=$with_default_dvips_path; else - cat >>confdefs.h <<\_ACEOF -#define DEFAULT_PS2PDF_PATH "ps2pdf" + with_default_dvips_path="dvips" +fi + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_DVIPS_PATH "$with_default_dvips_path" _ACEOF + +# Check whether --with-default-ps2pdf-path was given. +if test "${with_default_ps2pdf_path+set}" = set; then + withval=$with_default_ps2pdf_path; +else + with_default_ps2pdf_path="ps2pdf" fi +cat >>confdefs.h <<_ACEOF +#define DEFAULT_PS2PDF_PATH "$with_default_ps2pdf_path" +_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 @@ -25858,7 +23357,7 @@ XDVIK_VERSION=22.84.15 subdirs="$subdirs squeeze" -ac_config_files="$ac_config_files Makefile gui/Makefile" +ac_config_files="$ac_config_files Makefile gui/Makefile tests/Makefile" ac_config_files="$ac_config_files xdvi:xdvi-sh.in" @@ -25984,20 +23483,6 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} @@ -26625,59 +24110,6 @@ enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quot enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' @@ -26741,39 +24173,7 @@ library_names_spec \ soname_spec \ finish_eval \ old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ -hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; do +striplib; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" @@ -26802,16 +24202,7 @@ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX; do +sys_lib_dlsearch_path_spec; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" @@ -26845,8 +24236,6 @@ fi RM='$RM' ofile='$ofile' - - ac_aux_dir='$ac_aux_dir' @@ -26864,6 +24253,7 @@ do "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" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -27701,7 +25091,7 @@ done # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags="" # ### BEGIN LIBTOOL CONFIG @@ -28051,20 +25441,6 @@ file_list_spec=$lt_file_list_spec # How to hardcode a shared library path into an executable. hardcode_action=$hardcode_action -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - # ### END LIBTOOL CONFIG _LT_EOF @@ -28300,159 +25676,6 @@ _LT_EOF (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - ;; "xdvi":F) chmod +x xdvi ;; diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac index f6e066a947b..976701c7b01 100644 --- a/Build/source/texk/xdvik/configure.ac +++ b/Build/source/texk/xdvik/configure.ac @@ -16,6 +16,8 @@ AC_CONFIG_MACRO_DIR([../../m4]) dnl Common code for all programs using libkpathsea. KPSE_COMMON([xdvik]) +AC_SEARCH_LIBS([pow], [m]) + m4_include([ac/xdvik.ac]) AS_CASE([$with_xdvi_x_toolkit], [next | nextaw | neXtaw], [val=neXtaw], @@ -80,13 +82,6 @@ AS_IF([test "x$enable_a4" = xno], [AC_MSG_NOTICE([Disabled a4/cm, using letter/in instead])], [AC_DEFINE([A4], 1, [Define to use A4 as the default paper size.])]) -AC_ARG_ENABLE([magick], - AS_HELP_STRING([--enable-magick], - [Use ImageMagick to load/render image files. - EXPERIMENTAL - DO NOT USE!])) - -AC_PROG_CXX - AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) AC_FUNC_FORK @@ -122,7 +117,6 @@ XDVI_LINKER_MULTIPLE_DEFNS AC_CHECK_HEADERS([stdint.h inttypes.h]) AC_TYPE_UINT32_T -dnl PB: rewrite Autoconf 2.13 style AC_CHECK_TYPE([ptrdiff_t], [long]) AC_CHECK_TYPE([ptrdiff_t], [], [AC_DEFINE_UNQUOTED([ptrdiff_t], [long], [Define to `long' if <sys/types.h> does not define.])]) @@ -149,6 +143,34 @@ AC_CHECK_HEADERS([X11/Xmu/Editres.h X11/Xmu/Xmu.h], AC_SUBST([x_xmu_lib]) CPPFLAGS=$xdvi_save_CPPFLAGS +AC_ARG_ENABLE([magick], + AS_HELP_STRING([--enable-magick], + [Use ImageMagick to load/render image files. + EXPERIMENTAL - DO NOT USE!])) +if test "x$enable_magick" = xyes; then + AC_MSG_CHECKING([for ImageMagick version]) + if MAGICK_VER=`Magick-config --version 2>/dev/null`; then + AC_MSG_RESULT([$MAGICK_VER]) + 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`" + AC_MSG_NOTICE([ImageMagick support enabled]) + X_CFLAGS="$X_CFLAGS $MAGICK_CPP" + X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGICK_LD" + AC_DEFINE([MAGICK], 1, [Define to use ImageMagick]) + else + AC_MSG_NOTICE([ImageMagick version too old - disabled]) + fi + else + AC_MSG_RESULT([cannot run 'Magick-config' - ImageMagick support disabled]) + fi +fi + dnl check for Xaw version XDVI_OLD_XAW @@ -165,7 +187,26 @@ AS_IF([test "x$xdvi_cv_nl_langinfo_codeset" = xyes], dnl ####### -dnl First, check for libXp and libXext +dnl First, check for libXp and libXext. +dnl We certainly don't want to include the now defunct libXp unless necessay, +dnl this would just perpetuate the need to keep libXp.so around. Moreover, +dnl for ELF shared libraries, the need for libXp is probably encoded into +dnl libXm.so and/or libXaw.so and need not to be specified explicitly. +dnl +AS_IF([test -n "$x_libraries"], + [XLFLAG="-L$x_libraries"], + [XLFLAG=]) +if test -z "$x_ext_lib"; then # allow envvar override + AC_CHECK_LIB([Xp], [XpQueryVersion], + [x_ext_lib_with_Xp='-lXp -lXext'], + [:], + [-lXext -lX11 $X_EXTRA_LIBS $XLFLAG]) + AC_CHECK_LIB([Xext], [XextCreateExtension], + [x_ext_lib='-lXext'], + [:], + [-lX11 $X_EXTRA_LIBS $XLFLAG]) +fi +AC_SUBST([x_ext_lib]) dnl ####### @@ -193,9 +234,14 @@ 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], -[ --with-iconv-libdir=DIR - Specify the location of iconv library (librecode.so)], + 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" @@ -206,19 +252,20 @@ 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 XXX"$iconv_libs" != "XXX"; then +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], -[ --with-iconv-include=DIR - Specify the location of iconv header (iconv.h)], + 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],[ @@ -230,31 +277,72 @@ XDVI_ICONV_CHAR_PPTR_TYPE dnl ####### -AC_SEARCH_LIBS([pow], [m]) +dnl $program_transform_name replacement + +dnl ####### + +dnl If we're on Solaris and we want DPS, then add the extra compilation stuff +dnl to get it. +if echo "$PS_DEF" | grep PS_DPS >/dev/null; then + if test "`(uname) 2>/dev/null`" = SunOS \ + && uname -r | grep '^5' >/dev/null; then + AC_MSG_NOTICE([adding DPS includes and libraries for Solaris]) + X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11" + X_LIBS="$X_LIBS -R/usr/openwin/lib /usr/openwin/lib/libdps.so $ac_sunmath" + AC_CHECK_LIB([sunmath], [isinf], + [X_LIBS="$X_LIBS -lsunmath"]) + dnl We only need isinf and ieeefp.h to work around a Solaris bug in + dnl -ldps; see psdps.c. isinf is in -lsunmath. + AC_CHECK_FUNCS([isinf]) + AC_CHECK_HEADERS([ieeefp.h]) + else + dnl SunOS 4.x is simpler. + AC_MSG_NOTICE([adding DPS libraries for SunOS 4.x]) + X_LIBS="$X_LIBS -ldps" + fi +elif echo "$PS_DEF" | grep PS_NEWS >/dev/null; then + AC_MSG_NOTICE([adding NeWS libraries]) + X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps" +fi KPSE_KPATHSEA_FLAGS KPSE_T1LIB_FLAGS -XDVI_ARG_STRING([default-dvips-path], -[ --with-default-dvips-path=CMD - Use CMD as default DVI to PS converter], -[DEFAULT_DVIPS_PATH], ["dvips"], -[Define to point to the default command to use for printing (optional).]) +KPSE_ADD_FLAGS([kpathsea]) -XDVI_ARG_STRING([default-ps2pdf-path], -[ --with-default-ps2pdf-path=CMD - Use CMD as default PS to PDF converter], -[DEFAULT_PS2PDF_PATH], ["ps2pdf"], -[Define to point to the default command to use for printing (optional).]) +KPSE_CHECK_KPSE_FORMAT([enc], , + [KPSE_MSG_ERROR([xdvik], + [your kpathsea has no kpse_enc_format.])]) -dnl ####### +KPSE_RESTORE_FLAGS + +AC_ARG_WITH([default-dvips-path], + AS_HELP_STRING([--with-default-dvips-path=CMD], + [Use CMD as default DVI to PS converter]), , + [with_default_dvips_path="dvips"]) +AC_DEFINE_UNQUOTED([DEFAULT_DVIPS_PATH], ["$with_default_dvips_path"], + [Define to point to the default command to use for printing (optional).]) + +AC_ARG_WITH([default-ps2pdf-path], + AS_HELP_STRING([--with-default-ps2pdf-path=CMD], + [Use CMD as default PS to PDF converter]), , + [with_default_ps2pdf_path="ps2pdf"]) +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]) +AC_CONFIG_FILES([Makefile gui/Makefile tests/Makefile]) AC_CONFIG_FILES([xdvi:xdvi-sh.in], [chmod +x xdvi]) diff --git a/Build/source/texk/xdvik/configure.in.work b/Build/source/texk/xdvik/configure.in.work index c362b30ba7f..ab0e576256d 100644 --- a/Build/source/texk/xdvik/configure.in.work +++ b/Build/source/texk/xdvik/configure.in.work @@ -48,57 +48,5 @@ AC_SUBST(final_exec_name) dnl OBSOLETE?? AC_SUBST(exec_link) AC_SUBST(wrapper_script) -dnl -dnl Tests for different application setup features follow. -dnl - -dnl For --with-ps. -test -z "$PS_DEF" && PS_DEF=-DPS_GS -test "$PS_DEF" = no && PS_DEF= -AC_SUBST(PS_DEF)dnl -dnl -dnl If we're on Solaris and we want DPS, then add the extra compilation stuff -dnl to get it. -if echo "$PS_DEF" | grep PS_DPS >/dev/null; then - if test "`(uname) 2>/dev/null`" = SunOS \ - && uname -r | grep '^5' >/dev/null; then - AC_MSG_RESULT(adding DPS includes and libraries for Solaris) - X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11" - AC_CHECK_LIB(sunmath, isinf, ac_sunmath=-lsunmath, ac_sunmath="") - X_LIBS="$X_LIBS -R/usr/openwin/lib /usr/openwin/lib/libdps.so $ac_sunmath" - dnl We only need isinf and ieeefp.h to work around a Solaris bug in - dnl -ldps; see psdps.c. isinf is in -lsunmath. - AC_CHECK_FUNCS(isinf) - AC_CHECK_HEADERS(ieeefp.h) - else - dnl SunOS 4.x is simpler. - AC_MSG_RESULT(adding DPS includes and libraries for SunOS 4.x) - X_LIBS="$X_LIBS -ldps" - fi -elif echo "$PS_DEF" | grep PS_NEWS >/dev/null; then - AC_MSG_RESULT(adding NeWS libraries) - X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps" -fi - dnl ########## -dnl ImageMagick support -PS_DEF="$PS_DEF $MAGICK_DEF" -if echo "$PS_DEF" | grep MAGICK >/dev/null; then - AC_MSG_RESULT(adding ImageMagick libraries) - X_EXTRA_LIBS="$X_EXTRA_LIBS `Magick-config --libs`" -fi - - -# If you're cross-compiling, these macros set up the variables in -# ../make/cross.mk: BUILDCC, BUILDCFLAGS, BUILDCCLD etc. These are -# near the end so people have some chance of seeing them. -KPSE_CROSS_BUILD_VAR(CC, cc) -KPSE_CROSS_BUILD_VAR(CFLAGS, $(BUILDXCFLAGS)) -KPSE_CROSS_BUILD_VAR(CPPFLAGS, $(BUILDXCPPFLAGS)) -KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS)) -KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC)) - -KPSE_CONFIG_FILES([Makefile gui/Makefile tests/Makefile]) -AC_CONFIG_FILES([xdvi-sh]) -AC_OUTPUT diff --git a/Build/source/texk/xdvik/gui/Makefile.am b/Build/source/texk/xdvik/gui/Makefile.am index ce61f2c0832..9f0fea5ad5c 100644 --- a/Build/source/texk/xdvik/gui/Makefile.am +++ b/Build/source/texk/xdvik/gui/Makefile.am @@ -1,12 +1,16 @@ +## Makefile.am for the TeX Live subdirectory texk/xdvik/gui/ ## -INCLUDES = -I$(top_srcdir) -INCLUDES += $(PS_DEF) -INCLUDES += $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) -INCLUDES += $(X_CFLAGS) +## 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 \ diff --git a/Build/source/texk/xdvik/gui/Makefile.in b/Build/source/texk/xdvik/gui/Makefile.in index 3762e6649c7..123d5d71995 100644 --- a/Build/source/texk/xdvik/gui/Makefile.in +++ b/Build/source/texk/xdvik/gui/Makefile.in @@ -32,11 +32,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/../common.am $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in subdir = gui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-arg-string.m4 \ - $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \ +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 \ @@ -68,9 +68,9 @@ LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libgui_a_AR = $(AR) $(ARFLAGS) libgui_a_LIBADD = -am_libgui_a_OBJECTS = Panner.$(OBJEXT) Tip.$(OBJEXT) \ - help-window.$(OBJEXT) mag.$(OBJEXT) menu.$(OBJEXT) \ - message-window.$(OBJEXT) pagesel.$(OBJEXT) \ +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) \ @@ -112,10 +112,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -181,7 +177,6 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -234,14 +229,25 @@ 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@ -INCLUDES = -I$(top_srcdir) $(PS_DEF) $(KPATHSEA_INCLUDES) \ - $(T1LIB_INCLUDES) $(X_CFLAGS) +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 \ @@ -313,7 +319,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(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*) \ @@ -364,6 +370,7 @@ distclean-compile: @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@ @@ -409,6 +416,20 @@ distclean-compile: @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 @@ -590,6 +611,9 @@ uninstall-am: 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/gui/Makefile.in.orig b/Build/source/texk/xdvik/gui/Makefile.in.orig deleted file mode 100644 index 873f41e92de..00000000000 --- a/Build/source/texk/xdvik/gui/Makefile.in.orig +++ /dev/null @@ -1,83 +0,0 @@ -# Makefile for xdvik -# -# - 1999/05/08: janl: Removed submakes for libwww and kpathsea. That's what -# the top makefile is for! -# - - -### NOTE: ac_include paths must be relative to texk/xdvik, since that -### is from where the configure is run! -ac_include ../make/paths.mk -ac_include ../make/library.mk -ac_include ../make/common.mk -ac_include ../make/programs.mk - -kpathsea_parent = ../.. - -# additional flags for kpathsea -LIBKPATHSEACPPFLAGS=@LIBKPATHSEACPPFLAGS@ - -CPP = @CPP@ -RANLIB = @RANLIB@ - -# Make `#include <X11/...>' and `-lX...' work. -# This matches web2c (needed only for Metafont). -x_cppflags = @X_CFLAGS@ - -# Extra xdvi-specific compiler options. -ps_def = @PS_DEF@ -DXSERVER_INFO -prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBKPATHSEACPPFLAGS) -I.. -I$(srcdir)/.. $(x_cppflags) $(ps_def) - -# Note: to be able to use one depend.mk file for both Motif/Xaw (which -# is needed since only maintainers are supposed to invoke `make depend') -# we include *all* object files and have tests for #ifdef MOTIF/XAW inside -# the files. -objects = \ - help-window.o \ - message-window.o \ - mag.o \ - menu.o \ - Panner.o \ - pagesel.o \ - print-dialog.o \ - print-log.o \ - search-dialog.o \ - selection.o \ - sfDir.o \ - sfDraw.o \ - sfPath.o \ - sfSelFile.o \ - statusline.o \ - Tip.o \ - topic-window.o \ - xaw_bitmaps.o \ - xaw_menu.o \ - xicon.o \ - xlwradio.o \ - xm_colorsel.o \ - xm_filesel.o \ - xm_menu.o \ - xm_prefs.o \ - xm_prefs_appearance.o \ - xm_prefs_fonts.o \ - xm_prefs_page.o \ - xm_prefs_scroll.o \ - xm_prefs_helpers.o \ - xm_toolbar.o - -libgui.a: $(objects) -### hmm, I don't understand ar ... sometimes objects were NOT replaced. -### Play it safe and always remove the archive before creating new one. - rm -f $@ - $(AR) $(ARFLAGS) $@ $(objects) - $(RANLIB) $@ - -ac_include ../make/dist.mk -ac_include ../make/clean.mk - -clean:: - rm -f *.o *.a - -c_auto_h_dir = .. -ac_include ../make/rdepend.mk -ac_include ./gui/depend.mk diff --git a/Build/source/texk/xdvik/m4/xdvi-arg-string.m4 b/Build/source/texk/xdvik/m4/xdvi-arg-string.m4 deleted file mode 100644 index 02f8ca8c972..00000000000 --- a/Build/source/texk/xdvik/m4/xdvi-arg-string.m4 +++ /dev/null @@ -1,9 +0,0 @@ -dnl ### Process a string argument - -dnl XDVI_ARG_STRING(PACKAGE, HELP-STRING, VARIABLE, DEFAULT_VALUE, DESCRIPTION) -AC_DEFUN([XDVI_ARG_STRING], -[AC_ARG_WITH([$1], [$2], [AC_DEFINE_UNQUOTED($3, ["$withval"], [$5]) -], [AC_DEFINE([$3], [$4]) -])]) - - diff --git a/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 b/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 index ae3f871e79a..ca6da408555 100644 --- a/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-c-bitmap-type.m4 @@ -1,31 +1,29 @@ dnl ### Determine integer type to use for bitmaps + +# XDVI_C_BITMAP_TYPE +# ------------------ +# Determine integer type to use for bitmaps. +# Uses AC_CHECK_SIZEOF(TYPE) and thus works when cross compiling. AC_DEFUN([XDVI_C_BITMAP_TYPE], -[AC_MSG_CHECKING(for integer type to use in bitmaps) -AC_CACHE_VAL(xdvi_cv_bitmap_type, -[AC_TRY_RUN( -[#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - if ((sizeof(unsigned long) == 4 || sizeof(unsigned long) == 2) - && sizeof(unsigned long) != sizeof(unsigned int)) - fprintf(f, "BMTYPE=long BMBYTES=%d\n", sizeof(unsigned long)); - if (sizeof(unsigned int) == 4 || sizeof(unsigned int) == 2) - fprintf(f, "BMTYPE=int BMBYTES=%d\n", sizeof(unsigned int)); - else if (sizeof(unsigned short) == 4 || sizeof(unsigned short) == 2) - fprintf(f, "BMTYPE=short BMBYTES=%d\n", sizeof(unsigned short)); - else fprintf(f, "BMTYPE=char BMBYTES=%d\n", sizeof(unsigned char)); - exit(0); -}], -xdvi_cv_bitmap_type="`cat conftestval`", -AC_MSG_ERROR(could not determine integer type for bitmap))]) +[AC_CHECK_SIZEOF([unsigned long])[]dnl + AC_CHECK_SIZEOF([unsigned int])[]dnl + AC_CHECK_SIZEOF([unsigned short])[]dnl + AC_CHECK_SIZEOF([unsigned char])[]dnl +AC_MSG_CHECKING([for integer type to use in bitmaps]) +AC_CACHE_VAL([xdvi_cv_bitmap_type], +[AS_IF([(test $ac_cv_sizeof_unsigned_long = 4 || test $ac_cv_sizeof_unsigned_long = 2) \ + && test $ac_cv_sizeof_unsigned_long != $ac_cv_sizeof_unsigned_int], + [xdvi_cv_bitmap_type="BMTYPE=long BMBYTES=$ac_cv_sizeof_unsigned_long"], + [test $ac_cv_sizeof_unsigned_int = 4 || test $ac_cv_sizeof_unsigned_int = 2], + [xdvi_cv_bitmap_type="BMTYPE=int BMBYTES=$ac_cv_sizeof_unsigned_int"], + [test $ac_cv_sizeof_unsigned_short = 4 || test $ac_cv_sizeof_unsigned_short = 2], + [xdvi_cv_bitmap_type="BMTYPE=short BMBYTES=$ac_cv_sizeof_unsigned_short"], + [xdvi_cv_bitmap_type="BMTYPE=char BMBYTES=$ac_cv_sizeof_unsigned_cher"])]) eval "$xdvi_cv_bitmap_type" AC_DEFINE_UNQUOTED([BMTYPE], [$BMTYPE], [Define to determine the integer type to be used in bitmaps. The type used will be "unsigned BMTYPE".]) AC_DEFINE_UNQUOTED([BMBYTES], [$BMBYTES], [Define to the length (in bytes) of type BMTYPE.]) -AC_MSG_RESULT([unsigned $BMTYPE, size = $BMBYTES])]) - - +AC_MSG_RESULT([unsigned $BMTYPE, size = $BMBYTES]) +]) # XDVI_C_BITMAP_TYPE 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 index a57036e16ee..20d65877ea5 100644 --- a/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 +++ b/Build/source/texk/xdvik/m4/xdvi-iconv-char-pptr-type.m4 @@ -1,24 +1,21 @@ -dnl ### Check whether iconv takes a 'const char **' or a 'char **' input argument. -dnl ### According to IEEE 1003.1, `char **' is correct, but e.g. librecode -dnl ### uses `const char **'. -dnl ### We use C++'s built-in function overloading to distinguish between the two. +# 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_LANG_SAVE AC_LANG_CPLUSPLUS -# AC_LANG_PUSH(C++) # in newer autoconf -# -xdvi_iconv_save_libs="$LIBS" -xdvi_iconv_save_cxxflags="$CXXFLAGS" -xdvi_iconv_save_ldflags="$LDFLAGS" -# -LIBS="$LIBS $iconv_libs" -CXXFLAGS="$CXXFLAGS $iconv_includes" -LDFLAGS="$LDFLAGS $iconv_libpath" -# -AC_MSG_CHECKING([for iconv input type]) -AC_CACHE_VAL(xdvi_cv_iconv_char_pptr_type, -[AC_TRY_RUN( -[ +[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 @@ -36,64 +33,12 @@ AC_CACHE_VAL(xdvi_cv_iconv_char_pptr_type, #endif #include <iconv.h> - - // Define two iconv_adapter() functions, one with a const char **, the other with - // a char ** argument. The compiler will figure out which one to use, and we can - // check the exit value to see which it was. - // Idea taken from http://gcc.gnu.org/ml/libstdc++/2000-11/msg00127.html - - typedef const char ** ConstCharPtrT; - typedef char ** CharPtrT; - - inline int - iconv_adapter(size_t(*iconv_func)(iconv_t, ConstCharPtrT, size_t *, char**, size_t*), - iconv_t cd, char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) - { - return 1; // 1 = false = const char ** - } - - - inline int - iconv_adapter(size_t(*iconv_func)(iconv_t, CharPtrT, size_t *, char**, size_t*), - iconv_t cd, char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) - { - return 0; // 0 = true = char ** - } - - - int main(void) - { - iconv_t testconv = (iconv_t)-1; - char *ptr1 = 0; - char *ptr2 = 0; - size_t len1 = 0; - size_t len2 = 0; - - return iconv_adapter(iconv, testconv, - (char**)&ptr1, &len1, - (char**)&ptr2, &len2); - } -], -[xdvi_cv_iconv_char_pptr_type="char_pptr"], -[xdvi_cv_iconv_char_pptr_type="const_char_pptr"], -# `correct' default for cross-compiling ... -[xdvi_cv_iconv_char_pptr_type="char_pptr"])]) -# -LIBS="$xdvi_iconv_save_libs" -CXXFLAGS="$xdvi_iconv_save_cxxflags" -LDFLAGS="$xdvi_iconv_save_ldflags" -# -if test $xdvi_cv_iconv_char_pptr_type = "const_char_pptr"; then - AC_DEFINE([ICONV_CHAR_PPTR_TYPE], [const char **], - [Define the type of the iconv input string (char ** or const char **)]) - AC_MSG_RESULT([const char **]) -else - AC_DEFINE([ICONV_CHAR_PPTR_TYPE], [char **]) - AC_MSG_RESULT([char **]) -fi -AC_LANG_RESTORE] -#AC_LANG_POP(C++) # in newer autoconf -) - + ]], + [[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/squeeze/Makefile.am b/Build/source/texk/xdvik/squeeze/Makefile.am index 6eb87efed39..7c96e17ddbf 100644 --- a/Build/source/texk/xdvik/squeeze/Makefile.am +++ b/Build/source/texk/xdvik/squeeze/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/xdvik/squeeze/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../../m4 diff --git a/Build/source/texk/xdvik/tests/Makefile.am b/Build/source/texk/xdvik/tests/Makefile.am new file mode 100644 index 00000000000..4fb76fddb7b --- /dev/null +++ b/Build/source/texk/xdvik/tests/Makefile.am @@ -0,0 +1,35 @@ +## Makefile.am for the TeX Live subdirectory texk/xdvik/tests/ +## +## 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) -I$(top_srcdir)/gui $(common_includes) + +check_PROGRAMS = run_tests + +TESTS = $(check_PROGRAMS) + +run_tests_SOURCES = \ + run_tests.c \ + run_tests.h \ + test_dl_list.c \ + test_string_list.c \ + 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) + +../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 2d5f4d580ea..3a89b4313ed 100644 --- a/Build/source/texk/xdvik/tests/Makefile.in +++ b/Build/source/texk/xdvik/tests/Makefile.in @@ -1,120 +1,615 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ -# Makefile for xdvik -# -# - 1999/05/08: janl: Removed submakes for libwww and kpathsea. That's what -# the top makefile is for! -# - - -### NOTE: kpse_include paths must be relative to texk/xdvik, since that -### is from where the configure is run! -kpse_include ../make/paths.mk -kpse_include ../make/library.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -kpse_include xdvi_objects.mk - -kpathsea_parent = ../.. - -x_cppflags=@X_CFLAGS@ @iconv_includes@ -x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@ -x_pre_libs=@X_PRE_LIBS@ -x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@ -x_tool_libs=@x_tool_libs@ -x_xmu_lib=@x_xmu_lib@ -x_xpm_libs=@x_xpm_libs@ -x_ext_lib=@x_ext_lib@ - -x_link = $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) - -LDLIBT1=@LDLIBT1@ -LIBT1CPPFLAGS=@LIBT1CPPFLAGS@ -LIBT1DEP=@LIBT1DEP@ -LIBT1DIR = ../../../libs/t1lib -LIBTYPE1DIR = $(LIBT1DIR)/../type1 -LIBT1SRCDIR = $(srcdir)/$(LIBT1DIR) - -LIBGUI=../gui/libgui.a -LIBGUIDEP=$(LIBGUI) +# 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 = README $(srcdir)/../common.am $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +check_PROGRAMS = run_tests$(EXEEXT) +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-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 = +am_run_tests_OBJECTS = run_tests.$(OBJEXT) test_dl_list.$(OBJEXT) \ + test_string_list.$(OBJEXT) test_string_utils.$(OBJEXT) \ + test_util.$(OBJEXT) +run_tests_OBJECTS = $(am_run_tests_OBJECTS) +run_tests_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_3) +am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_4) +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 = $(run_tests_SOURCES) +DIST_SOURCES = $(run_tests_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) -I$(top_srcdir)/gui $(common_includes) +TESTS = $(check_PROGRAMS) +run_tests_SOURCES = \ + run_tests.c \ + run_tests.h \ + test_dl_list.c \ + test_string_list.c \ + 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) +EXTRA_DIST = test1.c +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 tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign tests/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-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +run_tests$(EXEEXT): $(run_tests_OBJECTS) $(run_tests_DEPENDENCIES) + @rm -f run_tests$(EXEEXT) + $(LINK) $(run_tests_OBJECTS) $(run_tests_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run_tests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dl_list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_string_list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_string_utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_util.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +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 + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile +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-checkPROGRAMS clean-generic clean-libtool \ + 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-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool 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@ + +../libxdvi.a: $(libxdvi_dependencies) + cd .. && $(MAKE) $(AM_MAKEFLAGS) libxdvi.a -# Make `#include <X11/...>' and `-lX...' work. -# This matches web2c (needed only for Metafont). -x_cppflags = @X_CFLAGS@ - -# Extra xdvi-specific compiler options. -ps_def = @PS_DEF@ -DXSERVER_INFO -prog_cflags = @XTRA_WARN_CFLAGS@ -I.. -I$(srcdir)/.. $(x_cppflags) $(ps_def) - -# Note: to be able to use one depend.mk file for both Motif/Xaw (which -# is needed since only maintainers are supposed to invoke `make depend') -# we include *all* object files and have tests for #ifdef MOTIF/XAW inside -# the files. -objects = \ - test_dl_list.o \ - test_string_list.o \ - test_string_utils.o \ - test_util.o \ - run_tests.o - - -# This are the files from xdvi needed to link the tests -xdvi_objects = \ - ../browser.o \ - ../dvi-draw.o \ - ../dvi-init.o \ - ../dvisel.o \ - ../encodings.o \ - ../events.o \ - ../exit-handlers.o \ - ../filehist.o \ - ../font-open.o \ - ../gf.o \ - ../hypertex.o \ - ../image-magick.o \ - ../mime.o \ - ../my-snprintf.o \ - ../my-vsnprintf.o \ - ../pagehist.o \ - ../pk.o \ - ../print-internal.o \ - ../psdps.o \ - ../psgs.o \ - ../psheader.o \ - ../psnews.o \ - ../read-mapfile.o \ - ../search-internal.o \ - ../special.o \ - ../string-utils.o \ - ../string_list.o \ - ../tfmload.o \ - ../util.o \ - ../dl_list.o \ - ../vf.o \ - ../xdvi.o \ - ../xserver-info.o \ - ../x_util.o - -default all: run_tests - -run_tests: $(objects) $(xdvi_objects) $(LIBT1DEP) $(LIBGUIDEP) - $(kpathsea_link) $(objects) $(xdvi_objects) $(LIBGUI) $(x_link) $(LOADLIBES) - -test: run_tests - ./run_tests - -test_verbose: run_tests - ./run_tests -v - -kpse_include ../make/dist.mk -kpse_include ../make/clean.mk - -clean:: - rm -f *.o *.a - -c_auto_h_dir = .. -kpse_include ../make/rdepend.mk -kpse_include ./gui/depend.mk -kpse_include ./tests/depend.mk +../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: diff --git a/Build/source/texk/xdvik/tests/Makefile.in.orig b/Build/source/texk/xdvik/tests/Makefile.in.orig deleted file mode 100644 index c4a03c1ecde..00000000000 --- a/Build/source/texk/xdvik/tests/Makefile.in.orig +++ /dev/null @@ -1,119 +0,0 @@ -# Makefile for xdvik -# -# - 1999/05/08: janl: Removed submakes for libwww and kpathsea. That's what -# the top makefile is for! -# - - -### NOTE: ac_include paths must be relative to texk/xdvik, since that -### is from where the configure is run! -ac_include ../make/paths.mk -ac_include ../make/library.mk -ac_include ../make/common.mk -ac_include ../make/programs.mk -ac_include xdvi_objects.mk - -kpathsea_parent = ../.. - -x_cppflags=@X_CFLAGS@ @iconv_includes@ -x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@ -x_pre_libs=@X_PRE_LIBS@ -x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@ -x_tool_libs=@x_tool_libs@ -x_xmu_lib=@x_xmu_lib@ -x_xpm_libs=@x_xpm_libs@ -x_ext_lib=@x_ext_lib@ - -x_link = $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs) - -LDLIBT1=@LDLIBT1@ -LIBT1CPPFLAGS=@LIBT1CPPFLAGS@ -LIBT1DEP=@LIBT1DEP@ -LIBT1DIR = ../../../libs/t1lib -LIBTYPE1DIR = $(LIBT1DIR)/../type1 -LIBT1SRCDIR = $(srcdir)/$(LIBT1DIR) - -LIBGUI=../gui/libgui.a -LIBGUIDEP=$(LIBGUI) - -CPP = @CPP@ -RANLIB = @RANLIB@ - -# Make `#include <X11/...>' and `-lX...' work. -# This matches web2c (needed only for Metafont). -x_cppflags = @X_CFLAGS@ - -# Extra xdvi-specific compiler options. -ps_def = @PS_DEF@ -DXSERVER_INFO -prog_cflags = @XTRA_WARN_CFLAGS@ -I.. -I$(srcdir)/.. $(x_cppflags) $(ps_def) - -# Note: to be able to use one depend.mk file for both Motif/Xaw (which -# is needed since only maintainers are supposed to invoke `make depend') -# we include *all* object files and have tests for #ifdef MOTIF/XAW inside -# the files. -objects = \ - test_dl_list.o \ - test_string_list.o \ - test_string_utils.o \ - test_util.o \ - run_tests.o - - -# This are the files from xdvi needed to link the tests -xdvi_objects = \ - ../browser.o \ - ../dvi-draw.o \ - ../dvi-init.o \ - ../dvisel.o \ - ../encodings.o \ - ../events.o \ - ../exit-handlers.o \ - ../filehist.o \ - ../font-open.o \ - ../gf.o \ - ../hypertex.o \ - ../image-magick.o \ - ../mime.o \ - ../my-snprintf.o \ - ../my-vsnprintf.o \ - ../pagehist.o \ - ../pk.o \ - ../print-internal.o \ - ../psdps.o \ - ../psgs.o \ - ../psheader.o \ - ../psnews.o \ - ../read-mapfile.o \ - ../search-internal.o \ - ../special.o \ - ../string-utils.o \ - ../string_list.o \ - ../tfmload.o \ - ../util.o \ - ../dl_list.o \ - ../vf.o \ - ../xdvi.o \ - ../xserver-info.o \ - ../x_util.o - -default all: run_tests - -run_tests: $(objects) $(xdvi_objects) $(LIBT1DEP) $(LIBGUIDEP) - $(kpathsea_link) $(objects) $(xdvi_objects) $(LIBGUI) $(x_link) $(LOADLIBES) - -test: run_tests - ./run_tests - -test_verbose: run_tests - ./run_tests -v - -ac_include ../make/dist.mk -ac_include ../make/clean.mk - -clean:: - rm -f *.o *.a - -c_auto_h_dir = .. -ac_include ../make/rdepend.mk -ac_include ./gui/depend.mk -ac_include ./tests/depend.mk diff --git a/Build/source/texk/xdvik/withenable.ac.orig b/Build/source/texk/xdvik/withenable.ac.orig deleted file mode 100644 index 90ee99eb086..00000000000 --- a/Build/source/texk/xdvik/withenable.ac.orig +++ /dev/null @@ -1,156 +0,0 @@ -dnl withenable.ac: --with and --enable options. - -# Check for toolkit options. This used to be --with-x-toolkit, but was changed -# to remove clashes with metafont which accepts different values. -# We allow `yes' as synonym for the default toolkit, for easier communication -# with ../kpathsea/xt.ac. -dnl -dnl This defines --with-x implicitly (which is why we use that package -dnl name below), so put it here, so it comes first in the --help output. -dnl This reads best. -dnl -dnl Remember to add AC_PATH_XTRA when actually using X. -dnl -AC_ARG_WITH([xdvi-x-toolkit], -[ --with-xdvi-x-toolkit=KIT - Use toolkit KIT for xdvi (KIT=motif/xaw/xaw3d/neXtaw). - If no --with-xdvi-x-toolkit option is used, use Motif - if available, else Xaw.], -[ case "${withval}" 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 ;; - * ) -AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw.]) - val=xaw;; - esac - with_xdvi_x_toolkit=$val -]) - - -# Check if the user wants to use Ghostscript, DPS or NeWS to -# display PostScript. -AC_ARG_WITH([ps], -[ --with-ps=PS Use PostScript (PS=no/yes/gs/dps/news, default gs)], -[case $withval in - yes|gs) PS_DEF="$PS_DEF -DPS_GS";; - no) PS_DEF=no;; - dps) PS_DEF="$PS_DEF -DPS_DPS";; - news) PS_DEF="$PS_DEF -DPS_NEWS";; - *) AC_MSG_WARN([Unknown --with-ps argument \`$withval'; using gs.]);; - esac]) - -AC_ARG_ENABLE([grey], -[ --disable-grey Disable greyscale anti-aliasing for shrunken bitmaps] -, -[if test "$enableval" = yes; then - AC_DEFINE([GREY], 1, [Define to enable greyscale anti-aliasing for shrunken bitmaps.]) - else - echo DISABLED grey -fi], -AC_DEFINE([GREY], 1)) - -AC_ARG_ENABLE([color], -[ --disable-color Disable support for color specials], -[if test "$enableval" = yes; then - AC_DEFINE([COLOR], 1, [Define to enable support for color specials.]) - else - echo DISABLED color -fi], -AC_DEFINE([COLOR], 1)) - -dnl OBSOLETE AC_ARG_ENABLE([buttons], -dnl OBSOLETE [ --disable-buttons Disable buttons on the side of the window], -dnl OBSOLETE [if test "$enableval" = yes; then -dnl OBSOLETE AC_DEFINE([BUTTONS], 1, [Define to enable buttons on the side of the window.]) -dnl OBSOLETE else -dnl OBSOLETE echo DISABLED buttons -dnl OBSOLETE fi], -dnl OBSOLETE AC_DEFINE([BUTTONS], 1)) - -dnl OBSOLETE AC_ARG_ENABLE([statusline], -dnl OBSOLETE [ --disable-statusline Disable statusline at bottom of window], -dnl OBSOLETE [if test "$enableval" = yes; then -dnl OBSOLETE AC_DEFINE([STATUSLINE], 1, [Define to enable statusline at bottom of window.]) -dnl OBSOLETE else -dnl OBSOLETE echo DISABLED statusline -dnl OBSOLETE fi], -dnl OBSOLETE AC_DEFINE([STATUSLINE], 1)) - -AC_ARG_ENABLE([t1lib], -[ --disable-t1lib Do not use T1lib (direct rendering of Type1 fonts)], -[if test "$enableval" = yes; then - T1LIB=1 - LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a - AC_DEFINE([LDT1LIB], 1, [Define to compile in t1lib (libtool)]) - AC_DEFINE([T1LIB], 1, [Define to compile in t1lib]) -else - T1LIB= - LDT1LIB= - echo DISABLED t1lib -fi], -[T1LIB=1 -LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a -AC_DEFINE([LDT1LIB], 1) -AC_DEFINE([T1LIB], 1)]) - -AC_ARG_ENABLE([gf], -[ --enable-gf Enable gf format pixel files (in addition to pk)], -[if test "$enableval" != no; then - AC_DEFINE([USE_GF], 1, [Define to enable gf format files (in addition to pk format).]) - OPT_SRCS="$OPT_SRCS gf.c" - OPT_OBJS="$OPT_OBJS gf.o" -fi]) - -AC_ARG_ENABLE([a4], -[ --disable-a4 Set default paper size to letter and default unit to inch], -[if test "$enableval" = yes; then - AC_DEFINE([A4], 1, [Define to use A4 as the default paper size.]) - else - echo Disabled a4/cm, using letter/in instead -fi], -[AC_DEFINE([A4], 1)]) - -AC_ARG_ENABLE([magick], -[ --enable-magick Use ImageMagick to load/render image files. - EXPERIMENTAL - DO NOT USE!], -[if test "$enableval" != no; then - echo -n "checking for ImageMagick >= 5.3 ... " - if MAGICK_VER=`Magick-config --version 2>/dev/null`; then - echo $MAGICK_VER - set -- `echo $MAGICK_VER | sed -e 's/\./ /g'` - MAGICK_VER_MAJOR=$1 - MAGICK_VER_MINOR=$2 - if expr $MAGICK_VER_MAJOR \> 4 >/dev/null && \ - (expr $MAGICK_VER_MAJOR \> 5 >/dev/null || \ - expr $MAGICK_VER_MINOR \> 2 >/dev/null); then - MAGICK_CPP="-DMAGICK_VER_MAJOR=$MAGICK_VER_MAJOR -DMAGICK_VER_MINOR=$MAGICK_VER_MINOR `Magick-config --cppflags`" - # echo "CPP: $MAGICK_CPP" - MAGICK_LD="`Magick-config --libs`" - # echo "LD: $MAGICK_LD" - echo "ImageMagick support enabled" - MAGICK_INCLUDE= - MAGICK_LIBDIR= - - if test "x$with_magick_include" != x; then - MAGIC_INCLUDE="-I$with_magick_include" - fi - if test "x$with_magick_libdir" != x; then - MAGIC_LIBDIR="-L$with_magick_libdir" - fi - - X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD" - X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP" - AC_DEFINE([MAGICK], 1, [Define to use ImageMagick]) - #echo MAGICK_DEF=\"$MAGICK_DEF\" - else - echo "ImageMagick version too old - ImageMagick support disabled" - fi - else - echo "Can't run 'Magick-config' - ImageMagick support disabled" - fi -fi]) - -AC_SUBST(LDT1LIB) diff --git a/Build/source/texk/xdvik/withenable.ac.work b/Build/source/texk/xdvik/withenable.ac.work deleted file mode 100644 index 38dd8f9130b..00000000000 --- a/Build/source/texk/xdvik/withenable.ac.work +++ /dev/null @@ -1,41 +0,0 @@ - -AC_ARG_ENABLE([magick], -[ --enable-magick Use ImageMagick to load/render image files. - EXPERIMENTAL - DO NOT USE!], -[if test "$enableval" != no; then - echo -n "checking for ImageMagick >= 5.3 ... " - if MAGICK_VER=`Magick-config --version 2>/dev/null`; then - echo $MAGICK_VER - set -- `echo $MAGICK_VER | sed -e 's/\./ /g'` - MAGICK_VER_MAJOR=$1 - MAGICK_VER_MINOR=$2 - if expr $MAGICK_VER_MAJOR \> 4 >/dev/null && \ - (expr $MAGICK_VER_MAJOR \> 5 >/dev/null || \ - expr $MAGICK_VER_MINOR \> 2 >/dev/null); then - MAGICK_CPP="-DMAGICK_VER_MAJOR=$MAGICK_VER_MAJOR -DMAGICK_VER_MINOR=$MAGICK_VER_MINOR `Magick-config --cppflags`" - # echo "CPP: $MAGICK_CPP" - MAGICK_LD="`Magick-config --libs`" - # echo "LD: $MAGICK_LD" - echo "ImageMagick support enabled" - MAGICK_INCLUDE= - MAGICK_LIBDIR= - - if test "x$with_magick_include" != x; then - MAGIC_INCLUDE="-I$with_magick_include" - fi - if test "x$with_magick_libdir" != x; then - MAGIC_LIBDIR="-L$with_magick_libdir" - fi - - X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD" - X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP" - AC_DEFINE([MAGICK], 1, [Define to use ImageMagick]) - #echo MAGICK_DEF=\"$MAGICK_DEF\" - else - echo "ImageMagick version too old - ImageMagick support disabled" - fi - else - echo "Can't run 'Magick-config' - ImageMagick support disabled" - fi -fi]) - diff --git a/Build/source/texk/xdvik/xdvi.1.in b/Build/source/texk/xdvik/xdvi.1.in index c57752e45de..6016fa392e1 100644 --- a/Build/source/texk/xdvik/xdvi.1.in +++ b/Build/source/texk/xdvik/xdvi.1.in @@ -719,6 +719,7 @@ and .BR Monochrome . The default is .BR Color . +#endif .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .TP .BR \-h , " \-help" , " \--help" @@ -764,17 +765,6 @@ to suppress warnings about checksum mismatches between the .I dvi file and the font file. .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -#ifkpathsea -.TP -.B \-warnspecials -.RB ( .warnSpecials ) -Causes -.B xdvi -to print warnings about -.B \especial -strings that it cannot process to stderr. These warnings are suppressed by default. -#endif -.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .TP .B \-hushstdout .RB ( .hushStdout ) @@ -1688,9 +1678,9 @@ the value should be either a valid X color name or a hexadecimal color string. .RB ( .warnSpecials ) Causes .B xdvi -to issue warnings about +to print warnings about .B \especial -strings that it cannot process. +strings that it cannot process to stderr. These warnings are suppressed by default. .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .TP .BI \-watchfile " n" @@ -2393,7 +2383,7 @@ option. .RB [ source-what-special() ] Display information about the source special next to the mouse cursor in the statusline. This is the same special that would be found by -.I source-special() , +.IR source-special() , but without invoking the editor. For debugging purposes. .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" .TP diff --git a/Build/source/texk/xdvipdfmx/ac/withenable.ac b/Build/source/texk/xdvipdfmx/ac/withenable.ac index f7c6cb26807..421a0b3997a 100644 --- a/Build/source/texk/xdvipdfmx/ac/withenable.ac +++ b/Build/source/texk/xdvipdfmx/ac/withenable.ac @@ -1,3 +1,7 @@ -## texk/xdvipdfmx/ac/withenable.ac +## texk/xdvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvipdfmx/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for xdvipdfmx KPSE_WITH_PROG([xdvipdfmx], [kpathsea freetype2 libpng]) diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am index a740f04af99..931b0721d34 100644 --- a/Build/source/utils/Makefile.am +++ b/Build/source/utils/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory utils/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../m4 diff --git a/Build/source/utils/ac/withenable.ac b/Build/source/utils/ac/withenable.ac index c9627fa6891..67fde171126 100644 --- a/Build/source/utils/ac/withenable.ac +++ b/Build/source/utils/ac/withenable.ac @@ -1 +1,4 @@ -## utils/ac/withenable.ac +## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. diff --git a/Build/source/utils/configure b/Build/source/utils/configure index cddff3df811..99891e9c1e9 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -774,6 +774,7 @@ enable_mktextex_default with_system_teckit with_teckit_includes with_teckit_libdir +with_graphite with_system_graphite with_graphite_includes with_graphite_libdir @@ -1548,6 +1549,7 @@ Optional Packages: teckit headers installed in DIR --with-teckit-libdir=DIR teckit library installed in DIR + --without-graphite build XeTeX without graphite support --with-system-graphite use installed graphite headers and library --with-graphite-includes=DIR graphite headers installed in DIR @@ -2173,11 +2175,11 @@ if test "x$enable_multiplatform" = xyes; then fi -## ac/withenable.ac +## ac/withenable.ac: configure.ac fragment for the TeX Live top-level -## utils/ac/withenable.ac +## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ -## utils/dialog/ac/withenable.ac +## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. if test "${enable_dialog+set}" = set; then @@ -2192,7 +2194,7 @@ $as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;} esac -## utils/pdfopen/ac/withenable.ac +## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then @@ -2207,7 +2209,7 @@ $as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;} esac -## utils/ps2eps/ac/withenable.ac +## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/ ## configure options and TL libraries required for ps2eps # Check whether --enable-ps2eps was given. if test "${enable_ps2eps+set}" = set; then @@ -2222,7 +2224,7 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;} esac -## utils/psutils/ac/withenable.ac +## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/ ## configure options and TL libraries required for psutils # Check whether --enable-psutils was given. if test "${enable_psutils+set}" = set; then @@ -2237,7 +2239,7 @@ $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;} esac -## utils/t1utils/ac/withenable.ac +## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/ ## configure options and TL libraries required for t1utils # Check whether --enable-t1utils was given. if test "${enable_t1utils+set}" = set; then @@ -2252,7 +2254,7 @@ $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;} esac -## utils/tpic2pdftex/ac/withenable.ac +## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/ ## configure options and TL libraries required for tpic2pdftex # Check whether --enable-tpic2pdftex was given. if test "${enable_tpic2pdftex+set}" = set; then @@ -2267,7 +2269,7 @@ $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;} esac -## utils/vlna/ac/withenable.ac +## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/ ## configure options and TL libraries required for vlna # Check whether --enable-vlna was given. if test "${enable_vlna+set}" = set; then @@ -2283,7 +2285,7 @@ esac -## texk/ac/withenable.ac +## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options and TL libraries required for web2c @@ -2455,7 +2457,7 @@ if test "${enable_web_progs+set}" = set; then fi -## texk/afm2pl/ac/withenable.ac +## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/ ## configure options and TL libraries required for afm2pl # Check whether --enable-afm2pl was given. if test "${enable_afm2pl+set}" = set; then @@ -2474,7 +2476,7 @@ test "x$enable_afm2pl" = xno || { } -## texk/bibtex8/ac/withenable.ac +## texk/bibtex8/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex8/ ## configure options and TL libraries required for bibtex8 # Check whether --enable-bibtex8 was given. if test "${enable_bibtex8+set}" = set; then @@ -2493,7 +2495,7 @@ test "x$enable_bibtex8" = xno || { } -## texk/cjkutils/ac/withenable.ac +## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/ ## configure options and TL libraries required for cjkutils # Check whether --enable-cjkutils was given. if test "${enable_cjkutils+set}" = set; then @@ -2512,7 +2514,7 @@ test "x$enable_cjkutils" = xno || { } -## texk/detex/ac/withenable.ac +## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/ ## configure options and TL libraries required for detex # Check whether --enable-detex was given. if test "${enable_detex+set}" = set; then @@ -2531,7 +2533,7 @@ test "x$enable_detex" = xno || { } -## texk/devnag/ac/withenable.ac +## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/ ## configure options and TL libraries required for devnag # Check whether --enable-devnag was given. if test "${enable_devnag+set}" = set; then @@ -2546,7 +2548,7 @@ $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;} esac -## texk/dtl/ac/withenable.ac +## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/ ## configure options and TL libraries required for dtl # Check whether --enable-dtl was given. if test "${enable_dtl+set}" = set; then @@ -2565,7 +2567,7 @@ test "x$enable_dtl" = xno || { } -## texk/dvi2tty/ac/withenable.ac +## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/ ## configure options and TL libraries required for dvi2tty # Check whether --enable-dvi2tty was given. if test "${enable_dvi2tty+set}" = set; then @@ -2584,7 +2586,7 @@ test "x$enable_dvi2tty" = xno || { } -## texk/dvidvi/ac/withenable.ac +## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/ ## configure options and TL libraries required for dvidvi # Check whether --enable-dvidvi was given. if test "${enable_dvidvi+set}" = set; then @@ -2603,7 +2605,7 @@ test "x$enable_dvidvi" = xno || { } -## texk/dviljk/ac/withenable.ac +## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/ ## configure options and TL libraries required for dviljk # Check whether --enable-dviljk was given. if test "${enable_dviljk+set}" = set; then @@ -2622,7 +2624,7 @@ test "x$enable_dviljk" = xno || { } -## texk/dvipdfm/ac/withenable.ac +## texk/dvipdfm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm/ ## configure options and TL libraries required for dvipdfm # Check whether --enable-dvipdfm was given. if test "${enable_dvipdfm+set}" = set; then @@ -2642,7 +2644,7 @@ test "x$enable_dvipdfm" = xno || { } -## texk/dvipdfmx/ac/withenable.ac +## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/ ## configure options and TL libraries required for dvipdfmx # Check whether --enable-dvipdfmx was given. if test "${enable_dvipdfmx+set}" = set; then @@ -2662,7 +2664,7 @@ test "x$enable_dvipdfmx" = xno || { } -## texk/dvipng/ac/withenable.ac +## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options and TL libraries required for dvipng # Check whether --enable-dvipng was given. if test "${enable_dvipng+set}" = set; then @@ -2683,7 +2685,7 @@ test "x$enable_dvipng" = xno || { need_t1lib=yes } -## texk/dvipng/ac/dvipng.ac +## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options for dvipng # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then @@ -2703,7 +2705,7 @@ fi -## texk/dvipos/ac/withenable.ac +## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/ ## configure options and TL libraries required for dvipos # Check whether --enable-dvipos was given. if test "${enable_dvipos+set}" = set; then @@ -2722,7 +2724,7 @@ test "x$enable_dvipos" = xno || { } -## texk/dvipsk/ac/withenable.ac +## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/ ## configure options and TL libraries required for dvipsk # Check whether --enable-dvipsk was given. if test "${enable_dvipsk+set}" = set; then @@ -2741,7 +2743,7 @@ test "x$enable_dvipsk" = xno || { } -## texk/gsftopk/ac/withenable.ac +## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/ ## configure options and TL libraries required for gsftopk # Check whether --enable-gsftopk was given. if test "${enable_gsftopk+set}" = set; then @@ -2760,7 +2762,7 @@ test "x$enable_gsftopk" = xno || { } -## texk/lacheck/ac/withenable.ac +## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/ ## configure options and TL libraries required for lacheck # Check whether --enable-lacheck was given. if test "${enable_lacheck+set}" = set; then @@ -2779,7 +2781,7 @@ test "x$enable_lacheck" = xno || { } -## texk/lcdf-typetools/ac/withenable.ac +## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options and TL libraries required for lcdf-typetools # Check whether --enable-lcdf-typetools was given. if test "${enable_lcdf_typetools+set}" = set; then @@ -2797,7 +2799,7 @@ test "x$enable_lcdf_typetools" = xno || { need_kpathsea=yes } -## texk/lcdf-typetools/ac/lcdf-typetools.ac +## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options for lcdf-typetools # Check whether --enable-cfftot1 was given. if test "${enable_cfftot1+set}" = set; then @@ -2859,7 +2861,7 @@ fi -## texk/makeindexk/ac/withenable.ac +## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/ ## configure options and TL libraries required for makeindexk # Check whether --enable-makeindexk was given. if test "${enable_makeindexk+set}" = set; then @@ -2878,7 +2880,7 @@ test "x$enable_makeindexk" = xno || { } -## texk/musixflx/ac/withenable.ac +## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ ## configure options and TL libraries required for musixflx # Check whether --enable-musixflx was given. if test "${enable_musixflx+set}" = set; then @@ -2893,7 +2895,7 @@ $as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;} esac -## texk/ps2pkm/ac/withenable.ac +## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ ## configure options and TL libraries required for ps2pkm # Check whether --enable-ps2pkm was given. if test "${enable_ps2pkm+set}" = set; then @@ -2912,7 +2914,7 @@ test "x$enable_ps2pkm" = xno || { } -## texk/seetexk/ac/withenable.ac +## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ ## configure options and TL libraries required for seetexk # Check whether --enable-seetexk was given. if test "${enable_seetexk+set}" = set; then @@ -2931,7 +2933,7 @@ test "x$enable_seetexk" = xno || { } -## texk/tex4htk/ac/withenable.ac +## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/ ## configure options and TL libraries required for tex4htk # Check whether --enable-tex4htk was given. if test "${enable_tex4htk+set}" = set; then @@ -2950,7 +2952,7 @@ test "x$enable_tex4htk" = xno || { } -## texk/ttf2pk/ac/withenable.ac +## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/ ## configure options and TL libraries required for ttf2pk # Check whether --enable-ttf2pk was given. if test "${enable_ttf2pk+set}" = set; then @@ -2970,7 +2972,7 @@ test "x$enable_ttf2pk" = xno || { } -## texk/ttfdump/ac/withenable.ac +## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ ## configure options and TL libraries required for ttfdump # Check whether --enable-ttfdump was given. if test "${enable_ttfdump+set}" = set; then @@ -2989,7 +2991,7 @@ test "x$enable_ttfdump" = xno || { } -## texk/xdv2pdf/ac/withenable.ac +## texk/xdv2pdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdv2pdf/ ## configure options and TL libraries required for xdv2pdf # Check whether --enable-xdv2pdf was given. if test "${enable_xdv2pdf+set}" = set; then @@ -3008,7 +3010,7 @@ test "x$enable_xdv2pdf" = xno || { } -## texk/xdvik/ac/withenable.ac +## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then @@ -3027,7 +3029,7 @@ test "x$enable_xdvik" = xno || { need_t1lib=yes } -## texk/xdvik/ac/xdvik.ac +## 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. @@ -3037,7 +3039,7 @@ fi -## texk/xdvipdfmx/ac/withenable.ac +## texk/xdvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvipdfmx/ ## configure options and TL libraries required for xdvipdfmx # Check whether --enable-xdvipdfmx was given. if test "${enable_xdvipdfmx+set}" = set; then @@ -3058,7 +3060,7 @@ test "x$enable_xdvipdfmx" = xno || { } -## texk/tetex/ac/withenable.ac +## texk/tetex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tetex/ ## configure options and TL libraries required for tetex # Check whether --enable-tetex was given. if test "${enable_tetex+set}" = set; then @@ -3073,7 +3075,7 @@ $as_echo "$as_me: Assuming \`--enable-tetex=$enable_tetex'" >&6;} esac -## texk/texlive/ac/withenable.ac +## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ ## configure options and TL libraries required for texlive # Check whether --enable-texlive was given. if test "${enable_texlive+set}" = set; then @@ -3179,13 +3181,13 @@ case $enable_mktextex_default in esac -## libs/ac/withenable.ac +## libs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/ ## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/ ## configure options and TL libraries required for icu (modified for XeTeX) -## libs/teckit/ac/withenable.ac +## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ ## configure options and TL libraries required for teckit # Check whether --with-system-teckit was given. @@ -3232,7 +3234,15 @@ test "x$need_teckit" = xyes && { } -## libs/graphite/ac/withenable.ac +## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ +## XeTeX can be built without graphite support + +# Check whether --with-graphite was given. +if test "${with_graphite+set}" = set; then + withval=$with_graphite; +fi + +test "x$with_graphite" = xno && need_graphite=no ## configure options and TL libraries required for graphite # Check whether --with-system-graphite was given. @@ -3263,11 +3273,11 @@ $as_echo "$as_me: Assuming installed \`graphite' headers and library" >&6;} fi -## libs/xpdf/ac/withenable.ac +## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf -## libs/gd/kpse/withenable.ac +## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd # Check whether --with-system-gd was given. @@ -3314,7 +3324,7 @@ test "x$need_gd" = xyes && { } -## libs/freetype2/ac/withenable.ac +## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ ## configure options and TL libraries required for freetype2 # Check whether --with-system-freetype2 was given. @@ -3361,7 +3371,7 @@ test "x$need_freetype2" = xyes && { } -## libs/freetype/ac/withenable.ac +## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ ## configure options and TL libraries required for freetype # Check whether --with-system-freetype was given. @@ -3392,7 +3402,7 @@ $as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;} fi -## libs/t1lib/ac/withenable.ac +## libs/t1lib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/ ## configure options and TL libraries required for t1lib # Check whether --with-system-t1lib was given. @@ -3423,11 +3433,11 @@ $as_echo "$as_me: Assuming installed \`t1lib' headers and library" >&6;} fi -## libs/obsdcompat/ac/withenable.ac +## libs/obsdcompat/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/obsdcompat/ ## configure options and TL libraries required for obsdcompat -## libs/libpng/kpse/withenable.ac +## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ ## configure options and TL libraries required for libpng # Check whether --with-system-libpng was given. @@ -3474,7 +3484,7 @@ test "x$need_libpng" = xyes && { } -## libs/zlib/ac/withenable.ac +## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ ## configure options and TL libraries required for zlib # Check whether --with-system-zlib was given. diff --git a/Build/source/utils/dialog/ac/withenable.ac b/Build/source/utils/dialog/ac/withenable.ac index e0383ea4259..a4120c20a51 100644 --- a/Build/source/utils/dialog/ac/withenable.ac +++ b/Build/source/utils/dialog/ac/withenable.ac @@ -1,3 +1,7 @@ -## utils/dialog/ac/withenable.ac +## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for dialog KPSE_WITH_PROG([dialog]) diff --git a/Build/source/utils/dummy/Makefile.am b/Build/source/utils/dummy/Makefile.am index 9b611c108f5..67d8f26ea15 100644 --- a/Build/source/utils/dummy/Makefile.am +++ b/Build/source/utils/dummy/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory utils/dummy/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## noinst_DATA = ../subutilsdir-configure diff --git a/Build/source/utils/dummy/README b/Build/source/utils/dummy/README index 6d82affd248..621b41c1f24 100644 --- a/Build/source/utils/dummy/README +++ b/Build/source/utils/dummy/README @@ -1,3 +1,6 @@ +Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +You may freely use, modify and/or distribute this file. + This directory utils/dummy does not build or install anything. Its purpose is to record the command line used to invoke utils/dummy/configure from utils/configure. This information is then used by utils/Makefile to invoke diff --git a/Build/source/utils/pdfopen/ac/withenable.ac b/Build/source/utils/pdfopen/ac/withenable.ac index 6d01cecc640..027f2b58a6a 100644 --- a/Build/source/utils/pdfopen/ac/withenable.ac +++ b/Build/source/utils/pdfopen/ac/withenable.ac @@ -1,3 +1,7 @@ -## utils/pdfopen/ac/withenable.ac +## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for pdfopen KPSE_WITH_PROG([pdfopen]) diff --git a/Build/source/utils/ps2eps/ac/withenable.ac b/Build/source/utils/ps2eps/ac/withenable.ac index 71c67b9ef40..0cc35384c75 100644 --- a/Build/source/utils/ps2eps/ac/withenable.ac +++ b/Build/source/utils/ps2eps/ac/withenable.ac @@ -1,3 +1,7 @@ -## utils/ps2eps/ac/withenable.ac +## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for ps2eps KPSE_WITH_PROG([ps2eps]) diff --git a/Build/source/utils/psutils/ac/withenable.ac b/Build/source/utils/psutils/ac/withenable.ac index 80306bea00e..5155149ea59 100644 --- a/Build/source/utils/psutils/ac/withenable.ac +++ b/Build/source/utils/psutils/ac/withenable.ac @@ -1,3 +1,7 @@ -## utils/psutils/ac/withenable.ac +## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for psutils KPSE_WITH_PROG([psutils]) diff --git a/Build/source/utils/t1utils/ac/withenable.ac b/Build/source/utils/t1utils/ac/withenable.ac index 473ca872120..712ca6d3bcd 100644 --- a/Build/source/utils/t1utils/ac/withenable.ac +++ b/Build/source/utils/t1utils/ac/withenable.ac @@ -1,3 +1,7 @@ -## utils/t1utils/ac/withenable.ac +## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for t1utils KPSE_WITH_PROG([t1utils]) diff --git a/Build/source/utils/tpic2pdftex/ac/withenable.ac b/Build/source/utils/tpic2pdftex/ac/withenable.ac index f2e49b65139..a8f812e9660 100644 --- a/Build/source/utils/tpic2pdftex/ac/withenable.ac +++ b/Build/source/utils/tpic2pdftex/ac/withenable.ac @@ -1,3 +1,7 @@ -## utils/tpic2pdftex/ac/withenable.ac +## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for tpic2pdftex KPSE_WITH_PROG([tpic2pdftex]) diff --git a/Build/source/utils/vlna/ac/withenable.ac b/Build/source/utils/vlna/ac/withenable.ac index ebbc6a68b27..a1773efb38a 100644 --- a/Build/source/utils/vlna/ac/withenable.ac +++ b/Build/source/utils/vlna/ac/withenable.ac @@ -1,3 +1,7 @@ -## utils/vlna/ac/withenable.ac +## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/ +dnl +dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl ## configure options and TL libraries required for vlna KPSE_WITH_PROG([vlna]) |