summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/afm2pl/c-auto.in18
-rw-r--r--Build/source/texk/afm2pl/stamp-aclocal1
-rw-r--r--Build/source/texk/afm2pl/stamp-auto.in1
-rw-r--r--Build/source/texk/bibtex8/ChangeLog5
-rw-r--r--Build/source/texk/bibtex8/c-auto.in40
-rwxr-xr-xBuild/source/texk/bibtex8/configure154
-rw-r--r--Build/source/texk/bibtex8/configure.in3
-rw-r--r--Build/source/texk/bibtex8/stamp-aclocal1
-rw-r--r--Build/source/texk/cjkutils/stamp-aclocal1
-rwxr-xr-xBuild/source/texk/configure96
-rw-r--r--Build/source/texk/detex/c-auto.in37
-rw-r--r--Build/source/texk/detex/stamp-aclocal1
-rw-r--r--Build/source/texk/detex/stamp-auto.in1
-rw-r--r--Build/source/texk/dtl/ChangeLog5
-rw-r--r--Build/source/texk/dtl/aclocal.m41
-rw-r--r--Build/source/texk/dtl/c-auto.in233
-rwxr-xr-xBuild/source/texk/dtl/configure229
-rw-r--r--Build/source/texk/dtl/configure.in6
-rw-r--r--Build/source/texk/dtl/stamp-aclocal1
-rw-r--r--Build/source/texk/dtl/stamp-auto.in1
-rw-r--r--Build/source/texk/dvi2tty/ChangeLog4
-rw-r--r--Build/source/texk/dvi2tty/c-auto.in16
-rwxr-xr-xBuild/source/texk/dvi2tty/configure584
-rw-r--r--Build/source/texk/dvi2tty/configure.in8
-rw-r--r--Build/source/texk/dvi2tty/stamp-aclocal1
-rw-r--r--Build/source/texk/dvi2tty/stamp-auto.in1
-rw-r--r--Build/source/texk/dvidvi/ChangeLog5
-rw-r--r--Build/source/texk/dvidvi/aclocal.m41
-rw-r--r--Build/source/texk/dvidvi/c-auto.in233
-rwxr-xr-xBuild/source/texk/dvidvi/configure229
-rw-r--r--Build/source/texk/dvidvi/configure.in6
-rw-r--r--Build/source/texk/dvidvi/stamp-aclocal1
-rw-r--r--Build/source/texk/dvidvi/stamp-auto.in1
-rw-r--r--Build/source/texk/dviljk/ChangeLog4
-rw-r--r--Build/source/texk/dviljk/acconfig.h7
-rw-r--r--Build/source/texk/dviljk/c-auto.in50
-rw-r--r--Build/source/texk/dviljk/stamp-aclocal1
-rw-r--r--Build/source/texk/dviljk/stamp-auto.in2
-rw-r--r--Build/source/texk/dvipdfm/ChangeLog16
-rw-r--r--Build/source/texk/dvipdfm/acconfig.h.dist (renamed from Build/source/texk/dvipdfm/acconfig.h)0
-rw-r--r--Build/source/texk/dvipdfm/acinclude.m422
-rw-r--r--Build/source/texk/dvipdfm/c-auto.in108
-rw-r--r--Build/source/texk/dvipdfm/config.h11
-rwxr-xr-xBuild/source/texk/dvipdfm/configure39
-rw-r--r--Build/source/texk/dvipdfm/configure.in27
-rw-r--r--Build/source/texk/dvipdfm/dvipdfm.c4
-rw-r--r--Build/source/texk/dvipdfm/stamp-aclocal1
-rw-r--r--Build/source/texk/dvipdfm/stamp-auto.in2
-rw-r--r--Build/source/texk/dvipng/configure.ac2
-rw-r--r--Build/source/texk/dvipos/ChangeLog5
-rw-r--r--Build/source/texk/dvipos/aclocal.m41
-rw-r--r--Build/source/texk/dvipos/c-auto.in179
-rwxr-xr-xBuild/source/texk/dvipos/configure228
-rw-r--r--Build/source/texk/dvipos/configure.in4
-rw-r--r--Build/source/texk/dvipos/stamp-aclocal1
-rw-r--r--Build/source/texk/dvipos/stamp-auto.in1
-rw-r--r--Build/source/texk/dvipsk/ChangeLog4
-rw-r--r--Build/source/texk/dvipsk/acconfig.h24
-rw-r--r--Build/source/texk/dvipsk/c-auto.in49
-rw-r--r--Build/source/texk/dvipsk/stamp-aclocal1
-rw-r--r--Build/source/texk/dvipsk/stamp-auto.in2
-rw-r--r--Build/source/texk/gsftopk/ChangeLog4
-rw-r--r--Build/source/texk/gsftopk/acconfig.h0
-rw-r--r--Build/source/texk/gsftopk/c-auto.in104
-rw-r--r--Build/source/texk/gsftopk/configure.in6
-rw-r--r--Build/source/texk/gsftopk/stamp-aclocal1
-rw-r--r--Build/source/texk/gsftopk/stamp-auto.in2
-rw-r--r--Build/source/texk/kpathsea/ChangeLog26
-rw-r--r--Build/source/texk/kpathsea/acconfig.h64
-rw-r--r--Build/source/texk/kpathsea/aclocal.m41
-rw-r--r--Build/source/texk/kpathsea/c-auto.in227
-rw-r--r--Build/source/texk/kpathsea/common.ac77
-rwxr-xr-xBuild/source/texk/kpathsea/configure235
-rw-r--r--Build/source/texk/kpathsea/configure.in41
-rw-r--r--Build/source/texk/kpathsea/lib.h2
-rw-r--r--Build/source/texk/kpathsea/stamp-aclocal1
-rw-r--r--Build/source/texk/kpathsea/stamp-auto.in2
-rw-r--r--Build/source/texk/lacheck/ChangeLog5
-rw-r--r--Build/source/texk/lacheck/aclocal.m41
-rw-r--r--Build/source/texk/lacheck/c-auto.in240
-rwxr-xr-xBuild/source/texk/lacheck/configure231
-rw-r--r--Build/source/texk/lacheck/configure.in8
-rw-r--r--Build/source/texk/lacheck/stamp-aclocal1
-rw-r--r--Build/source/texk/lacheck/stamp-auto.in1
-rw-r--r--Build/source/texk/m4/ChangeLog5
-rw-r--r--Build/source/texk/m4/kpse_mtim.m423
-rw-r--r--Build/source/texk/make/ChangeLog6
-rw-r--r--Build/source/texk/make/config.mk52
-rw-r--r--Build/source/texk/makeindexk/ChangeLog4
-rw-r--r--Build/source/texk/makeindexk/acconfig.h6
-rw-r--r--Build/source/texk/makeindexk/c-auto.in63
-rw-r--r--Build/source/texk/makeindexk/stamp-aclocal1
-rw-r--r--Build/source/texk/makeindexk/stamp-auto.in2
-rw-r--r--Build/source/texk/musixflx/ChangeLog5
-rw-r--r--Build/source/texk/musixflx/aclocal.m41
-rw-r--r--Build/source/texk/musixflx/c-auto.in233
-rwxr-xr-xBuild/source/texk/musixflx/configure229
-rw-r--r--Build/source/texk/musixflx/configure.in6
-rw-r--r--Build/source/texk/musixflx/stamp-aclocal1
-rw-r--r--Build/source/texk/musixflx/stamp-auto.in1
-rw-r--r--Build/source/texk/ps2pkm/ChangeLog4
-rw-r--r--Build/source/texk/ps2pkm/acconfig.h24
-rw-r--r--Build/source/texk/ps2pkm/c-auto.in64
-rw-r--r--Build/source/texk/ps2pkm/stamp-aclocal1
-rw-r--r--Build/source/texk/ps2pkm/stamp-auto.in2
-rw-r--r--Build/source/texk/seetexk/ChangeLog5
-rw-r--r--Build/source/texk/seetexk/acconfig.h26
-rw-r--r--Build/source/texk/seetexk/aclocal.m41
-rw-r--r--Build/source/texk/seetexk/c-auto.in216
-rwxr-xr-xBuild/source/texk/seetexk/configure229
-rw-r--r--Build/source/texk/seetexk/configure.in4
-rw-r--r--Build/source/texk/seetexk/stamp-aclocal1
-rw-r--r--Build/source/texk/seetexk/stamp-auto.in2
-rw-r--r--Build/source/texk/stamp-aclocal1
-rw-r--r--Build/source/texk/tetex/stamp-aclocal1
-rw-r--r--Build/source/texk/tex4htk/ChangeLog6
-rw-r--r--Build/source/texk/tex4htk/acconfig.h26
-rw-r--r--Build/source/texk/tex4htk/aclocal.m41
-rw-r--r--Build/source/texk/tex4htk/c-auto.in212
-rw-r--r--Build/source/texk/tex4htk/config.h1
-rwxr-xr-xBuild/source/texk/tex4htk/configure229
-rw-r--r--Build/source/texk/tex4htk/configure.in4
-rw-r--r--Build/source/texk/tex4htk/stamp-aclocal1
-rw-r--r--Build/source/texk/tex4htk/stamp-auto.in2
-rw-r--r--Build/source/texk/texlive/ChangeLog6
-rw-r--r--Build/source/texk/texlive/aclocal.m41
-rw-r--r--Build/source/texk/texlive/c-auto.in179
-rwxr-xr-xBuild/source/texk/texlive/configure230
-rw-r--r--Build/source/texk/texlive/configure.in4
-rw-r--r--Build/source/texk/texlive/stamp-aclocal1
-rw-r--r--Build/source/texk/texlive/stamp-auto.in1
-rw-r--r--Build/source/texk/ttf2pk/ChangeLog5
-rw-r--r--Build/source/texk/ttf2pk/c-auto.h23
-rw-r--r--Build/source/texk/ttf2pk/c-auto.in55
-rwxr-xr-xBuild/source/texk/ttf2pk/configure153
-rw-r--r--Build/source/texk/ttf2pk/configure.in2
-rw-r--r--Build/source/texk/ttf2pk/stamp-aclocal1
-rw-r--r--Build/source/texk/ttf2pk/stamp-auto.in1
-rw-r--r--Build/source/texk/web2c/ChangeLog11
-rw-r--r--Build/source/texk/web2c/acconfig.h51
-rw-r--r--Build/source/texk/web2c/c-auto.in233
-rwxr-xr-xBuild/source/texk/web2c/configure78
-rw-r--r--Build/source/texk/web2c/configure.in32
-rw-r--r--Build/source/texk/web2c/mpware/ChangeLog5
-rw-r--r--Build/source/texk/web2c/mpware/makempx.c2
-rw-r--r--Build/source/texk/web2c/mpware/newer.c2
-rw-r--r--Build/source/texk/web2c/stamp-aclocal1
-rw-r--r--Build/source/texk/web2c/stamp-auto.in2
-rw-r--r--Build/source/texk/web2c/window/ChangeLog4
-rw-r--r--Build/source/texk/web2c/window/x11-Xt.c5
-rw-r--r--Build/source/texk/web2c/withenable.ac39
-rw-r--r--Build/source/texk/xdv2pdf/ChangeLog10
-rw-r--r--Build/source/texk/xdv2pdf/acconfig.h.dist (renamed from Build/source/texk/xdv2pdf/acconfig.h)0
-rw-r--r--Build/source/texk/xdv2pdf/c-auto.in91
-rw-r--r--Build/source/texk/xdv2pdf/config.h11
-rwxr-xr-xBuild/source/texk/xdv2pdf/configure28
-rw-r--r--Build/source/texk/xdv2pdf/configure.in16
-rw-r--r--Build/source/texk/xdv2pdf/stamp-aclocal1
-rw-r--r--Build/source/texk/xdv2pdf/stamp-auto.in1
-rw-r--r--Build/source/texk/xdvik/CHANGES7
-rw-r--r--Build/source/texk/xdvik/acconfig.h386
-rw-r--r--Build/source/texk/xdvik/acinclude.m458
-rw-r--r--Build/source/texk/xdvik/c-auto.in558
-rwxr-xr-xBuild/source/texk/xdvik/configure88
-rw-r--r--Build/source/texk/xdvik/configure.in14
-rw-r--r--Build/source/texk/xdvik/stamp-aclocal1
-rw-r--r--Build/source/texk/xdvik/stamp-auto.in2
-rw-r--r--Build/source/texk/xdvik/withenable.ac24
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.in14
-rw-r--r--Build/source/texk/xdvipdfmx/aclocal.m41739
-rw-r--r--Build/source/texk/xdvipdfmx/data/Makefile.in14
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.in14
172 files changed, 6305 insertions, 3600 deletions
diff --git a/Build/source/texk/afm2pl/c-auto.in b/Build/source/texk/afm2pl/c-auto.in
index 9c30520187e..da1542ef55c 100644
--- a/Build/source/texk/afm2pl/c-auto.in
+++ b/Build/source/texk/afm2pl/c-auto.in
@@ -1,4 +1,16 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* The number of bytes in a int. */
-#undef SIZEOF_INT
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
diff --git a/Build/source/texk/afm2pl/stamp-aclocal b/Build/source/texk/afm2pl/stamp-aclocal
new file mode 100644
index 00000000000..18952f6df85
--- /dev/null
+++ b/Build/source/texk/afm2pl/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:36 CET 2008
diff --git a/Build/source/texk/afm2pl/stamp-auto.in b/Build/source/texk/afm2pl/stamp-auto.in
new file mode 100644
index 00000000000..7fed879ad62
--- /dev/null
+++ b/Build/source/texk/afm2pl/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:36:37 CET 2008
diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog
index deeb8cec26f..0114a7b9936 100644
--- a/Build/source/texk/bibtex8/ChangeLog
+++ b/Build/source/texk/bibtex8/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c: Fix a typo (relevant for non-kpathsea version).
diff --git a/Build/source/texk/bibtex8/c-auto.in b/Build/source/texk/bibtex8/c-auto.in
deleted file mode 100644
index 8860af89b38..00000000000
--- a/Build/source/texk/bibtex8/c-auto.in
+++ /dev/null
@@ -1,40 +0,0 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
-
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
-
-/* Define if you have the poll function. */
-#undef HAVE_POLL
-
-/* Define if you have the sigaction function. */
-#undef HAVE_SIGACTION
-
-/* Define if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
-/* Define if you have the <select.h> header file. */
-#undef HAVE_SELECT_H
-
-/* Define if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure
index da765d6df5c..83184107f85 100755
--- a/Build/source/texk/bibtex8/configure
+++ b/Build/source/texk/bibtex8/configure
@@ -1656,9 +1656,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3017,7 +3014,37 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-DEFS=-DHAVE_CONFIG_H
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section. Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+t clear
+:clear
+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+ g
+ s/^\n//
+ s/\n/ /g
+ p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
ac_libobjs=
ac_ltlibobjs=
@@ -3352,7 +3379,6 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
-config_headers="$ac_config_headers"
_ACEOF
@@ -3370,15 +3396,10 @@ Usage: $0 [OPTIONS] [FILE]...
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
Configuration files:
$config_files
-Configuration headers:
-$config_headers
-
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
@@ -3428,16 +3449,7 @@ do
$ac_shift
CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
+ --he | --h | --help | --hel | -h )
echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -3492,7 +3504,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
"Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
@@ -3509,7 +3520,6 @@ done
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -3671,7 +3681,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
+for ac_tag in :F $CONFIG_FILES
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
@@ -3911,104 +3921,7 @@ which seems to be undefined. Please make sure it is defined." >&2;}
*) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
esac
;;
- :H)
- #
- # CONFIG_HEADER
- #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status. If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless. But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-ac_dB='\\)[ (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
- sed -n '
- t rset
- :rset
- s/^[ ]*#[ ]*define[ ][ ]*//
- t ok
- d
- :ok
- s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
- ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[ #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-b
-:def
-_ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
- if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
- fi
- else
- echo "/* $configure_input */"
- cat "$ac_result"
- fi
- rm -f "$tmp/out12"
- ;;
esac
@@ -4117,4 +4030,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-date >stamp-auto
diff --git a/Build/source/texk/bibtex8/configure.in b/Build/source/texk/bibtex8/configure.in
index 764f8069755..2284eb40f89 100644
--- a/Build/source/texk/bibtex8/configure.in
+++ b/Build/source/texk/bibtex8/configure.in
@@ -2,8 +2,6 @@ dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(bibtex-1.c)
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
-
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
@@ -13,4 +11,3 @@ sinclude(../kpathsea/withenable.ac)
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-date >stamp-auto
diff --git a/Build/source/texk/bibtex8/stamp-aclocal b/Build/source/texk/bibtex8/stamp-aclocal
new file mode 100644
index 00000000000..65fb9c2ec7b
--- /dev/null
+++ b/Build/source/texk/bibtex8/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:38 CET 2008
diff --git a/Build/source/texk/cjkutils/stamp-aclocal b/Build/source/texk/cjkutils/stamp-aclocal
new file mode 100644
index 00000000000..8eb68ae3998
--- /dev/null
+++ b/Build/source/texk/cjkutils/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:39 CET 2008
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 17777ff2930..ecfa39ca7e9 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3816,19 +3816,23 @@ fi
# Check whether --with-editor was given.
if test "${with_editor+set}" = set; then
- withval=$with_editor; cat >>confdefs.h <<_ACEOF
-#define EDITOR "$with_editor"
-_ACEOF
+ withval=$with_editor;
+else
+ with_editor="vi +%d %s"
+fi
-fi
+cat >>confdefs.h <<_ACEOF
+#define EDITOR "$with_editor"
+_ACEOF
# Check whether --enable-ipc was given.
if test "${enable_ipc+set}" = set; then
enableval=$enable_ipc; if test "x$enableval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define IPC 1
+
+cat >>confdefs.h <<\_ACEOF
+#define IPC
_ACEOF
# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too?
@@ -3990,18 +3994,21 @@ fi
# Check whether --enable-auto-core was given.
if test "${enable_auto_core+set}" = set; then
- enableval=$enable_auto_core; cat >>confdefs.h <<\_ACEOF
-#define FUNNY_CORE_DUMP 1
+ enableval=$enable_auto_core;
+cat >>confdefs.h <<\_ACEOF
+#define FUNNY_CORE_DUMP
_ACEOF
+
fi
# Check whether --enable-dump-share was given.
if test "${enable_dump_share+set}" = set; then
enableval=$enable_dump_share; if test "x$enableval" = xno; then
- cat >>confdefs.h <<\_ACEOF
-#define NO_DUMP_SHARE 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_DUMP_SHARE
_ACEOF
fi
@@ -4027,8 +4034,9 @@ fi
# Check whether --with-epsfwin was given.
if test "${with_epsfwin+set}" = set; then
withval=$with_epsfwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define EPSFWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define EPSFWIN
_ACEOF
fi
@@ -4039,8 +4047,9 @@ fi
# Check whether --with-hp2627win was given.
if test "${with_hp2627win+set}" = set; then
withval=$with_hp2627win; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define HP2627WIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define HP2627WIN
_ACEOF
fi
@@ -4051,8 +4060,9 @@ fi
# Check whether --with-mftalkwin was given.
if test "${with_mftalkwin+set}" = set; then
withval=$with_mftalkwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define MFTALKWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define MFTALKWIN
_ACEOF
fi
@@ -4063,8 +4073,9 @@ fi
# Check whether --with-nextwin was given.
if test "${with_nextwin+set}" = set; then
withval=$with_nextwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define NEXTWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NEXTWIN
_ACEOF
fi
@@ -4075,8 +4086,9 @@ fi
# Check whether --with-regiswin was given.
if test "${with_regiswin+set}" = set; then
withval=$with_regiswin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define REGISWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define REGISWIN
_ACEOF
fi
@@ -4088,8 +4100,9 @@ fi
if test "${with_suntoolswin+set}" = set; then
withval=$with_suntoolswin; if test "x$withval" = xyes; then
wlibs="-lsuntool -lsunwindow -lpixrect $wlibs"
- cat >>confdefs.h <<\_ACEOF
-#define SUNWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define SUNWIN
_ACEOF
fi
@@ -4100,8 +4113,9 @@ fi
# Check whether --with-tektronixwin was given.
if test "${with_tektronixwin+set}" = set; then
withval=$with_tektronixwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define TEKTRONIXWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define TEKTRONIXWIN
_ACEOF
fi
@@ -4112,8 +4126,9 @@ fi
# Check whether --with-unitermwin was given.
if test "${with_unitermwin+set}" = set; then
withval=$with_unitermwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define UNITERMWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define UNITERMWIN
_ACEOF
fi
@@ -4174,7 +4189,8 @@ fi
# Check whether --enable-grey was given.
if test "${enable_grey+set}" = set; then
enableval=$enable_grey; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GREY 1
_ACEOF
@@ -4192,7 +4208,8 @@ fi
# Check whether --enable-color was given.
if test "${enable_color+set}" = set; then
enableval=$enable_color; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define COLOR 1
_ACEOF
@@ -4214,11 +4231,13 @@ if test "${enable_t1lib+set}" = set; then
enableval=$enable_t1lib; if test "$enableval" = yes; then
T1LIB=1
LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define LDT1LIB 1
_ACEOF
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define T1LIB 1
_ACEOF
@@ -4244,7 +4263,8 @@ fi
# Check whether --enable-gf was given.
if test "${enable_gf+set}" = set; then
enableval=$enable_gf; if test "$enableval" != no; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define USE_GF 1
_ACEOF
@@ -4257,7 +4277,8 @@ fi
# Check whether --enable-a4 was given.
if test "${enable_a4+set}" = set; then
enableval=$enable_a4; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define A4 1
_ACEOF
@@ -4301,7 +4322,8 @@ if test "${enable_magick+set}" = set; then
X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD"
X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP"
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAGICK 1
_ACEOF
@@ -6253,7 +6275,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6256 "configure"' > conftest.$ac_ext
+ echo '#line 6278 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6815,7 +6837,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:6818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:6840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -8756,7 +8778,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8759 "configure"
+#line 8781 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8854,7 +8876,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8857 "configure"
+#line 8879 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/Build/source/texk/detex/c-auto.in b/Build/source/texk/detex/c-auto.in
index 898369e1220..9b040bbd823 100644
--- a/Build/source/texk/detex/c-auto.in
+++ b/Build/source/texk/detex/c-auto.in
@@ -1,28 +1,23 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define if lex declares yytext as a char [] by default. */
-#undef YYTEXT_CHAR
-
-/* Define if lex declares yytext as a char * by default, not a char[]. */
-#undef YYTEXT_POINTER
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
-/* Define if lex declares yytext as a unsigned char [] by default. */
-#undef YYTEXT_UCHAR
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
-/* Define if you have the ftime function. */
-#undef HAVE_FTIME
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
-/* Define if you have the gettimeofday function. */
-#undef HAVE_GETTIMEOFDAY
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
-/* Define if you have the strerror function. */
-#undef HAVE_STRERROR
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
-/* Define if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
-/* Define if you have the <sys/timeb.h> header file. */
-#undef HAVE_SYS_TIMEB_H
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+ `char[]'. */
+#undef YYTEXT_POINTER
diff --git a/Build/source/texk/detex/stamp-aclocal b/Build/source/texk/detex/stamp-aclocal
new file mode 100644
index 00000000000..39348b353b8
--- /dev/null
+++ b/Build/source/texk/detex/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:42 CET 2008
diff --git a/Build/source/texk/detex/stamp-auto.in b/Build/source/texk/detex/stamp-auto.in
new file mode 100644
index 00000000000..59787cf35be
--- /dev/null
+++ b/Build/source/texk/detex/stamp-auto.in
@@ -0,0 +1 @@
+Wed Feb 27 16:46:23 CET 2008
diff --git a/Build/source/texk/dtl/ChangeLog b/Build/source/texk/dtl/ChangeLog
index 0062a1d9c7c..f522443e4cf 100644
--- a/Build/source/texk/dtl/ChangeLog
+++ b/Build/source/texk/dtl/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/dtl/aclocal.m4 b/Build/source/texk/dtl/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/dtl/aclocal.m4
+++ b/Build/source/texk/dtl/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/dtl/c-auto.in b/Build/source/texk/dtl/c-auto.in
index 2b6c83703b0..11e5e3d0a77 100644
--- a/Build/source/texk/dtl/c-auto.in
+++ b/Build/source/texk/dtl/c-auto.in
@@ -1,126 +1,187 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
+/* c-auto.in. Generated from configure.in by autoheader. */
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
-/* kpathsea: the version string. */
-#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
-/* web2c: the version string. */
-#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
+#undef GETCWD_FORKS
-/* These came from klibtool's kb_AC_KLIBTOOL_REPLACE_FUNCS, probably no
- longer needed, doesn't hurt to leave them in, though. */
-#undef HAVE_BASENAME
-#undef HAVE_PUTENV
-#undef HAVE_STRCASECMP
-#undef HAVE_STRTOL
-#undef HAVE_STRSTR
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-#undef __CHAR_UNSIGNED__
-#endif
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
-/* Define if the closedir function returns void instead of int. */
-#undef CLOSEDIR_VOID
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
-/* Define to empty if the keyword does not work. */
-#undef const
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
+/* Define to 1 if you have the `getwd' function. */
+#undef HAVE_GETWD
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+/* Define to 1 if you have the `index' function. */
+#undef HAVE_INDEX
-/* The number of bytes in a long. */
-#undef SIZEOF_LONG
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define if you have the basename function. */
-#undef HAVE_BASENAME
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
-/* Define if you have the bcopy function. */
-#undef HAVE_BCOPY
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
-/* Define if you have the getcwd function. */
-#undef HAVE_GETCWD
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
-/* Define if you have the getwd function. */
-#undef HAVE_GETWD
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
-/* Define if you have the putenv function. */
-#undef HAVE_PUTENV
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define if you have the strcasecmp function. */
-#undef HAVE_STRCASECMP
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
-/* Define if you have the strstr function. */
-#undef HAVE_STRSTR
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
-/* Define if you have the strtol function. */
-#undef HAVE_STRTOL
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
-/* Define if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
-/* Define if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define if you have the <sys/dir.h> header file. */
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_DIR_H
-/* Define if you have the <sys/ndir.h> header file. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_NDIR_H
-/* Define if you have the <sys/param.h> header file. */
+/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
+
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if type `char' is unsigned and you are not using gcc. */
+#ifndef __CHAR_UNSIGNED__
+# undef __CHAR_UNSIGNED__
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure
index 71498f26712..ee8aa5a5361 100755
--- a/Build/source/texk/dtl/configure
+++ b/Build/source/texk/dtl/configure
@@ -1882,12 +1882,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 c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5058,7 +5056,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5061 "configure"' > conftest.$ac_ext
+ echo '#line 5059 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5620,7 +5618,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7561,7 +7559,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7564 "configure"
+#line 7562 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7659,7 +7657,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7662 "configure"
+#line 7660 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8893,7 +8891,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9032,6 +9030,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9632,9 +9698,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9643,12 +9709,52 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ 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 ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9670,23 +9776,28 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9741,7 +9852,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9800,7 +9912,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9869,7 +9982,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10083,49 +10197,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -10273,7 +10438,6 @@ fi
-
{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
if test "${ac_cv_c_char_unsigned+set}" = set; then
@@ -11940,4 +12104,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-date >stamp-auto
diff --git a/Build/source/texk/dtl/configure.in b/Build/source/texk/dtl/configure.in
index 1fe68d75677..01f61d8a8a2 100644
--- a/Build/source/texk/dtl/configure.in
+++ b/Build/source/texk/dtl/configure.in
@@ -1,8 +1,10 @@
dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(dv2dt.c)
-sinclude(../kpathsea/common.ac)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
+sinclude(../kpathsea/common.ac)
dnl These tests prevent reliable cross-compilation. Sigh.
AC_C_CHAR_UNSIGNED
@@ -10,5 +12,3 @@ AC_CHECK_SIZEOF(long)
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
diff --git a/Build/source/texk/dtl/stamp-aclocal b/Build/source/texk/dtl/stamp-aclocal
new file mode 100644
index 00000000000..c0e0a3a5aec
--- /dev/null
+++ b/Build/source/texk/dtl/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:44 CET 2008
diff --git a/Build/source/texk/dtl/stamp-auto.in b/Build/source/texk/dtl/stamp-auto.in
new file mode 100644
index 00000000000..a3eb28269ee
--- /dev/null
+++ b/Build/source/texk/dtl/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:36:46 CET 2008
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 096c2572610..87dcbd576a4 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS.
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/dvi2tty/c-auto.in b/Build/source/texk/dvi2tty/c-auto.in
new file mode 100644
index 00000000000..da1542ef55c
--- /dev/null
+++ b/Build/source/texk/dvi2tty/c-auto.in
@@ -0,0 +1,16 @@
+/* c-auto.in. Generated from configure.in by autoheader. */
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure
index 607d5df73c6..43df57858ab 100755
--- a/Build/source/texk/dvi2tty/configure
+++ b/Build/source/texk/dvi2tty/configure
@@ -614,6 +614,11 @@ LIBS
build_alias
host_alias
target_alias
+MAINT
+LD
+AR
+ARFLAGS
+texmfmain
CC
CFLAGS
LDFLAGS
@@ -626,11 +631,6 @@ INSTALL_SCRIPT
INSTALL_DATA
SET_MAKE
LN_S
-MAINT
-LD
-AR
-ARFLAGS
-texmfmain
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1655,8 +1655,213 @@ 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 c-auto.h:c-auto.in"
+
+
+
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&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
+
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+ if test "x$USE_MAINTAINER_MODE" = xyes; then
+ MAINT=
+ else
+ MAINT='#M#'
+ fi
+
+
+
+{ echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
+echo $ECHO_N "checking for loader (symbol LD)... $ECHO_C" >&6; }
+if test "${cf_cv_subst_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+test -z "$LD" && LD=ld
+cf_cv_subst_LD=$LD
+fi
+
+LD=${cf_cv_subst_LD}
+{ echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
+
+
+{ echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
+echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6; }
+if test "${cf_cv_subst_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+test -z "$AR" && AR=ar
+cf_cv_subst_AR=$AR
+fi
+
+AR=${cf_cv_subst_AR}
+{ echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
+
+
+{ echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
+echo $ECHO_N "checking for archiver options (symbol ARFLAGS)... $ECHO_C" >&6; }
+if test "${cf_cv_subst_ARFLAGS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+test -z "$ARFLAGS" && ARFLAGS=rc
+cf_cv_subst_ARFLAGS=$ARFLAGS
+fi
+
+ARFLAGS=${cf_cv_subst_ARFLAGS}
+{ echo "$as_me:$LINENO: result: $ARFLAGS" >&5
+echo "${ECHO_T}$ARFLAGS" >&6; }
+
+
+
+
+# Check whether --with-mktexmf-default was given.
+if test "${with_mktexmf_default+set}" = set; then
+ withval=$with_mktexmf_default;
+else
+ with_mktexmf_default=yes
+fi
+
+
+# Check whether --with-mktexpk-default was given.
+if test "${with_mktexpk_default+set}" = set; then
+ withval=$with_mktexpk_default;
+else
+ with_mktexpk_default=yes
+fi
+
+
+# Check whether --with-mktextfm-default was given.
+if test "${with_mktextfm_default+set}" = set; then
+ withval=$with_mktextfm_default;
+else
+ with_mktextfm_default=yes
+fi
+
+
+# Check whether --with-mkocp-default was given.
+if test "${with_mkocp_default+set}" = set; then
+ withval=$with_mkocp_default;
+else
+ with_mkocp_default=yes
+fi
+
+
+# Check whether --with-mkofm-default was given.
+if test "${with_mkofm_default+set}" = set; then
+ withval=$with_mkofm_default;
+else
+ with_mkofm_default=yes
+fi
+
+
+# Check whether --with-mktexfmt-default was given.
+if test "${with_mktexfmt_default+set}" = set; then
+ withval=$with_mktexfmt_default;
+fi
+
+
+# Check whether --with-mktextex-default was given.
+if test "${with_mktextex_default+set}" = set; then
+ withval=$with_mktextex_default; with_mktextex_default=yes
+else
+ with_mktextex_default=no
+fi
+
+
+{ echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
+echo $ECHO_N "checking where the main texmf tree is located... $ECHO_C" >&6; }
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
+texmfmain=
+if test "x$datadir" != 'x${prefix}/share'; then
+ # First case, datadir is defined...
+ eval p=\"$datadir\"
+ # Unconditionally set the directory, but...
+ texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'`
+ # ... do complain if it wasn't found.
+ if test -d "$texmfmain"; then
+ { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+echo "${ECHO_T}\"$texmfmain\"" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+ { echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
+ *****************************************************************
+ * Error: The main texmf tree was not found. *
+ * If you do not have the files, you should be able to them from *
+ * the same place you got these sources from, or from one of the *
+ * CTAN hosts. *
+ *****************************************************************
+ Winging it." >&5
+echo "$as_me: WARNING: No texmf tree found at $texmfmain.
+ *****************************************************************
+ * Error: The main texmf tree was not found. *
+ * If you do not have the files, you should be able to them from *
+ * the same place you got these sources from, or from one of the *
+ * CTAN hosts. *
+ *****************************************************************
+ Winging it." >&2;}
+ fi
+else
+ # Second case, datadir is default...
+ if test "x$prefix" = "xNONE"; then
+ p="$ac_default_prefix"
+ else
+ eval p=\"$prefix\"
+ fi
+ for e in share/texmf lib/texmf texmf; do
+ if test -d "$p/$e"; then
+ texmfmain='${prefix}'/"$e"
+ break
+ fi
+ done
+ if test -z "$texmfmain" && test "x$prefix" = "xNONE"; then
+ # Still no texmfmain found, no prefix set, perhaps kpsewhich is
+ # installed and can help us out.
+ texmfmain=`kpsewhich --expand-path='$TEXMFMAIN'` 2>/dev/null
+ fi
+ texmfmain=`echo "$texmfmain" | sed 's,//*,/,g'`
+ if test -n "$texmfmain"; then
+ { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
+echo "${ECHO_T}\"$texmfmain\"" >&6; }
+ else
+ eval texmfmain="$datadir/texmf"
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+ { echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
+ *****************************************************************
+ * Error: The main texmf tree was not found. *
+ * Use the --datadir option to specify its parent directory. *
+ * If you do not have the files, you should be able to them from *
+ * the same place you got these sources from, or from one of the *
+ * CTAN hosts. *
+ *****************************************************************
+ Winging it by pretending $texmfmain is correct." >&5
+echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
+ *****************************************************************
+ * Error: The main texmf tree was not found. *
+ * Use the --datadir option to specify its parent directory. *
+ * If you do not have the files, you should be able to them from *
+ * the same place you got these sources from, or from one of the *
+ * CTAN hosts. *
+ *****************************************************************
+ Winging it by pretending $texmfmain is correct." >&2;}
+ fi
+fi
+
-# AC_CONFIG_HEADER(c-auto.h:c-auto.in)
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -2730,210 +2935,6 @@ echo "${ECHO_T}no, using $LN_S" >&6; }
fi
-
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&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
-
- { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
- if test "x$USE_MAINTAINER_MODE" = xyes; then
- MAINT=
- else
- MAINT='#M#'
- fi
-
-
-
-{ echo "$as_me:$LINENO: checking for loader (symbol LD)" >&5
-echo $ECHO_N "checking for loader (symbol LD)... $ECHO_C" >&6; }
-if test "${cf_cv_subst_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-test -z "$LD" && LD=ld
-cf_cv_subst_LD=$LD
-fi
-
-LD=${cf_cv_subst_LD}
-{ echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
-
-
-{ echo "$as_me:$LINENO: checking for archiver (symbol AR)" >&5
-echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6; }
-if test "${cf_cv_subst_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-test -z "$AR" && AR=ar
-cf_cv_subst_AR=$AR
-fi
-
-AR=${cf_cv_subst_AR}
-{ echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-
-
-{ echo "$as_me:$LINENO: checking for archiver options (symbol ARFLAGS)" >&5
-echo $ECHO_N "checking for archiver options (symbol ARFLAGS)... $ECHO_C" >&6; }
-if test "${cf_cv_subst_ARFLAGS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-test -z "$ARFLAGS" && ARFLAGS=rc
-cf_cv_subst_ARFLAGS=$ARFLAGS
-fi
-
-ARFLAGS=${cf_cv_subst_ARFLAGS}
-{ echo "$as_me:$LINENO: result: $ARFLAGS" >&5
-echo "${ECHO_T}$ARFLAGS" >&6; }
-
-
-
-
-# Check whether --with-mktexmf-default was given.
-if test "${with_mktexmf_default+set}" = set; then
- withval=$with_mktexmf_default;
-else
- with_mktexmf_default=yes
-fi
-
-
-# Check whether --with-mktexpk-default was given.
-if test "${with_mktexpk_default+set}" = set; then
- withval=$with_mktexpk_default;
-else
- with_mktexpk_default=yes
-fi
-
-
-# Check whether --with-mktextfm-default was given.
-if test "${with_mktextfm_default+set}" = set; then
- withval=$with_mktextfm_default;
-else
- with_mktextfm_default=yes
-fi
-
-
-# Check whether --with-mkocp-default was given.
-if test "${with_mkocp_default+set}" = set; then
- withval=$with_mkocp_default;
-else
- with_mkocp_default=yes
-fi
-
-
-# Check whether --with-mkofm-default was given.
-if test "${with_mkofm_default+set}" = set; then
- withval=$with_mkofm_default;
-else
- with_mkofm_default=yes
-fi
-
-
-# Check whether --with-mktexfmt-default was given.
-if test "${with_mktexfmt_default+set}" = set; then
- withval=$with_mktexfmt_default;
-fi
-
-
-# Check whether --with-mktextex-default was given.
-if test "${with_mktextex_default+set}" = set; then
- withval=$with_mktextex_default; with_mktextex_default=yes
-else
- with_mktextex_default=no
-fi
-
-
-{ echo "$as_me:$LINENO: checking where the main texmf tree is located" >&5
-echo $ECHO_N "checking where the main texmf tree is located... $ECHO_C" >&6; }
-case $prefix in
- */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
-esac
-texmfmain=
-if test "x$datadir" != 'x${prefix}/share'; then
- # First case, datadir is defined...
- eval p=\"$datadir\"
- # Unconditionally set the directory, but...
- texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'`
- # ... do complain if it wasn't found.
- if test -d "$texmfmain"; then
- { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-echo "${ECHO_T}\"$texmfmain\"" >&6; }
- else
- { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
- { echo "$as_me:$LINENO: WARNING: No texmf tree found at $texmfmain.
- *****************************************************************
- * Error: The main texmf tree was not found. *
- * If you do not have the files, you should be able to them from *
- * the same place you got these sources from, or from one of the *
- * CTAN hosts. *
- *****************************************************************
- Winging it." >&5
-echo "$as_me: WARNING: No texmf tree found at $texmfmain.
- *****************************************************************
- * Error: The main texmf tree was not found. *
- * If you do not have the files, you should be able to them from *
- * the same place you got these sources from, or from one of the *
- * CTAN hosts. *
- *****************************************************************
- Winging it." >&2;}
- fi
-else
- # Second case, datadir is default...
- if test "x$prefix" = "xNONE"; then
- p="$ac_default_prefix"
- else
- eval p=\"$prefix\"
- fi
- for e in share/texmf lib/texmf texmf; do
- if test -d "$p/$e"; then
- texmfmain='${prefix}'/"$e"
- break
- fi
- done
- if test -z "$texmfmain" && test "x$prefix" = "xNONE"; then
- # Still no texmfmain found, no prefix set, perhaps kpsewhich is
- # installed and can help us out.
- texmfmain=`kpsewhich --expand-path='$TEXMFMAIN'` 2>/dev/null
- fi
- texmfmain=`echo "$texmfmain" | sed 's,//*,/,g'`
- if test -n "$texmfmain"; then
- { echo "$as_me:$LINENO: result: \"$texmfmain\"" >&5
-echo "${ECHO_T}\"$texmfmain\"" >&6; }
- else
- eval texmfmain="$datadir/texmf"
- { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
- { echo "$as_me:$LINENO: WARNING: The main texmf tree was not found at $texmfmain.
- *****************************************************************
- * Error: The main texmf tree was not found. *
- * Use the --datadir option to specify its parent directory. *
- * If you do not have the files, you should be able to them from *
- * the same place you got these sources from, or from one of the *
- * CTAN hosts. *
- *****************************************************************
- Winging it by pretending $texmfmain is correct." >&5
-echo "$as_me: WARNING: The main texmf tree was not found at $texmfmain.
- *****************************************************************
- * Error: The main texmf tree was not found. *
- * Use the --datadir option to specify its parent directory. *
- * If you do not have the files, you should be able to them from *
- * the same place you got these sources from, or from one of the *
- * CTAN hosts. *
- *****************************************************************
- Winging it by pretending $texmfmain is correct." >&2;}
- fi
-fi
-
-
ac_config_files="$ac_config_files Makefile.aux:Makefile.in"
ac_config_files="$ac_config_files Makefile:Makefile.aux"
@@ -3015,37 +3016,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section. Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-t clear
-:clear
-s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
- g
- s/^\n//
- s/\n/ /g
- p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
+DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -3380,6 +3351,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
+config_headers="$ac_config_headers"
_ACEOF
@@ -3397,10 +3369,15 @@ Usage: $0 [OPTIONS] [FILE]...
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
+Configuration headers:
+$config_headers
+
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
@@ -3450,7 +3427,16 @@ do
$ac_shift
CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
- --he | --h | --help | --hel | -h )
+ --header | --heade | --head | --hea )
+ $ac_shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -3505,6 +3491,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
+ "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
"Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
@@ -3521,6 +3508,7 @@ done
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -3604,6 +3592,11 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+MAINT!$MAINT$ac_delim
+LD!$LD$ac_delim
+AR!$AR$ac_delim
+ARFLAGS!$ARFLAGS$ac_delim
+texmfmain!$texmfmain$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -3616,11 +3609,6 @@ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
LN_S!$LN_S$ac_delim
-MAINT!$MAINT$ac_delim
-LD!$LD$ac_delim
-AR!$AR$ac_delim
-ARFLAGS!$ARFLAGS$ac_delim
-texmfmain!$texmfmain$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -3682,7 +3670,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
@@ -3922,13 +3910,111 @@ which seems to be undefined. Please make sure it is defined." >&2;}
*) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
esac
;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status. If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless. But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+ sed -n '
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*//
+ t ok
+ d
+ :ok
+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+ # Write a here document:
+ cat >>$CONFIG_STATUS <<_ACEOF
+ # First, check the format of the line:
+ cat >"\$tmp/defines.sed" <<\\CEOF
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
+b
+:def
+_ACEOF
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ echo 'CEOF
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ grep . conftest.tail >/dev/null || break
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
+ if test x"$ac_file" != x-; then
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f $ac_file
+ mv "$tmp/config.h" $ac_file
+ fi
+ else
+ echo "/* $configure_input */"
+ cat "$ac_result"
+ fi
+ rm -f "$tmp/out12"
+ ;;
esac
case $ac_file$ac_mode in
+ "c-auto.h":H) date >stamp-auto ;;
"Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
kpse_input=`case Makefile.in in
[\\/$]*) # Absolute
@@ -4031,5 +4117,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-
-date >stamp-auto
diff --git a/Build/source/texk/dvi2tty/configure.in b/Build/source/texk/dvi2tty/configure.in
index b2d1f2a34ec..0f0a0adaf51 100644
--- a/Build/source/texk/dvi2tty/configure.in
+++ b/Build/source/texk/dvi2tty/configure.in
@@ -1,17 +1,15 @@
dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(dvi2tty.c)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
-# AC_CONFIG_HEADER(c-auto.h:c-auto.in)
+sinclude(../kpathsea/withenable.ac)
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
-sinclude(../kpathsea/withenable.ac)
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-
-dnl update `stamp-auto' since we just remade `c-auto.h'
-date >stamp-auto
diff --git a/Build/source/texk/dvi2tty/stamp-aclocal b/Build/source/texk/dvi2tty/stamp-aclocal
new file mode 100644
index 00000000000..e28c463d415
--- /dev/null
+++ b/Build/source/texk/dvi2tty/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:47 CET 2008
diff --git a/Build/source/texk/dvi2tty/stamp-auto.in b/Build/source/texk/dvi2tty/stamp-auto.in
new file mode 100644
index 00000000000..e28c463d415
--- /dev/null
+++ b/Build/source/texk/dvi2tty/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:36:47 CET 2008
diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog
index af20f891496..0bb51a6e9b9 100644
--- a/Build/source/texk/dvidvi/ChangeLog
+++ b/Build/source/texk/dvidvi/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/dvidvi/aclocal.m4 b/Build/source/texk/dvidvi/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/dvidvi/aclocal.m4
+++ b/Build/source/texk/dvidvi/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/dvidvi/c-auto.in b/Build/source/texk/dvidvi/c-auto.in
index 2b6c83703b0..11e5e3d0a77 100644
--- a/Build/source/texk/dvidvi/c-auto.in
+++ b/Build/source/texk/dvidvi/c-auto.in
@@ -1,126 +1,187 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
+/* c-auto.in. Generated from configure.in by autoheader. */
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
-/* kpathsea: the version string. */
-#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
-/* web2c: the version string. */
-#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
+#undef GETCWD_FORKS
-/* These came from klibtool's kb_AC_KLIBTOOL_REPLACE_FUNCS, probably no
- longer needed, doesn't hurt to leave them in, though. */
-#undef HAVE_BASENAME
-#undef HAVE_PUTENV
-#undef HAVE_STRCASECMP
-#undef HAVE_STRTOL
-#undef HAVE_STRSTR
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-#undef __CHAR_UNSIGNED__
-#endif
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
-/* Define if the closedir function returns void instead of int. */
-#undef CLOSEDIR_VOID
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
-/* Define to empty if the keyword does not work. */
-#undef const
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
+/* Define to 1 if you have the `getwd' function. */
+#undef HAVE_GETWD
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+/* Define to 1 if you have the `index' function. */
+#undef HAVE_INDEX
-/* The number of bytes in a long. */
-#undef SIZEOF_LONG
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define if you have the basename function. */
-#undef HAVE_BASENAME
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
-/* Define if you have the bcopy function. */
-#undef HAVE_BCOPY
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
-/* Define if you have the getcwd function. */
-#undef HAVE_GETCWD
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
-/* Define if you have the getwd function. */
-#undef HAVE_GETWD
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
-/* Define if you have the putenv function. */
-#undef HAVE_PUTENV
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define if you have the strcasecmp function. */
-#undef HAVE_STRCASECMP
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
-/* Define if you have the strstr function. */
-#undef HAVE_STRSTR
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
-/* Define if you have the strtol function. */
-#undef HAVE_STRTOL
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
-/* Define if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
-/* Define if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define if you have the <sys/dir.h> header file. */
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_DIR_H
-/* Define if you have the <sys/ndir.h> header file. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_NDIR_H
-/* Define if you have the <sys/param.h> header file. */
+/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
+
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if type `char' is unsigned and you are not using gcc. */
+#ifndef __CHAR_UNSIGNED__
+# undef __CHAR_UNSIGNED__
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure
index d14493c7c9b..3554e552177 100755
--- a/Build/source/texk/dvidvi/configure
+++ b/Build/source/texk/dvidvi/configure
@@ -1882,12 +1882,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 c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5058,7 +5056,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5061 "configure"' > conftest.$ac_ext
+ echo '#line 5059 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5620,7 +5618,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7561,7 +7559,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7564 "configure"
+#line 7562 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7659,7 +7657,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7662 "configure"
+#line 7660 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8893,7 +8891,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9032,6 +9030,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9632,9 +9698,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9643,12 +9709,52 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ 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 ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9670,23 +9776,28 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9741,7 +9852,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9800,7 +9912,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9869,7 +9982,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10083,49 +10197,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -10273,7 +10438,6 @@ fi
-
{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
if test "${ac_cv_c_char_unsigned+set}" = set; then
@@ -11940,4 +12104,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-date >stamp-auto
diff --git a/Build/source/texk/dvidvi/configure.in b/Build/source/texk/dvidvi/configure.in
index 2060b844f28..b22a16b366f 100644
--- a/Build/source/texk/dvidvi/configure.in
+++ b/Build/source/texk/dvidvi/configure.in
@@ -1,8 +1,10 @@
dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(dvidvi.c)
-sinclude(../kpathsea/common.ac)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
+sinclude(../kpathsea/common.ac)
dnl These tests prevent reliable cross-compilation. Sigh.
AC_C_CHAR_UNSIGNED
@@ -10,5 +12,3 @@ AC_CHECK_SIZEOF(long)
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
diff --git a/Build/source/texk/dvidvi/stamp-aclocal b/Build/source/texk/dvidvi/stamp-aclocal
new file mode 100644
index 00000000000..87dc68d0ee4
--- /dev/null
+++ b/Build/source/texk/dvidvi/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:49 CET 2008
diff --git a/Build/source/texk/dvidvi/stamp-auto.in b/Build/source/texk/dvidvi/stamp-auto.in
new file mode 100644
index 00000000000..d9244066c05
--- /dev/null
+++ b/Build/source/texk/dvidvi/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:36:51 CET 2008
diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index 52e33f3ef68..caad3d00676 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * acconfig.h: removed.
+
2008-02-17 Joachim Schrod <jschrod@acm.org>
Bump up version number to 2.6p5.
diff --git a/Build/source/texk/dviljk/acconfig.h b/Build/source/texk/dviljk/acconfig.h
deleted file mode 100644
index f37dab098ee..00000000000
--- a/Build/source/texk/dviljk/acconfig.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.in.
-
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
-
-/* all: Define to enable running scripts when missing input files. */
diff --git a/Build/source/texk/dviljk/c-auto.in b/Build/source/texk/dviljk/c-auto.in
index 356ed8c73ec..67fdeb6c68a 100644
--- a/Build/source/texk/dviljk/c-auto.in
+++ b/Build/source/texk/dviljk/c-auto.in
@@ -1,9 +1,10 @@
/* c-auto.in. Generated from configure.in by autoheader. */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
/* Define to 1 if you have the `mkdtemp' function. */
#undef HAVE_MKDTEMP
@@ -14,12 +15,51 @@
/* Define to 1 if you have the `rmdir' function. */
#undef HAVE_RMDIR
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
/* Define to 1 if you have the `unlink' function. */
#undef HAVE_UNLINK
-/* The size of a `long', as computed by sizeof. */
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Define to 1 if type `char' is unsigned and you are not using gcc. */
#ifndef __CHAR_UNSIGNED__
# undef __CHAR_UNSIGNED__
diff --git a/Build/source/texk/dviljk/stamp-aclocal b/Build/source/texk/dviljk/stamp-aclocal
new file mode 100644
index 00000000000..11cc4cd8aff
--- /dev/null
+++ b/Build/source/texk/dviljk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:52 CET 2008
diff --git a/Build/source/texk/dviljk/stamp-auto.in b/Build/source/texk/dviljk/stamp-auto.in
index da3cc51d518..3b5e8858575 100644
--- a/Build/source/texk/dviljk/stamp-auto.in
+++ b/Build/source/texk/dviljk/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:28:30 CEST 2005
+Fri Feb 29 13:36:53 CET 2008
diff --git a/Build/source/texk/dvipdfm/ChangeLog b/Build/source/texk/dvipdfm/ChangeLog
index e5de7e75e7d..c67fc2301bf 100644
--- a/Build/source/texk/dvipdfm/ChangeLog
+++ b/Build/source/texk/dvipdfm/ChangeLog
@@ -1,3 +1,19 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ The Makefile.in uses `kpse_include ../make/config.mk'; thus
+ autoheader most generate c-auto.in.
+ * config.h (new): includes the autogenerated c-auto.h.
+ * configure.in: removed `--enable-maint', added AC_DEFINES's
+ third arg to provide autoheader templates ...
+ * acinclude.m4: added AC_DEFINES's third arg to provide autoheader
+ templates ...
+ * acconfig.h (removed): ... renamed ...
+ * acconfig.h.dist (new): ... into this.
+
+ * configure.in: don't (re-)define KPATHSEA (defined as some
+ kpathsea version number).
+ * dvipdfm.c: use `#ifdef HAVE_KPATHSEA', noy `#ifdef KPATHSEA'.
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/dvipdfm/acconfig.h b/Build/source/texk/dvipdfm/acconfig.h.dist
index ee49123b348..ee49123b348 100644
--- a/Build/source/texk/dvipdfm/acconfig.h
+++ b/Build/source/texk/dvipdfm/acconfig.h.dist
diff --git a/Build/source/texk/dvipdfm/acinclude.m4 b/Build/source/texk/dvipdfm/acinclude.m4
index aa1ec43fb6f..879c18301f2 100644
--- a/Build/source/texk/dvipdfm/acinclude.m4
+++ b/Build/source/texk/dvipdfm/acinclude.m4
@@ -4,7 +4,9 @@
AC_DEFUN([AC_EXT_TIMEZONE],
[AC_MSG_CHECKING([whether time.h defines timezone as an external variable])
AC_TRY_LINK([#include <time.h>], [ -timezone; ],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIMEZONE)], [AC_MSG_RESULT(no)])])
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_TIMEZONE], 1, [define if <time.h> has timezone as an external variable])],
+ [AC_MSG_RESULT(no)])])
AC_DEFUN([AC_HAVE_BASENAME],
[AC_MSG_CHECKING([whether basename is in either libgen.h or string.h])
AC_TRY_COMPILE([#include <libgen.h>
@@ -13,7 +15,9 @@ AC_DEFUN([AC_HAVE_BASENAME],
AC_DEFUN([AC_TZ_HAS_TM_GMTOFF],
[AC_MSG_CHECKING([whether struct tz has tm_gmtoff as a member])
AC_TRY_COMPILE([#include <time.h>], [struct tm *tp; tp->tm_gmtoff],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TM_GMTOFF)], [AC_MSG_RESULT(no)])])
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_TM_GMTOFF], 1, [define if struct tm has tm_gmtoff as a member])],
+ [AC_MSG_RESULT(no)])])
#
AC_DEFUN([AC_HAS_KPSE_FORMATS],
[AC_MSG_CHECKING([whether you have kpathsea headers and they whether they know about the required file formats])
@@ -21,7 +25,8 @@ AC_DEFUN([AC_HAS_KPSE_FORMATS],
#include <kpathsea/tex-file.h>],
[kpse_tex_ps_header_format;
kpse_type1_format;kpse_vf_format],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_KPSE_FORMATS)],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats])],
[AC_MSG_RESULT(no);
AC_MSG_ERROR([PS_HEADER and/or VF formats not found in Kpathsea header files.
@@ -38,7 +43,8 @@ AC_DEFUN([AC_HAS_OMEGA_FORMATS],
AC_TRY_COMPILE([#include <stdio.h>
#include <kpathsea/tex-file.h>],
[kpse_ofm_format],
- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_OMEGA_FORMATS)],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_OMEGA_FORMATS], 1, [Define if kpathsea understands Omega (OFM/OVF) formats])],
[AC_MSG_RESULT(no)])])
AC_DEFUN([AC_HAS_TTF_FORMATS],
[AC_MSG_CHECKING([whether your kpathsea supports Truetype (TTF) file formats])
@@ -46,7 +52,7 @@ AC_DEFUN([AC_HAS_TTF_FORMATS],
#include <kpathsea/tex-file.h>],
[kpse_truetype_format],
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_TTF_FORMATS)
+ AC_DEFINE([HAVE_TTF_FORMATS], 1 ,[define if kpathsea understands TrueType (TTF) formats])
TTF_OPT=''],
[AC_MSG_RESULT(no)])])
#
@@ -66,10 +72,10 @@ AC_MSG_CHECKING([for zlib header files])
AC_TRY_COMPILE([#include <zlib.h>], [z_stream p;],
[AC_MSG_RESULT(yes)
AC_CHECK_LIB(z, compress,
-[AC_DEFINE(HAVE_ZLIB)
+[AC_DEFINE([HAVE_ZLIB], 1, [define if you have zlib and its headers])
LIBS="$LIBS -lz"
AC_CHECK_LIB(z, compress2,
-[AC_DEFINE(HAVE_ZLIB_COMPRESS2)])])],
+[AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [define if your zlib has the compress2 function])])])],
[CPPFLAGS=$_cppflags
LDDFLAGS=$_ldflags
AC_MSG_RESULT(no)])])
@@ -91,7 +97,7 @@ AC_MSG_CHECKING([for png header files])
AC_TRY_COMPILE([#include <png.h>], [png_infop p;], [
AC_MSG_RESULT(yes)
AC_CHECK_LIB(png, png_get_image_width, [
- AC_DEFINE(HAVE_LIBPNG)
+ AC_DEFINE([HAVE_LIBPNG], 1, [define if you have libpng])
LIBS="$LIBS -lpng"], , -lz)], [
AC_MSG_RESULT(no)])])
#
diff --git a/Build/source/texk/dvipdfm/c-auto.in b/Build/source/texk/dvipdfm/c-auto.in
index 9c30520187e..3a1dc9c6ac8 100644
--- a/Build/source/texk/dvipdfm/c-auto.in
+++ b/Build/source/texk/dvipdfm/c-auto.in
@@ -1,4 +1,106 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* The number of bytes in a int. */
-#undef SIZEOF_INT
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* define if you have kpathsea */
+#undef HAVE_KPATHSEA
+
+/* define if kpathsea supports type1 and vf formats */
+#undef HAVE_KPSE_FORMATS
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* define if you have libpng */
+#undef HAVE_LIBPNG
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if kpathsea understands Omega (OFM/OVF) formats */
+#undef HAVE_OMEGA_FORMATS
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strspn' function. */
+#undef HAVE_STRSPN
+
+/* Define to 1 if you have the `system' function. */
+#undef HAVE_SYSTEM
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* define if <time.h> has timezone as an external variable */
+#undef HAVE_TIMEZONE
+
+/* define if struct tm has tm_gmtoff as a member */
+#undef HAVE_TM_GMTOFF
+
+/* define if kpathsea understands TrueType (TTF) formats */
+#undef HAVE_TTF_FORMATS
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* define if you have xbasename() in your libkpathsea instead of basename() */
+#undef HAVE_XBASENAME
+
+/* define if you have zlib and its headers */
+#undef HAVE_ZLIB
+
+/* define if your zlib has the compress2 function */
+#undef HAVE_ZLIB_COMPRESS2
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
+/* package name */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* package version */
+#undef VERSION
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/Build/source/texk/dvipdfm/config.h b/Build/source/texk/dvipdfm/config.h
new file mode 100644
index 00000000000..fa9f370a239
--- /dev/null
+++ b/Build/source/texk/dvipdfm/config.h
@@ -0,0 +1,11 @@
+/* config.h:
+ * In the original package this file is generated by autoheader.
+ * When part of the teTeX / TeX live tree, we simply include
+ * c-auto.h as generted by autoheader and configure. */
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+#include "c-auto.h"
+
+#endif /* _CONFIG_H */
diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure
index 44de69214af..2409f64dec2 100755
--- a/Build/source/texk/dvipdfm/configure
+++ b/Build/source/texk/dvipdfm/configure
@@ -651,7 +651,6 @@ build_alias
host_alias
target_alias
VERSION
-MAINT
CC
CFLAGS
LDFLAGS
@@ -665,6 +664,7 @@ INSTALL_SCRIPT
INSTALL_DATA
LN_S
SET_MAKE
+MAINT
LD
AR
ARFLAGS
@@ -1258,7 +1258,6 @@ if test -n "$ac_init_help"; then
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maint enable autoconf portions of Makefile
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
@@ -1718,25 +1717,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
VERSION="0.13.2c"
+
cat >>confdefs.h <<\_ACEOF
#define VERSION "0.13.2c"
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define PACKAGE "dvipdfm"
_ACEOF
-ac_config_headers="$ac_config_headers config.h"
-
-
-# Check whether --enable-maint was given.
-if test "${enable_maint+set}" = set; then
- enableval=$enable_maint; MAINT=''
-else
- MAINT='#'
-fi
-
+ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
ac_ext=c
@@ -4088,38 +4080,42 @@ fi
# end of libpng.ac
-cat >>confdefs.h <<\_ACEOF
-#define KPATHSEA 1
-_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPATHSEA 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_XBASENAME 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZLIB 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZLIB_COMPRESS2 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPSE_FORMATS 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_OMEGA_FORMATS 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_TTF_FORMATS 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBPNG 1
_ACEOF
@@ -4481,7 +4477,9 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_TIMEZONE 1
_ACEOF
@@ -4530,7 +4528,9 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_TM_GMTOFF 1
_ACEOF
@@ -5582,7 +5582,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
"Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
@@ -5684,7 +5684,6 @@ build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
VERSION!$VERSION$ac_delim
-MAINT!$MAINT$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -5698,6 +5697,7 @@ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
LN_S!$LN_S$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
+MAINT!$MAINT$ac_delim
LD!$LD$ac_delim
AR!$AR$ac_delim
ARFLAGS!$ARFLAGS$ac_delim
@@ -6116,6 +6116,7 @@ echo "$as_me: $ac_file is unchanged" >&6;}
case $ac_file$ac_mode in
+ "c-auto.h":H) date >stamp-auto ;;
"Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
kpse_input=`case Makefile.in in
[\\/$]*) # Absolute
diff --git a/Build/source/texk/dvipdfm/configure.in b/Build/source/texk/dvipdfm/configure.in
index 641843d6208..b6f749cafc0 100644
--- a/Build/source/texk/dvipdfm/configure.in
+++ b/Build/source/texk/dvipdfm/configure.in
@@ -5,14 +5,10 @@ define([_version_],"0.13.2c")
VERSION=_version_
AC_SUBST(VERSION)
-AC_DEFINE(VERSION,_version_)
-AC_DEFINE(PACKAGE,"dvipdfm")
+AC_DEFINE(VERSION, _version_, [package version])
+AC_DEFINE(PACKAGE, "dvipdfm", [package name])
-AC_CONFIG_HEADERS(config.h)
-
-AC_ARG_ENABLE([maint], [ --enable-maint enable autoconf portions of Makefile],
- [MAINT=''], [MAINT='#'])
-AC_SUBST(MAINT)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
dnl Checks for programs.
AC_PROG_CC
@@ -27,15 +23,14 @@ sinclude(../../libs/libpng/withenable.ac)
sinclude(../../libs/zlib/zlib.ac)
sinclude(../../libs/libpng/libpng.ac)
-AC_DEFINE(KPATHSEA)
-AC_DEFINE(HAVE_KPATHSEA)
-AC_DEFINE(HAVE_XBASENAME)
-AC_DEFINE(HAVE_ZLIB)
-AC_DEFINE(HAVE_ZLIB_COMPRESS2)
-AC_DEFINE(HAVE_KPSE_FORMATS)
-AC_DEFINE(HAVE_OMEGA_FORMATS)
-AC_DEFINE(HAVE_TTF_FORMATS)
-AC_DEFINE(HAVE_LIBPNG)
+AC_DEFINE([HAVE_KPATHSEA], 1, [define if you have kpathsea])
+AC_DEFINE([HAVE_XBASENAME], 1, [define if you have xbasename() in your libkpathsea instead of basename()])
+AC_DEFINE([HAVE_ZLIB], 1, [define if you have zlib and its headers])
+AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [define if your zlib has the compress2 function])
+AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats])
+AC_DEFINE([HAVE_OMEGA_FORMATS], 1, [Define if kpathsea understands Omega (OFM/OVF) formats])
+AC_DEFINE([HAVE_TTF_FORMATS], 1, [define if kpathsea understands TrueType (TTF) formats])
+AC_DEFINE([HAVE_LIBPNG], 1, [define if you have libpng])
TTF_OPT=''
AC_SUBST(TTF_OPT)
diff --git a/Build/source/texk/dvipdfm/dvipdfm.c b/Build/source/texk/dvipdfm/dvipdfm.c
index 4044a6e1223..a75be847743 100644
--- a/Build/source/texk/dvipdfm/dvipdfm.c
+++ b/Build/source/texk/dvipdfm/dvipdfm.c
@@ -571,7 +571,7 @@ int CDECL main (int argc, char *argv[])
usage();
return 1;
}
-#ifdef KPATHSEA
+#ifdef HAVE_KPATHSEA
kpse_set_program_name (argv[0], NULL);
#endif
@@ -583,7 +583,7 @@ int CDECL main (int argc, char *argv[])
do_args (argc, argv);
-#ifdef KPATHSEA
+#ifdef HAVE_KPATHSEA
kpse_init_prog ("", font_dpi, NULL, NULL);
pk_set_dpi (font_dpi);
kpse_set_program_enabled (kpse_pk_format, true, kpse_src_texmf_cnf);
diff --git a/Build/source/texk/dvipdfm/stamp-aclocal b/Build/source/texk/dvipdfm/stamp-aclocal
new file mode 100644
index 00000000000..5cc968fbbf2
--- /dev/null
+++ b/Build/source/texk/dvipdfm/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 14:45:04 CET 2008
diff --git a/Build/source/texk/dvipdfm/stamp-auto.in b/Build/source/texk/dvipdfm/stamp-auto.in
index 26524463450..2173796e0f7 100644
--- a/Build/source/texk/dvipdfm/stamp-auto.in
+++ b/Build/source/texk/dvipdfm/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:29:58 CEST 2005
+Fri Feb 29 14:45:05 CET 2008
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 8e312dedadb..aacd87ec36e 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -20,7 +20,7 @@ AC_ARG_ENABLE(timing,
# Checks for programs.
AC_SET_MAKE
-AC_PROG_CC
+AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_ARG_WITH(gs,
AC_HELP_STRING([--with-gs=/PATH/TO/gs],[Hard-wire the location of GhostScript]),
diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog
index 3646e66cc1f..5ee394b78cf 100644
--- a/Build/source/texk/dvipos/ChangeLog
+++ b/Build/source/texk/dvipos/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/dvipos/aclocal.m4 b/Build/source/texk/dvipos/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/dvipos/aclocal.m4
+++ b/Build/source/texk/dvipos/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/dvipos/c-auto.in b/Build/source/texk/dvipos/c-auto.in
index e69de29bb2d..31830b403a8 100644
--- a/Build/source/texk/dvipos/c-auto.in
+++ b/Build/source/texk/dvipos/c-auto.in
@@ -0,0 +1,179 @@
+/* c-auto.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
+
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
+#undef GETCWD_FORKS
+
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
+
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
+
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
+
+/* Define to 1 if you have the `getwd' function. */
+#undef HAVE_GETWD
+
+/* 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 `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
+
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure
index 19bd872383a..93d29ac0021 100755
--- a/Build/source/texk/dvipos/configure
+++ b/Build/source/texk/dvipos/configure
@@ -1882,12 +1882,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 c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5058,7 +5056,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5061 "configure"' > conftest.$ac_ext
+ echo '#line 5059 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5620,7 +5618,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7561,7 +7559,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7564 "configure"
+#line 7562 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7659,7 +7657,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7662 "configure"
+#line 7660 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8893,7 +8891,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9032,6 +9030,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9632,9 +9698,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9643,12 +9709,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
int
main ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9670,23 +9737,67 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ 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 struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9741,7 +9852,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9800,7 +9912,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9869,7 +9982,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10083,49 +10197,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -10271,6 +10436,7 @@ fi
+
ac_config_files="$ac_config_files Makefile.aux:Makefile.in"
ac_config_files="$ac_config_files Makefile:Makefile.aux"
diff --git a/Build/source/texk/dvipos/configure.in b/Build/source/texk/dvipos/configure.in
index 1beada52cfc..3b6e8fb5dd6 100644
--- a/Build/source/texk/dvipos/configure.in
+++ b/Build/source/texk/dvipos/configure.in
@@ -1,5 +1,9 @@
dnl Public domain.
+
AC_INIT(dvipos.c)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
+
sinclude(../kpathsea/common.ac)
+
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/Build/source/texk/dvipos/stamp-aclocal b/Build/source/texk/dvipos/stamp-aclocal
new file mode 100644
index 00000000000..988991f9318
--- /dev/null
+++ b/Build/source/texk/dvipos/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:58 CET 2008
diff --git a/Build/source/texk/dvipos/stamp-auto.in b/Build/source/texk/dvipos/stamp-auto.in
new file mode 100644
index 00000000000..e19992de980
--- /dev/null
+++ b/Build/source/texk/dvipos/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:37:00 CET 2008
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 5471ff2658c..2069a8bc828 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * acconfig.h: removed.
+
2008-02-17 Karl Berry <karl@tug.org>
* config.ps (smallbook): new paper size for Texinfo.
diff --git a/Build/source/texk/dvipsk/acconfig.h b/Build/source/texk/dvipsk/acconfig.h
deleted file mode 100644
index 739210b5ae1..00000000000
--- a/Build/source/texk/dvipsk/acconfig.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.in.
-
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
-
-
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
-
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
-
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
-
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
diff --git a/Build/source/texk/dvipsk/c-auto.in b/Build/source/texk/dvipsk/c-auto.in
index 9c30520187e..6c411f6be17 100644
--- a/Build/source/texk/dvipsk/c-auto.in
+++ b/Build/source/texk/dvipsk/c-auto.in
@@ -1,4 +1,49 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* The number of bytes in a int. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
diff --git a/Build/source/texk/dvipsk/stamp-aclocal b/Build/source/texk/dvipsk/stamp-aclocal
new file mode 100644
index 00000000000..e19992de980
--- /dev/null
+++ b/Build/source/texk/dvipsk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:00 CET 2008
diff --git a/Build/source/texk/dvipsk/stamp-auto.in b/Build/source/texk/dvipsk/stamp-auto.in
index e6ce6adb9f4..753ef1d8f19 100644
--- a/Build/source/texk/dvipsk/stamp-auto.in
+++ b/Build/source/texk/dvipsk/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:28:45 CEST 2005
+Fri Feb 29 13:37:01 CET 2008
diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog
index 70bdc630687..7101504aec1 100644
--- a/Build/source/texk/gsftopk/ChangeLog
+++ b/Build/source/texk/gsftopk/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * acconfig.h: removed (empty file).
+ * configure.in: stricter m4 quoting.
+
2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/gsftopk/acconfig.h b/Build/source/texk/gsftopk/acconfig.h
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Build/source/texk/gsftopk/acconfig.h
+++ /dev/null
diff --git a/Build/source/texk/gsftopk/c-auto.in b/Build/source/texk/gsftopk/c-auto.in
index 8860af89b38..0011665e1b5 100644
--- a/Build/source/texk/gsftopk/c-auto.in
+++ b/Build/source/texk/gsftopk/c-auto.in
@@ -1,40 +1,94 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the <poll.h> header file. */
+#undef HAVE_POLL_H
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
+/* Define to 1 if you have the <select.h> header file. */
+#undef HAVE_SELECT_H
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
-/* Define if you have the poll function. */
-#undef HAVE_POLL
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Define if you have the sigaction function. */
-#undef HAVE_SIGACTION
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Define if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have the <select.h> header file. */
-#undef HAVE_SELECT_H
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-/* Define if you have the <sys/select.h> header file. */
+/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
-/* Define if you have the <sys/time.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
diff --git a/Build/source/texk/gsftopk/configure.in b/Build/source/texk/gsftopk/configure.in
index 585c190c80c..e81367859fa 100644
--- a/Build/source/texk/gsftopk/configure.in
+++ b/Build/source/texk/gsftopk/configure.in
@@ -13,15 +13,15 @@ sinclude(../kpathsea/withenable.ac)
dnl Checks for header files.
AC_HEADER_SYS_WAIT
AC_HEADER_TIME
-AC_CHECK_HEADERS(poll.h sys/time.h)
+AC_CHECK_HEADERS([poll.h sys/time.h])
dnl Checks for library functions.
AC_FUNC_VFORK
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(poll sigaction)
+AC_CHECK_FUNCS([poll sigaction])
if test "$ac_cv_header_poll_h" = no || test "$ac_cv_func_poll" = no; then
- AC_CHECK_HEADERS(sys/select.h select.h)
+ AC_CHECK_HEADERS([sys/select.h select.h])
fi
KPSE_CONFIG_FILES([Makefile])
diff --git a/Build/source/texk/gsftopk/stamp-aclocal b/Build/source/texk/gsftopk/stamp-aclocal
new file mode 100644
index 00000000000..4284274235b
--- /dev/null
+++ b/Build/source/texk/gsftopk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:02 CET 2008
diff --git a/Build/source/texk/gsftopk/stamp-auto.in b/Build/source/texk/gsftopk/stamp-auto.in
index 0f1ac0fbc85..f4191f6419a 100644
--- a/Build/source/texk/gsftopk/stamp-auto.in
+++ b/Build/source/texk/gsftopk/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:28:54 CEST 2005
+Fri Feb 29 13:37:03 CET 2008
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 422da3f67fb..c872b197d4a 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,11 +1,33 @@
+2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * common.ac: replace the private macro KPSE_STRUCT_ST_MTIM
+ by AC_CHECK_MEMBERS([struct stat.st_mtim]).
+
+ * common.ac: use AC_CHECK_DECLS([strstr]) and ...
+ * lib.h: ... replace `#ifndef HAVE_STRSTR' by
+ `#if !HAVE_DECL_STRSTR'.
+
+ * common.ac: Move AC_CONFIG_HEADERS from here ...
+ * configure.in: ... to here and replace PACKAGE_... by
+ KPSE_PACKAGE_... in c-auto.h, to avoid conflicts with other
+ packages.
+
+ * configure.in: use AH_TOP, AH_BOTTOM, and AC_DEFINE's third
+ argument to provide autoheader templates ...
+ * common.ac: m4 code to generate AC_DEFINE with a third argument
+ for MAKE_..._BY_DEFAULT and set them to 0 or 1 ...
+ * withenable.ac: use AC_DEFINE's third argument to provide
+ autoheader templates ...
+ * acconfig.h: ... removed.
+
2008-02-24 Martin Schröder <martin@pdftex.org>
- * lib.h: systypes.h instaed of c-std.h
+ * lib.h: systypes.h instead of c-std.h
2008-02-23 Martin Schröder <martin@pdftex.org>
* lib.h: include c-std.h to get off_t from stdio.h
2008-02-21 Martin Schröder <martin@pdftex.org>
- * lib.h, xfseek.c, xftell.c: LFS support: use off_t instead off long
+ * lib.h, xfseek.c, xftell.c: LFS support: use off_t instead of long
and fseeko instead of fseek
2008-02-14 Karl Berry <karl@tug.org>
diff --git a/Build/source/texk/kpathsea/acconfig.h b/Build/source/texk/kpathsea/acconfig.h
deleted file mode 100644
index 09111d47bdd..00000000000
--- a/Build/source/texk/kpathsea/acconfig.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.in.
-
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer.
-
- Copyright 1994-97, 2008 Karl Berry.
- Copyright 1997-99, 2002, 2005 Olaf Weber.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>. */
-
-/* Guard against double inclusion. */
-#ifndef KPATHSEA_C_AUTO_H
-#define KPATHSEA_C_AUTO_H
-
-/* kpathsea: the version string. */
-#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
-
-/* kpathsea/configure.in tests for these functions with
- kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know
- about that macro. Since the shared library stuff is all preliminary
- anyway, I decided not to change Autoheader, but rather to hack them
- in here. */
-#undef HAVE_PUTENV
-#undef HAVE_STRCASECMP
-#undef HAVE_STRTOL
-#undef HAVE_STRSTR
-
-@TOP@
-
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
-
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
-
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
-
-@BOTTOM@
-#endif /* !KPATHSEA_C_AUTO_H */
diff --git a/Build/source/texk/kpathsea/aclocal.m4 b/Build/source/texk/kpathsea/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/kpathsea/aclocal.m4
+++ b/Build/source/texk/kpathsea/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/kpathsea/c-auto.in b/Build/source/texk/kpathsea/c-auto.in
index 60dc58dc7dd..e4a68316f35 100644
--- a/Build/source/texk/kpathsea/c-auto.in
+++ b/Build/source/texk/kpathsea/c-auto.in
@@ -1,12 +1,9 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader 2.13. */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
+/* c-auto.in. Generated from configure.in by autoheader. */
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer.
+/* c-auto.h: defines for kpathsea, as determined by configure.
+ Copyright 1994-97, 2008 Karl Berry.
Copyright 1997-99, 2002, 2005 Olaf Weber.
- Copyright 1994-97 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -18,11 +15,8 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-*/
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>. */
/* Guard against double inclusion. */
#ifndef KPATHSEA_C_AUTO_H
@@ -31,137 +25,192 @@
/* kpathsea: the version string. */
#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
-/* These came from klibtool's kb_AC_KLIBTOOL_REPLACE_FUNCS, probably no
- longer needed, doesn't hurt to leave them in, though. */
+/* kpathsea/configure.in tests for these functions with
+ kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know
+ about that macro. Since the shared library stuff is all preliminary
+ anyway, I decided not to change Autoheader, but rather to hack them
+ in here. */
#undef HAVE_PUTENV
#undef HAVE_STRCASECMP
#undef HAVE_STRTOL
#undef HAVE_STRSTR
-
-/* Define if the closedir function returns void instead of int. */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
-/* Define to empty if the keyword does not work. */
-#undef const
-
-/* Define if your struct stat has st_mtim. */
-#undef HAVE_ST_MTIM
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
-
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
#undef GETCWD_FORKS
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
-/* Define if you have the bcmp function. */
+/* Define to 1 if you have the `bcmp' function. */
#undef HAVE_BCMP
-/* Define if you have the bcopy function. */
+/* Define to 1 if you have the `bcopy' function. */
#undef HAVE_BCOPY
-/* Define if you have the bzero function. */
+/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
-/* Define if you have the getcwd function. */
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
+/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
-/* Define if you have the getwd function. */
+/* Define to 1 if you have the `getwd' function. */
#undef HAVE_GETWD
-/* Define if you have the index function. */
+/* Define to 1 if you have the `index' function. */
#undef HAVE_INDEX
-/* Define if you have the memcmp function. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `memcmp' function. */
#undef HAVE_MEMCMP
-/* Define if you have the memcpy function. */
+/* Define to 1 if you have the `memcpy' function. */
#undef HAVE_MEMCPY
-/* Define if you have the putenv function. */
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
+
+/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
-/* Define if you have the rindex function. */
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `rindex' function. */
#undef HAVE_RINDEX
-/* Define if you have the strcasecmp function. */
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
-/* Define if you have the strchr function. */
+/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
-/* Define if you have the strrchr function. */
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define if you have the strstr function. */
+/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
-/* Define if you have the strtol function. */
+/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
-/* Define if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_DIR_H
-/* Define if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_NDIR_H
-/* Define if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
-/* Define if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
-/* Define if you have the <sys/dir.h> header file. */
-#undef HAVE_SYS_DIR_H
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
-/* Define if you have the <sys/ndir.h> header file. */
-#undef HAVE_SYS_NDIR_H
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
-/* Define if you have the m library (-lm). */
-#undef HAVE_LIBM
#endif /* !KPATHSEA_C_AUTO_H */
diff --git a/Build/source/texk/kpathsea/common.ac b/Build/source/texk/kpathsea/common.ac
index 0580e4c5d9b..f2e73b6f7e9 100644
--- a/Build/source/texk/kpathsea/common.ac
+++ b/Build/source/texk/kpathsea/common.ac
@@ -5,12 +5,6 @@ dnl Common Autoconf sinclude file for kpathsea-using programs. (Have to
dnl use the m4 `sinclude' builtin instead of `include', since Autoconf
dnl disables `include'.)
-dnl These configure scripts won't work with anything else.
-AC_PREREQ(2.12.1)
-
-dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
-
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -23,8 +17,9 @@ AC_PROG_LIBTOOL
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_FUNC_CLOSEDIR_VOID
-AC_CHECK_HEADERS(assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h)
+AC_CHECK_HEADERS([assert.h float.h limits.h memory.h pwd.h stdlib.h \
+ string.h strings.h sys/param.h unistd.h])
+AC_CHECK_DECLS([strstr])
dnl Libtool supporting objects that may be required on ancient broken system.
AC_CHECK_FUNCS(putenv,, LTLIBOBJS="$LTLIBOBJS putenv.lo")
@@ -38,7 +33,7 @@ AC_CHECK_FUNCS(bcmp bcopy bzero getcwd getwd index memcmp memcpy rindex strchr s
AC_C_CONST
# Check whether struct stat provides high-res time.
-KPSE_STRUCT_ST_MTIM
+AC_CHECK_MEMBERS([struct stat.st_mtim])
# Check whether prototypes work.
AC_MSG_CHECKING(whether the compiler accepts prototypes)
@@ -47,24 +42,27 @@ AC_CACHE_VAL(kb_cv_c_prototypes,
kb_cv_c_prototypes=yes, kb_cv_c_prototypes=no)])dnl
AC_MSG_RESULT($kb_cv_c_prototypes)
if test "$kb_cv_c_prototypes" = yes; then
- AC_DEFINE(HAVE_PROTOTYPES)
+ AC_DEFINE([HAVE_PROTOTYPES], 1,
+ [Define to 1 if your compiler understands prototypes.])
fi
# This is a GNU libc invention.
-AC_MSG_CHECKING(whether program_invocation_name is predefined)
-AC_CACHE_VAL(kb_cv_var_program_inv_name,
+AC_MSG_CHECKING([whether program_invocation_name is predefined])
+AC_CACHE_VAL([kb_cv_var_program_inv_name],
[AC_TRY_LINK(,
[extern char *program_invocation_name; program_invocation_name = "love";],
- kb_cv_var_program_inv_name=yes, kb_cv_var_program_inv_name=no)])dnl
-AC_MSG_RESULT($kb_cv_var_program_inv_name)
+ [kb_cv_var_program_inv_name=yes], [kb_cv_var_program_inv_name=no])])dnl
+AC_MSG_RESULT([$kb_cv_var_program_inv_name])
if test "$kb_cv_var_program_inv_name" = yes; then
- AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME)
+ AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], 1,
+ [Define to 1 if you are using GNU libc or otherwise have global
+ variables `program_invocation_name' and `program_invocation_short_name'.])
fi
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
-AC_MSG_CHECKING(whether getcwd uses fork or vfork)
-AC_CACHE_VAL(kb_cv_func_getcwd_forks,
+AC_MSG_CHECKING([whether getcwd uses fork or vfork])
+AC_CACHE_VAL([kb_cv_func_getcwd_forks],
[AC_TRY_RUN([
int fork() { exit(1); }
int vfork() { exit(1); }
@@ -73,11 +71,13 @@ char path[100];
int main() {
getcwd(path,100);
return 0;
-}], kb_cv_func_getcwd_forks=no, kb_cv_func_getcwd_forks=yes,
- kb_cv_func_getcwd_forks=no)])dnl
-AC_MSG_RESULT($kb_cv_func_getcwd_forks)
+}], [kb_cv_func_getcwd_forks=no], [kb_cv_func_getcwd_forks=yes],
+ [kb_cv_func_getcwd_forks=no])])dnl
+AC_MSG_RESULT([$kb_cv_func_getcwd_forks])
if test $kb_cv_func_getcwd_forks = yes; then
- AC_DEFINE(GETCWD_FORKS)
+ AC_DEFINE([GETCWD_FORKS], 1,
+ [Define to 1 if getcwd is implemented using fork or vfork. Let me know
+ if you have to add this by hand because configure failed to detect it.])
fi
fi
@@ -85,27 +85,22 @@ fi
sinclude(../../texk/kpathsea/withenable.ac)
# Implementation of those options.
-if test "x$with_mktexmf_default" = xyes; then
- AC_DEFINE(MAKE_TEX_MF_BY_DEFAULT)
-fi
-if test "x$with_mktexpk_default" = xyes; then
- AC_DEFINE(MAKE_TEX_PK_BY_DEFAULT)
-fi
-if test "x$with_mktextex_default" = xyes; then
- AC_DEFINE(MAKE_TEX_TEX_BY_DEFAULT)
-fi
-if test "x$with_mktexfmt_default" = xyes; then
- AC_DEFINE(MAKE_TEX_FMT_BY_DEFAULT)
-fi
-if test "x$with_mktextfm_default" = xyes; then
- AC_DEFINE(MAKE_TEX_TFM_BY_DEFAULT)
-fi
-if test "x$with_mkocp_default" = xyes; then
- AC_DEFINE(MAKE_OMEGA_OCP_BY_DEFAULT)
-fi
-if test "x$with_mkofm_default" = xyes; then
- AC_DEFINE(MAKE_OMEGA_OFM_BY_DEFAULT)
+AC_DEFUN([_KPSE_DEFINE_MAKE_BY_DEFAULT],
+[if test "x$with_$1_default" = xyes; then
+ AC_DEFINE([MAKE_$2_BY_DEFAULT], 1,
+ [Define to 1 if you want to run $1 if $3 missing, and to 0 if you don't.])
+else
+ AC_DEFINE([MAKE_$2_BY_DEFAULT], 0)
fi
+])# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexmf], [TEX_MF], [MF source])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexpk], [TEX_PK], [PK font])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktextex], [TEX_TEX], [TeX source])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktexfmt], [TEX_FMT], [format file])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mktextfm], [TEX_TFM], [TFM file])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mkocp], [OMEGA_OCP], [OCP file])
+_KPSE_DEFINE_MAKE_BY_DEFAULT([mkofm], [OMEGA_OFM], [OFM file])
# Is libm present. FIXME: do we need it at all?
AC_CHECK_LIB(m, main)
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index d5a06e74da6..f5fd03e911c 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1891,12 +1891,10 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-
-
-
ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5067,7 +5065,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5070 "configure"' > conftest.$ac_ext
+ echo '#line 5068 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5629,7 +5627,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7570,7 +7568,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7573 "configure"
+#line 7571 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7668,7 +7666,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7671 "configure"
+#line 7669 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8902,7 +8900,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9041,6 +9039,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9641,9 +9707,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9652,12 +9718,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
int
main ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9679,23 +9746,67 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ 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 struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9750,7 +9861,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9809,7 +9921,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9878,7 +9991,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10092,49 +10206,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -10281,6 +10446,11 @@ fi
+
+
+
+
+
ac_config_files="$ac_config_files Makefile.aux:Makefile.in"
ac_config_files="$ac_config_files Makefile:Makefile.aux"
@@ -11381,7 +11551,8 @@ echo "$as_me: $ac_file is unchanged" >&6;}
case $ac_file$ac_mode in
- "c-auto.h":H) date >stamp-auto ;;
+ "c-auto.h":H) sed 's/^#define PACKAGE_/#define KPSE_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
+ date >stamp-auto ;;
"Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
kpse_input=`case Makefile.in in
[\\/$]*) # Absolute
diff --git a/Build/source/texk/kpathsea/configure.in b/Build/source/texk/kpathsea/configure.in
index 97994489585..212419e66a2 100644
--- a/Build/source/texk/kpathsea/configure.in
+++ b/Build/source/texk/kpathsea/configure.in
@@ -5,7 +5,48 @@ KPSEVERSION=3.5.6dev
AC_SUBST(KPSEVERSION)
AC_DEFINE_UNQUOTED(KPSEVERSION, "kpathsea version $KPSEVERSION")
+dnl Write output here, instead of putting a zillion -D's on the command line.
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
+ [sed 's/^#define PACKAGE_/#define KPSE_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
+ date >stamp-auto])
+
sinclude(common.ac)
+AH_TOP([/* c-auto.h: defines for kpathsea, as determined by configure.
+
+ Copyright 1994-97, 2008 Karl Berry.
+ Copyright 1997-99, 2002, 2005 Olaf Weber.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>. */
+
+/* Guard against double inclusion. */
+#ifndef KPATHSEA_C_AUTO_H
+#define KPATHSEA_C_AUTO_H
+
+/* kpathsea: the version string. */
+#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
+
+/* kpathsea/configure.in tests for these functions with
+ kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know
+ about that macro. Since the shared library stuff is all preliminary
+ anyway, I decided not to change Autoheader, but rather to hack them
+ in here. */
+#undef HAVE_PUTENV
+#undef HAVE_STRCASECMP
+#undef HAVE_STRTOL
+#undef HAVE_STRSTR])
+AH_BOTTOM([#endif /* !KPATHSEA_C_AUTO_H */])
+
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h
index 18b2339d863..2a246b19584 100644
--- a/Build/source/texk/kpathsea/lib.h
+++ b/Build/source/texk/kpathsea/lib.h
@@ -120,7 +120,7 @@ extern KPSEDLL const_string xbasename P1H(const_string name);
/* Return directory part of NAME. This returns a new string. */
extern KPSEDLL string xdirname P1H(const_string name);
-#ifndef HAVE_STRSTR
+#if !HAVE_DECL_STRSTR
extern string strstr P2H(const_string haystack, const_string needle);
#endif
diff --git a/Build/source/texk/kpathsea/stamp-aclocal b/Build/source/texk/kpathsea/stamp-aclocal
new file mode 100644
index 00000000000..286541c378d
--- /dev/null
+++ b/Build/source/texk/kpathsea/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:06 CET 2008
diff --git a/Build/source/texk/kpathsea/stamp-auto.in b/Build/source/texk/kpathsea/stamp-auto.in
index f40664acad8..c2b0ef9d9ff 100644
--- a/Build/source/texk/kpathsea/stamp-auto.in
+++ b/Build/source/texk/kpathsea/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:26:05 CEST 2005
+Fri Feb 29 13:37:07 CET 2008
diff --git a/Build/source/texk/lacheck/ChangeLog b/Build/source/texk/lacheck/ChangeLog
index d847327fae2..79b519b27d8 100644
--- a/Build/source/texk/lacheck/ChangeLog
+++ b/Build/source/texk/lacheck/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-02-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.in: remove AC_DECL_YYTEXT to avoid autoconf warning.
diff --git a/Build/source/texk/lacheck/aclocal.m4 b/Build/source/texk/lacheck/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/lacheck/aclocal.m4
+++ b/Build/source/texk/lacheck/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/lacheck/c-auto.in b/Build/source/texk/lacheck/c-auto.in
index faaefcc6cb0..b4fd8bdb14e 100644
--- a/Build/source/texk/lacheck/c-auto.in
+++ b/Build/source/texk/lacheck/c-auto.in
@@ -1,135 +1,191 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
+/* c-auto.in. Generated from configure.in by autoheader. */
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
-/* kpathsea: the version string. */
-#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
-/* web2c: the version string. */
-#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
+#undef GETCWD_FORKS
-/* These came from klibtool's kb_AC_KLIBTOOL_REPLACE_FUNCS, probably no
- longer needed, doesn't hurt to leave them in, though. */
-#undef HAVE_BASENAME
-#undef HAVE_PUTENV
-#undef HAVE_STRCASECMP
-#undef HAVE_STRTOL
-#undef HAVE_STRSTR
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-#undef __CHAR_UNSIGNED__
-#endif
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
-/* Define if the closedir function returns void instead of int. */
-#undef CLOSEDIR_VOID
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
-/* Define to empty if the keyword does not work. */
-#undef const
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
-/* Define if lex declares yytext as a char [] by default. */
-#undef YYTEXT_CHAR
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
-/* Define if lex declares yytext as a char * by default, not a char[]. */
-#undef YYTEXT_POINTER
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
-/* Define if lex declares yytext as a unsigned char [] by default. */
-#undef YYTEXT_UCHAR
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
+/* Define to 1 if you have the `getwd' function. */
+#undef HAVE_GETWD
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
+/* Define to 1 if you have the `index' function. */
+#undef HAVE_INDEX
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
-/* The number of bytes in a long. */
-#undef SIZEOF_LONG
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
-/* Define if you have the basename function. */
-#undef HAVE_BASENAME
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
-/* Define if you have the bcopy function. */
-#undef HAVE_BCOPY
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define if you have the getcwd function. */
-#undef HAVE_GETCWD
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
-/* Define if you have the getwd function. */
-#undef HAVE_GETWD
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
-/* Define if you have the putenv function. */
+/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
-/* Define if you have the strcasecmp function. */
-#undef HAVE_STRCASECMP
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
-/* Define if you have the strstr function. */
-#undef HAVE_STRSTR
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
-/* Define if you have the strtol function. */
-#undef HAVE_STRTOL
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Define if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
-/* Define if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
-/* Define if you have the <sys/dir.h> header file. */
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_DIR_H
-/* Define if you have the <sys/ndir.h> header file. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_NDIR_H
-/* Define if you have the <sys/param.h> header file. */
+/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
+
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+ `char[]'. */
+#undef YYTEXT_POINTER
+
+/* Define to 1 if type `char' is unsigned and you are not using gcc. */
+#ifndef __CHAR_UNSIGNED__
+# undef __CHAR_UNSIGNED__
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/lacheck/configure b/Build/source/texk/lacheck/configure
index 181435912bd..eb6e358fa20 100755
--- a/Build/source/texk/lacheck/configure
+++ b/Build/source/texk/lacheck/configure
@@ -1894,12 +1894,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 c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5070,7 +5068,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5073 "configure"' > conftest.$ac_ext
+ echo '#line 5071 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5632,7 +5630,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7573,7 +7571,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7576 "configure"
+#line 7574 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7671,7 +7669,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7674 "configure"
+#line 7672 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8905,7 +8903,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9044,6 +9042,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9644,9 +9710,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9655,12 +9721,52 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ 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 ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9682,23 +9788,28 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9753,7 +9864,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9812,7 +9924,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9881,7 +9994,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10095,49 +10209,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -10285,7 +10450,6 @@ fi
-
{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
if test "${ac_cv_c_char_unsigned+set}" = set; then
@@ -10749,6 +10913,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+
for ac_prog in 'bison -y' byacc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -10996,6 +11161,7 @@ fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
fi
+
ac_config_files="$ac_config_files Makefile.aux:Makefile.in"
ac_config_files="$ac_config_files Makefile:Makefile.aux"
@@ -12203,4 +12369,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-date >stamp-auto
diff --git a/Build/source/texk/lacheck/configure.in b/Build/source/texk/lacheck/configure.in
index c5afc0247e1..bd41d94bfc4 100644
--- a/Build/source/texk/lacheck/configure.in
+++ b/Build/source/texk/lacheck/configure.in
@@ -1,15 +1,17 @@
dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(lacheck.lex)
-sinclude(../kpathsea/common.ac)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
+sinclude(../kpathsea/common.ac)
dnl These tests prevent reliable cross-compilation. Sigh.
AC_C_CHAR_UNSIGNED
AC_CHECK_SIZEOF(long)
+
AC_PROG_YACC
AC_PROG_LEX
+
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
diff --git a/Build/source/texk/lacheck/stamp-aclocal b/Build/source/texk/lacheck/stamp-aclocal
new file mode 100644
index 00000000000..087b6ffe316
--- /dev/null
+++ b/Build/source/texk/lacheck/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:09 CET 2008
diff --git a/Build/source/texk/lacheck/stamp-auto.in b/Build/source/texk/lacheck/stamp-auto.in
new file mode 100644
index 00000000000..6a2f8cbd332
--- /dev/null
+++ b/Build/source/texk/lacheck/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:37:12 CET 2008
diff --git a/Build/source/texk/m4/ChangeLog b/Build/source/texk/m4/ChangeLog
index 3a02bab78fb..b1ea32d74f7 100644
--- a/Build/source/texk/m4/ChangeLog
+++ b/Build/source/texk/m4/ChangeLog
@@ -1,5 +1,10 @@
2008-02-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * kpse_mtim.m4 (KPSE_STRUCT_ST_MTIM): removed, use instead
+ AC_CHECK_MEMBERS([struct stat.st_mtim]).
+
+2008-02-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
* kpse_subdirs.m4 (KPSE_WITH_SUBDIRS): additional macro to
generate --without-PKG options for a list of packages.
diff --git a/Build/source/texk/m4/kpse_mtim.m4 b/Build/source/texk/m4/kpse_mtim.m4
deleted file mode 100644
index 226f666dde1..00000000000
--- a/Build/source/texk/m4/kpse_mtim.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# Private macro for the kpathsea library.
-# Copyright (C) 1995 - 2008 Karl Berry <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.
-
-# serial 1
-
-# KPSE_STRUCT_ST_MTIM
-# -------------------
-# Test for member st_mtim in struct stat
-# Should use AC_CHECK_MEMBER or AC_CHECK_MEMBERS
-AC_DEFUN([KPSE_STRUCT_ST_MTIM],
-[AC_CACHE_CHECK([for st_mtim in struct stat], ac_cv_struct_st_mtim,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/stat.h>], [struct stat s; s.st_mtim;],
-ac_cv_struct_st_mtim=yes, ac_cv_struct_st_mtim=no)])
-if test $ac_cv_struct_st_mtim = yes; then
- AC_DEFINE(HAVE_ST_MTIM)
-fi
-])
-
diff --git a/Build/source/texk/make/ChangeLog b/Build/source/texk/make/ChangeLog
index 14c15170570..a43b78ac026 100644
--- a/Build/source/texk/make/ChangeLog
+++ b/Build/source/texk/make/ChangeLog
@@ -1,4 +1,8 @@
-2008-02-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * config.mk: update and reactivate maintainer rules.
+
+2008-02-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* config.mk: temporarily disable maintainer rules, they need to
be updated for Autoconf 2.59+.
diff --git a/Build/source/texk/make/config.mk b/Build/source/texk/make/config.mk
index cc9080eb71d..0cec93b225b 100644
--- a/Build/source/texk/make/config.mk
+++ b/Build/source/texk/make/config.mk
@@ -1,36 +1,36 @@
# config.mk -- autoconf rules to remake the Makefile, c-auto.h, etc.
-@MAINT@## ac_dir = $(top_srcdir)/../etc/autoconf
-@MAINT@## autoconf = $(ac_dir)/acspecific.m4 $(ac_dir)/acgeneral.m4 $(ac_dir)/acsite.m4
-@MAINT@## autoheader = $(ac_dir)/acconfig.h $(ac_dir)/autoheader.m4
-@MAINT@##
-@MAINT@## # I define $(autoconf) to acgeneral.m4 and the other Autoconf files, so
-@MAINT@## # configure automatically gets remade in the sources with a new Autoconf
-@MAINT@## # release. But it would be bad for installers with Autoconf to remake
-@MAINT@## # configure (not to mention require Autoconf), so I take out the variable
-@MAINT@## # $(autoconf) definition before release.
-@MAINT@## #
-@MAINT@## # BTW, xt.ac isn't really required for dvipsk or dviljk, but it doesn't
-@MAINT@## # seem worth the trouble.
-@MAINT@## #
-@MAINT@## configure_in = $(srcdir)/configure.in $(kpathsea_srcdir)/common.ac \
-@MAINT@## $(kpathsea_srcdir)/withenable.ac $(kpathsea_srcdir)/xt.ac \
-@MAINT@## $(kpathsea_srcdir_parent)/libtool.m4
-@MAINT@## $(srcdir)/configure: $(configure_in) $(autoconf)
-@MAINT@## cd $(srcdir) && $(top_srcdir)/../autoconf2.13 -m $(ac_dir)
+@MAINT@# BTW, xt.ac isn't really required for dvipsk or dviljk, but it doesn't
+@MAINT@# seem worth the trouble.
+@MAINT@#
+@MAINT@configure_in = $(top_srcdir)/configure.in $(kpathsea_srcdir)/common.ac \
+@MAINT@ $(kpathsea_srcdir)/withenable.ac $(kpathsea_srcdir)/xt.ac \
+@MAINT@ $(kpathsea_srcdir_parent)/libtool.m4 $(top_srcdir)/../m4/*.m4
+@MAINT@
+@MAINT@aclocal_m4 = $(top_srcdir)/stamp-aclocal $(top_srcdir)/aclocal.m4
+@MAINT@
+@MAINT@$(top_srcdir)/stamp-aclocal: $(configure_in)
+@MAINT@ cd $(top_srcdir) && aclocal -I ../m4
+@MAINT@ date >$(top_srcdir)/stamp-aclocal
+@MAINT@# For the case that aclocal.m4 is missing
+@MAINT@$(top_srcdir)/aclocal.m4:
+@MAINT@ cd $(top_srcdir) && aclocal -I ../m4
+@MAINT@ date >$(top_srcdir)/stamp-aclocal
+@MAINT@
+@MAINT@$(top_srcdir)/configure: $(configure_in) $(aclocal_m4)
+@MAINT@ cd $(top_srcdir) && autoconf
+@MAINT@
+@MAINT@$(top_srcdir)/c-auto.in: $(top_srcdir)/stamp-auto.in
+@MAINT@$(top_srcdir)/stamp-auto.in: $(configure_in) $(aclocal_m4)
+@MAINT@ cd $(top_srcdir) && autoheader
+@MAINT@ date >$(top_srcdir)/stamp-auto.in
-config.status: $(srcdir)/configure
+config.status: $(top_srcdir)/configure
$(SHELL) $@ --recheck
+# FIXME: Shouldn't this be $(top_builddir)/config.status
Makefile: config.status $(srcdir)/Makefile.in $(top_srcdir)/../make/*.mk
$(SHELL) $<
-@MAINT@## # autoheader reads acconfig.h (and c-auto.h.top) automatically.
-@MAINT@## $(srcdir)/c-auto.in: $(srcdir)/stamp-auto.in
-@MAINT@## $(srcdir)/stamp-auto.in: $(configure_in) $(autoheader) \
-@MAINT@## $(kpathsea_srcdir)/acconfig.h
-@MAINT@## cd $(srcdir) && autoheader -m $(ac_dir) -l $(srcdir)
-@MAINT@## date >$(srcdir)/stamp-auto.in
-
# This rule isn't used for the top-level Makefile, but it doesn't hurt.
# We don't depend on config.status because configure always rewrites
# config.status, even when it doesn't change. Thus it might be newer
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index af77851bad1..9c928062386 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * acconfig.h: removed.
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/makeindexk/acconfig.h b/Build/source/texk/makeindexk/acconfig.h
deleted file mode 100644
index 67e51bad4ab..00000000000
--- a/Build/source/texk/makeindexk/acconfig.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.in.
-
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
-
diff --git a/Build/source/texk/makeindexk/c-auto.in b/Build/source/texk/makeindexk/c-auto.in
index 23dd30d3514..a5b2a9f582e 100644
--- a/Build/source/texk/makeindexk/c-auto.in
+++ b/Build/source/texk/makeindexk/c-auto.in
@@ -1,19 +1,64 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define if you have the setlocale function. */
+/* Define to 1 if you have the <ctype.h> header file. */
+#undef HAVE_CTYPE_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
-/* Define if you have the strchr function. */
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
-/* Define if you have the strrchr function. */
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/* Define if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
-/* Define if you have the <types.h> header file. */
+/* Define to 1 if you have the <types.h> header file. */
#undef HAVE_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
diff --git a/Build/source/texk/makeindexk/stamp-aclocal b/Build/source/texk/makeindexk/stamp-aclocal
new file mode 100644
index 00000000000..71be2e01f18
--- /dev/null
+++ b/Build/source/texk/makeindexk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:13 CET 2008
diff --git a/Build/source/texk/makeindexk/stamp-auto.in b/Build/source/texk/makeindexk/stamp-auto.in
index 313c8608f7e..4673e766c69 100644
--- a/Build/source/texk/makeindexk/stamp-auto.in
+++ b/Build/source/texk/makeindexk/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:28:55 CEST 2005
+Fri Feb 29 13:37:14 CET 2008
diff --git a/Build/source/texk/musixflx/ChangeLog b/Build/source/texk/musixflx/ChangeLog
index d34287385f6..112f761c848 100644
--- a/Build/source/texk/musixflx/ChangeLog
+++ b/Build/source/texk/musixflx/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/musixflx/aclocal.m4 b/Build/source/texk/musixflx/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/musixflx/aclocal.m4
+++ b/Build/source/texk/musixflx/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/musixflx/c-auto.in b/Build/source/texk/musixflx/c-auto.in
index 2b6c83703b0..11e5e3d0a77 100644
--- a/Build/source/texk/musixflx/c-auto.in
+++ b/Build/source/texk/musixflx/c-auto.in
@@ -1,126 +1,187 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
+/* c-auto.in. Generated from configure.in by autoheader. */
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
-/* kpathsea: the version string. */
-#define KPSEVERSION "REPLACE-WITH-KPSEVERSION"
-/* web2c: the version string. */
-#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
+#undef GETCWD_FORKS
-/* These came from klibtool's kb_AC_KLIBTOOL_REPLACE_FUNCS, probably no
- longer needed, doesn't hurt to leave them in, though. */
-#undef HAVE_BASENAME
-#undef HAVE_PUTENV
-#undef HAVE_STRCASECMP
-#undef HAVE_STRTOL
-#undef HAVE_STRSTR
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-#undef __CHAR_UNSIGNED__
-#endif
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
-/* Define if the closedir function returns void instead of int. */
-#undef CLOSEDIR_VOID
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
-/* Define to empty if the keyword does not work. */
-#undef const
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
+/* Define to 1 if you have the `getwd' function. */
+#undef HAVE_GETWD
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+/* Define to 1 if you have the `index' function. */
+#undef HAVE_INDEX
-/* The number of bytes in a long. */
-#undef SIZEOF_LONG
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define if you have the basename function. */
-#undef HAVE_BASENAME
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
-/* Define if you have the bcopy function. */
-#undef HAVE_BCOPY
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
-/* Define if you have the getcwd function. */
-#undef HAVE_GETCWD
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
-/* Define if you have the getwd function. */
-#undef HAVE_GETWD
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
-/* Define if you have the putenv function. */
-#undef HAVE_PUTENV
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define if you have the strcasecmp function. */
-#undef HAVE_STRCASECMP
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
-/* Define if you have the strstr function. */
-#undef HAVE_STRSTR
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
-/* Define if you have the strtol function. */
-#undef HAVE_STRTOL
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
-/* Define if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
-/* Define if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define if you have the <sys/dir.h> header file. */
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_DIR_H
-/* Define if you have the <sys/ndir.h> header file. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_NDIR_H
-/* Define if you have the <sys/param.h> header file. */
+/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
+
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if type `char' is unsigned and you are not using gcc. */
+#ifndef __CHAR_UNSIGNED__
+# undef __CHAR_UNSIGNED__
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/musixflx/configure b/Build/source/texk/musixflx/configure
index 0f4bfa7627b..7109d195466 100755
--- a/Build/source/texk/musixflx/configure
+++ b/Build/source/texk/musixflx/configure
@@ -1882,12 +1882,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 c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5058,7 +5056,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5061 "configure"' > conftest.$ac_ext
+ echo '#line 5059 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5620,7 +5618,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7561,7 +7559,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7564 "configure"
+#line 7562 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7659,7 +7657,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7662 "configure"
+#line 7660 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8893,7 +8891,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9032,6 +9030,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9632,9 +9698,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9643,12 +9709,52 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ 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 ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9670,23 +9776,28 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9741,7 +9852,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9800,7 +9912,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9869,7 +9982,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10083,49 +10197,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -10273,7 +10438,6 @@ fi
-
{ echo "$as_me:$LINENO: checking whether char is unsigned" >&5
echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6; }
if test "${ac_cv_c_char_unsigned+set}" = set; then
@@ -11940,4 +12104,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-date >stamp-auto
diff --git a/Build/source/texk/musixflx/configure.in b/Build/source/texk/musixflx/configure.in
index 8fca29bb0ee..ee2b36b9d30 100644
--- a/Build/source/texk/musixflx/configure.in
+++ b/Build/source/texk/musixflx/configure.in
@@ -1,8 +1,10 @@
dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(musixflx.c)
-sinclude(../kpathsea/common.ac)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
+sinclude(../kpathsea/common.ac)
dnl These tests prevent reliable cross-compilation. Sigh.
AC_C_CHAR_UNSIGNED
@@ -10,5 +12,3 @@ AC_CHECK_SIZEOF(long)
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
diff --git a/Build/source/texk/musixflx/stamp-aclocal b/Build/source/texk/musixflx/stamp-aclocal
new file mode 100644
index 00000000000..db206894470
--- /dev/null
+++ b/Build/source/texk/musixflx/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:16 CET 2008
diff --git a/Build/source/texk/musixflx/stamp-auto.in b/Build/source/texk/musixflx/stamp-auto.in
new file mode 100644
index 00000000000..1bf06502113
--- /dev/null
+++ b/Build/source/texk/musixflx/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:37:17 CET 2008
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index f97d4878e3b..a95a4eccb0b 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * acconfig.h: removed.
+
2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/ps2pkm/acconfig.h b/Build/source/texk/ps2pkm/acconfig.h
deleted file mode 100644
index 739210b5ae1..00000000000
--- a/Build/source/texk/ps2pkm/acconfig.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.in.
-
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
-
-
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
-
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
-
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
-
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
diff --git a/Build/source/texk/ps2pkm/c-auto.in b/Build/source/texk/ps2pkm/c-auto.in
index b787eb15767..5f2a8ea6aec 100644
--- a/Build/source/texk/ps2pkm/c-auto.in
+++ b/Build/source/texk/ps2pkm/c-auto.in
@@ -1,19 +1,61 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define if you don't have vprintf but do have _doprnt. */
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
-/* Define if you have the vprintf function. */
-#undef HAVE_VPRINTF
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define if you have the memset function. */
+/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Define if you have the m library (-lm). */
-#undef HAVE_LIBM
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
diff --git a/Build/source/texk/ps2pkm/stamp-aclocal b/Build/source/texk/ps2pkm/stamp-aclocal
new file mode 100644
index 00000000000..82b1751aff3
--- /dev/null
+++ b/Build/source/texk/ps2pkm/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:18 CET 2008
diff --git a/Build/source/texk/ps2pkm/stamp-auto.in b/Build/source/texk/ps2pkm/stamp-auto.in
index 73d8381f204..4fad8976844 100644
--- a/Build/source/texk/ps2pkm/stamp-auto.in
+++ b/Build/source/texk/ps2pkm/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:28:57 CEST 2005
+Fri Feb 29 13:37:19 CET 2008
diff --git a/Build/source/texk/seetexk/ChangeLog b/Build/source/texk/seetexk/ChangeLog
index 38966acb91c..fc755b1f65d 100644
--- a/Build/source/texk/seetexk/ChangeLog
+++ b/Build/source/texk/seetexk/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/seetexk/acconfig.h b/Build/source/texk/seetexk/acconfig.h
deleted file mode 100644
index 461e5c875f5..00000000000
--- a/Build/source/texk/seetexk/acconfig.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
-
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
-
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
-
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
diff --git a/Build/source/texk/seetexk/aclocal.m4 b/Build/source/texk/seetexk/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/seetexk/aclocal.m4
+++ b/Build/source/texk/seetexk/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/seetexk/c-auto.in b/Build/source/texk/seetexk/c-auto.in
index 4e34810adfd..26138f9ae72 100644
--- a/Build/source/texk/seetexk/c-auto.in
+++ b/Build/source/texk/seetexk/c-auto.in
@@ -1,136 +1,188 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define if the closedir function returns void instead of int. */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
-/* Define to empty if the keyword does not work. */
-#undef const
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
+#undef GETCWD_FORKS
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
-/* The number of bytes in a int. */
-#undef SIZEOF_INT
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
-/* Define if you have the bcmp function. */
-#undef HAVE_BCMP
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
-/* Define if you have the bcopy function. */
-#undef HAVE_BCOPY
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
-/* Define if you have the bzero function. */
-#undef HAVE_BZERO
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
-/* Define if you have the getcwd function. */
+/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
-/* Define if you have the getwd function. */
+/* Define to 1 if you have the `getwd' function. */
#undef HAVE_GETWD
-/* Define if you have the index function. */
+/* Define to 1 if you have the `index' function. */
#undef HAVE_INDEX
-/* Define if you have the memcmp function. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `memcmp' function. */
#undef HAVE_MEMCMP
-/* Define if you have the memcpy function. */
+/* Define to 1 if you have the `memcpy' function. */
#undef HAVE_MEMCPY
-/* Define if you have the putenv function. */
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
+
+/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
-/* Define if you have the rindex function. */
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `rindex' function. */
#undef HAVE_RINDEX
-/* Define if you have the strcasecmp function. */
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
-/* Define if you have the strchr function. */
+/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
-/* Define if you have the strerror function. */
+/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
-/* Define if you have the strrchr function. */
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define if you have the strstr function. */
+/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
-/* Define if you have the strtol function. */
+/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
-/* Define if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_DIR_H
-/* Define if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_NDIR_H
-/* Define if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
-/* Define if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
-/* Define if you have the <sys/dir.h> header file. */
-#undef HAVE_SYS_DIR_H
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
-/* Define if you have the <sys/ndir.h> header file. */
-#undef HAVE_SYS_NDIR_H
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
-/* Define if you have the m library (-lm). */
-#undef HAVE_LIBM
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure
index ccab46590dd..c67b23a8be3 100755
--- a/Build/source/texk/seetexk/configure
+++ b/Build/source/texk/seetexk/configure
@@ -1882,13 +1882,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 c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5059,7 +5056,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5062 "configure"' > conftest.$ac_ext
+ echo '#line 5059 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5621,7 +5618,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7562,7 +7559,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7565 "configure"
+#line 7562 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7660,7 +7657,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7663 "configure"
+#line 7660 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8894,7 +8891,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9033,6 +9030,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9633,9 +9698,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9644,12 +9709,52 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ 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 ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9671,23 +9776,28 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9742,7 +9852,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9801,7 +9912,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9870,7 +9982,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10084,49 +10197,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -12115,4 +12279,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-date >stamp-auto
diff --git a/Build/source/texk/seetexk/configure.in b/Build/source/texk/seetexk/configure.in
index eedade9b23a..0a493e9857a 100644
--- a/Build/source/texk/seetexk/configure.in
+++ b/Build/source/texk/seetexk/configure.in
@@ -1,6 +1,8 @@
dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(dviselect.c)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
sinclude(../kpathsea/common.ac)
@@ -10,5 +12,3 @@ AC_CHECK_HEADERS(errno.h)
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
diff --git a/Build/source/texk/seetexk/stamp-aclocal b/Build/source/texk/seetexk/stamp-aclocal
new file mode 100644
index 00000000000..dd2ebe9e56b
--- /dev/null
+++ b/Build/source/texk/seetexk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:21 CET 2008
diff --git a/Build/source/texk/seetexk/stamp-auto.in b/Build/source/texk/seetexk/stamp-auto.in
index efbce6cfde4..fef86405144 100644
--- a/Build/source/texk/seetexk/stamp-auto.in
+++ b/Build/source/texk/seetexk/stamp-auto.in
@@ -1 +1 @@
-Sun Mar 21 20:44:24 CET 2004
+Fri Feb 29 13:37:23 CET 2008
diff --git a/Build/source/texk/stamp-aclocal b/Build/source/texk/stamp-aclocal
new file mode 100644
index 00000000000..42cad0b9909
--- /dev/null
+++ b/Build/source/texk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:36:41 CET 2008
diff --git a/Build/source/texk/tetex/stamp-aclocal b/Build/source/texk/tetex/stamp-aclocal
new file mode 100644
index 00000000000..000a039e771
--- /dev/null
+++ b/Build/source/texk/tetex/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:24 CET 2008
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index 6e2a32bcaae..40026903b90 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+ * config.h: removed (was empty).
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/tex4htk/acconfig.h b/Build/source/texk/tex4htk/acconfig.h
deleted file mode 100644
index 461e5c875f5..00000000000
--- a/Build/source/texk/tex4htk/acconfig.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
-
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
-
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
-#undef GETCWD_FORKS
-
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
diff --git a/Build/source/texk/tex4htk/aclocal.m4 b/Build/source/texk/tex4htk/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/tex4htk/aclocal.m4
+++ b/Build/source/texk/tex4htk/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/tex4htk/c-auto.in b/Build/source/texk/tex4htk/c-auto.in
index 7d186ab599a..e5453251ef5 100644
--- a/Build/source/texk/tex4htk/c-auto.in
+++ b/Build/source/texk/tex4htk/c-auto.in
@@ -1,130 +1,182 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define if the closedir function returns void instead of int. */
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
-/* Define to empty if the keyword does not work. */
-#undef const
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if your compiler understands prototypes. */
-#undef HAVE_PROTOTYPES
-
-/* Define if your putenv doesn't waste space when the same environment
- variable is assigned more than once, with different (malloced)
- values. This is true only on NetBSD/FreeBSD, as far as I know. See
- xputenv.c. */
-#undef SMART_PUTENV
-
-/* Define if getcwd if implemented using fork or vfork. Let me know
- if you have to add this by hand because configure failed to detect
- it. */
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
#undef GETCWD_FORKS
-/* Define if you are using GNU libc or otherwise have global variables
- `program_invocation_name' and `program_invocation_short_name'. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* all: Define to enable running scripts when missing input files. */
-#define MAKE_TEX_MF_BY_DEFAULT 0
-#define MAKE_TEX_PK_BY_DEFAULT 0
-#define MAKE_TEX_TEX_BY_DEFAULT 0
-#define MAKE_TEX_TFM_BY_DEFAULT 0
-#define MAKE_TEX_FMT_BY_DEFAULT 0
-#define MAKE_OMEGA_OFM_BY_DEFAULT 0
-#define MAKE_OMEGA_OCP_BY_DEFAULT 0
-
-/* The number of bytes in a int. */
-#undef SIZEOF_INT
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
-/* Define if you have the bcmp function. */
+/* Define to 1 if you have the `bcmp' function. */
#undef HAVE_BCMP
-/* Define if you have the bcopy function. */
+/* Define to 1 if you have the `bcopy' function. */
#undef HAVE_BCOPY
-/* Define if you have the bzero function. */
+/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
-/* Define if you have the getcwd function. */
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
+/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
-/* Define if you have the getwd function. */
+/* Define to 1 if you have the `getwd' function. */
#undef HAVE_GETWD
-/* Define if you have the index function. */
+/* Define to 1 if you have the `index' function. */
#undef HAVE_INDEX
-/* Define if you have the memcmp function. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `memcmp' function. */
#undef HAVE_MEMCMP
-/* Define if you have the memcpy function. */
+/* Define to 1 if you have the `memcpy' function. */
#undef HAVE_MEMCPY
-/* Define if you have the putenv function. */
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
+
+/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
-/* Define if you have the rindex function. */
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `rindex' function. */
#undef HAVE_RINDEX
-/* Define if you have the strcasecmp function. */
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
-/* Define if you have the strchr function. */
+/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
-/* Define if you have the strrchr function. */
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define if you have the strstr function. */
+/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
-/* Define if you have the strtol function. */
+/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
-/* Define if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_DIR_H
-/* Define if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_NDIR_H
-/* Define if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
-/* Define if you have the <sys/dir.h> header file. */
-#undef HAVE_SYS_DIR_H
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
-/* Define if you have the <sys/ndir.h> header file. */
-#undef HAVE_SYS_NDIR_H
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
-/* Define if you have the m library (-lm). */
-#undef HAVE_LIBM
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/tex4htk/config.h b/Build/source/texk/tex4htk/config.h
deleted file mode 100644
index 8b137891791..00000000000
--- a/Build/source/texk/tex4htk/config.h
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure
index b25b2458c6e..f80760ec734 100755
--- a/Build/source/texk/tex4htk/configure
+++ b/Build/source/texk/tex4htk/configure
@@ -1882,13 +1882,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 c-auto.h:c-auto.in"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5059,7 +5056,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5062 "configure"' > conftest.$ac_ext
+ echo '#line 5059 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5621,7 +5618,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7562,7 +7559,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7565 "configure"
+#line 7562 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7660,7 +7657,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7663 "configure"
+#line 7660 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8894,7 +8891,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9033,6 +9030,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9633,9 +9698,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9644,12 +9709,52 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ 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 ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9671,23 +9776,28 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9742,7 +9852,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9801,7 +9912,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9870,7 +9982,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10084,49 +10197,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
@@ -11881,4 +12045,3 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
-date >stamp-auto
diff --git a/Build/source/texk/tex4htk/configure.in b/Build/source/texk/tex4htk/configure.in
index 0c7ef81640c..4a988f8dab2 100644
--- a/Build/source/texk/tex4htk/configure.in
+++ b/Build/source/texk/tex4htk/configure.in
@@ -1,5 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(tex4ht.c)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
sinclude(../kpathsea/common.ac)
@@ -7,5 +9,3 @@ AC_CHECK_SIZEOF(int)
KPSE_CONFIG_FILES([Makefile])
AC_OUTPUT
-dnl Update stamp-auto, since we just remade `c-auto.h'.
-date >stamp-auto
diff --git a/Build/source/texk/tex4htk/stamp-aclocal b/Build/source/texk/tex4htk/stamp-aclocal
new file mode 100644
index 00000000000..beca5add14f
--- /dev/null
+++ b/Build/source/texk/tex4htk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:28 CET 2008
diff --git a/Build/source/texk/tex4htk/stamp-auto.in b/Build/source/texk/tex4htk/stamp-auto.in
index b5a1d2caaf3..c355da0936a 100644
--- a/Build/source/texk/tex4htk/stamp-auto.in
+++ b/Build/source/texk/tex4htk/stamp-auto.in
@@ -1 +1 @@
-Sun Mar 21 20:47:44 CET 2004
+Fri Feb 29 13:37:29 CET 2008
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 096c2572610..13816cbd6f1 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here) and
+ updated (AC_SET_MAKE -> AC_PROG_MAKE_SET).
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/texlive/aclocal.m4 b/Build/source/texk/texlive/aclocal.m4
index 0a76462785b..83822405e5d 100644
--- a/Build/source/texk/texlive/aclocal.m4
+++ b/Build/source/texk/texlive/aclocal.m4
@@ -14,4 +14,3 @@
m4_include([../m4/kpse_cross.m4])
m4_include([../m4/kpse_inc.m4])
m4_include([../m4/kpse_maint.m4])
-m4_include([../m4/kpse_mtim.m4])
diff --git a/Build/source/texk/texlive/c-auto.in b/Build/source/texk/texlive/c-auto.in
index e69de29bb2d..31830b403a8 100644
--- a/Build/source/texk/texlive/c-auto.in
+++ b/Build/source/texk/texlive/c-auto.in
@@ -0,0 +1,179 @@
+/* c-auto.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
+
+/* Define to 1 if getcwd is implemented using fork or vfork. Let me know if
+ you have to add this by hand because configure failed to detect it. */
+#undef GETCWD_FORKS
+
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
+
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
+
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
+
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+ */
+#undef HAVE_DECL_STRSTR
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
+
+/* Define to 1 if you have the `getwd' function. */
+#undef HAVE_GETWD
+
+/* 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 `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+ `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you want to run mkocp if OCP file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OCP_BY_DEFAULT
+
+/* Define to 1 if you want to run mkofm if OFM file missing, and to 0 if you
+ don't. */
+#undef MAKE_OMEGA_OFM_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexfmt if format file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_FMT_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexmf if MF source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_MF_BY_DEFAULT
+
+/* Define to 1 if you want to run mktexpk if PK font missing, and to 0 if you
+ don't. */
+#undef MAKE_TEX_PK_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextex if TeX source missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TEX_BY_DEFAULT
+
+/* Define to 1 if you want to run mktextfm if TFM file missing, and to 0 if
+ you don't. */
+#undef MAKE_TEX_TFM_BY_DEFAULT
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure
index 7a46da9c87b..ed7f48e5c29 100755
--- a/Build/source/texk/texlive/configure
+++ b/Build/source/texk/texlive/configure
@@ -1882,6 +1882,8 @@ 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 c-auto.h:c-auto.in"
+
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
@@ -1915,11 +1917,6 @@ fi
-
-
-ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5090,7 +5087,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5093 "configure"' > conftest.$ac_ext
+ echo '#line 5090 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5652,7 +5649,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && 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
if test -s out/conftest.err; then
@@ -7593,7 +7590,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7596 "configure"
+#line 7593 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7691,7 +7688,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7694 "configure"
+#line 7691 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8925,7 +8922,7 @@ fi
for ac_header in assert.h float.h limits.h memory.h pwd.h stdlib.h \
- string.h strings.h sys/param.h unistd.h
+ string.h strings.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9064,6 +9061,74 @@ fi
done
+{ echo "$as_me:$LINENO: checking whether strstr is declared" >&5
+echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_strstr+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+int
+main ()
+{
+#ifndef strstr
+ (void) strstr;
+#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 "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_strstr=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_strstr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strstr" >&5
+echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6; }
+if test $ac_cv_have_decl_strstr = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR 0
+_ACEOF
+
+
+fi
+
+
for ac_func in putenv
@@ -9664,9 +9729,9 @@ fi
# Check whether struct stat provides high-res time.
-{ echo "$as_me:$LINENO: checking for st_mtim in struct stat" >&5
-echo $ECHO_N "checking for st_mtim in struct stat... $ECHO_C" >&6; }
-if test "${ac_cv_struct_st_mtim+set}" = set; then
+{ echo "$as_me:$LINENO: checking for struct stat.st_mtim" >&5
+echo $ECHO_N "checking for struct stat.st_mtim... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_stat_st_mtim+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -9675,12 +9740,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
int
main ()
{
-struct stat s; s.st_mtim;
+static struct stat ac_aggr;
+if (ac_aggr.st_mtim)
+return 0;
;
return 0;
}
@@ -9702,23 +9768,67 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_struct_st_mtim=yes
+ ac_cv_member_struct_stat_st_mtim=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_struct_st_mtim=no
+ 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 struct stat ac_aggr;
+if (sizeof ac_aggr.st_mtim)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $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
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_stat_st_mtim=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_stat_st_mtim=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_st_mtim" >&5
-echo "${ECHO_T}$ac_cv_struct_st_mtim" >&6; }
-if test $ac_cv_struct_st_mtim = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_MTIM 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim" >&5
+echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim" >&6; }
+if test $ac_cv_member_struct_stat_st_mtim = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
_ACEOF
+
fi
@@ -9773,7 +9883,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_c_prototypes" >&5
echo "${ECHO_T}$kb_cv_c_prototypes" >&6; }
if test "$kb_cv_c_prototypes" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROTOTYPES 1
_ACEOF
@@ -9832,7 +9943,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_var_program_inv_name" >&5
echo "${ECHO_T}$kb_cv_var_program_inv_name" >&6; }
if test "$kb_cv_var_program_inv_name" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_PROGRAM_INVOCATION_NAME 1
_ACEOF
@@ -9901,7 +10013,8 @@ fi
{ echo "$as_me:$LINENO: result: $kb_cv_func_getcwd_forks" >&5
echo "${ECHO_T}$kb_cv_func_getcwd_forks" >&6; }
if test $kb_cv_func_getcwd_forks = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GETCWD_FORKS 1
_ACEOF
@@ -10115,49 +10228,100 @@ fi
# Implementation of those options.
+# _KPSE_DEFINE_MAKE_BY_DEFAULT
+
if test "x$with_mktexmf_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_MF_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_MF_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexpk_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_PK_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_PK_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextex_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TEX_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TEX_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktexfmt_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_FMT_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_FMT_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mktextfm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_TEX_TFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_TEX_TFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkocp_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OCP_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OCP_BY_DEFAULT 0
+_ACEOF
+
fi
+
if test "x$with_mkofm_default" = xyes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAKE_OMEGA_OFM_BY_DEFAULT 1
_ACEOF
+else
+ cat >>confdefs.h <<\_ACEOF
+#define MAKE_OMEGA_OFM_BY_DEFAULT 0
+_ACEOF
+
fi
+
# Is libm present. FIXME: do we need it at all?
{ echo "$as_me:$LINENO: checking for main in -lm" >&5
diff --git a/Build/source/texk/texlive/configure.in b/Build/source/texk/texlive/configure.in
index 2d412b34ffb..15409c4ea40 100644
--- a/Build/source/texk/texlive/configure.in
+++ b/Build/source/texk/texlive/configure.in
@@ -1,7 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
+
AC_INIT(hugetex)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
-AC_SET_MAKE
+AC_PROG_MAKE_SET
sinclude(../kpathsea/common.ac)
diff --git a/Build/source/texk/texlive/stamp-aclocal b/Build/source/texk/texlive/stamp-aclocal
new file mode 100644
index 00000000000..4bdfe8b78a7
--- /dev/null
+++ b/Build/source/texk/texlive/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:31 CET 2008
diff --git a/Build/source/texk/texlive/stamp-auto.in b/Build/source/texk/texlive/stamp-auto.in
new file mode 100644
index 00000000000..fdffbdf5873
--- /dev/null
+++ b/Build/source/texk/texlive/stamp-auto.in
@@ -0,0 +1 @@
+Wed Feb 27 17:56:43 CET 2008
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog
index 096c2572610..a84a79382ae 100644
--- a/Build/source/texk/ttf2pk/ChangeLog
+++ b/Build/source/texk/ttf2pk/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: added AC_CONFIG_HEADERS (moved
+ from ../kpathsea/common.ac to here).
+
2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/ttf2pk/c-auto.h b/Build/source/texk/ttf2pk/c-auto.h
deleted file mode 100644
index 8dd094de2a3..00000000000
--- a/Build/source/texk/ttf2pk/c-auto.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * c-auto.h
- *
- * This file is part of the ttf2pk package.
- *
- * Copyright 1997-1999, 2000 by
- * Frederic Loyer <loyer@ensta.fr>
- * Werner Lemberg <wl@gnu.org>
- */
-
-#ifndef C_AUTO_H
-#define C_AUTO_H
-
-/*
- * We need to get kpathsea's configuration file.
- */
-
-#include "kpathsea/c-auto.h"
-
-#endif /* C_AUTO_H */
-
-
-/* end */
diff --git a/Build/source/texk/ttf2pk/c-auto.in b/Build/source/texk/ttf2pk/c-auto.in
new file mode 100644
index 00000000000..228e6a90c43
--- /dev/null
+++ b/Build/source/texk/ttf2pk/c-auto.in
@@ -0,0 +1,55 @@
+/* c-auto.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if you have the <freetype.h> header file. */
+#undef HAVE_FREETYPE_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the `ttf' library (-lttf). */
+#undef HAVE_LIBTTF
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure
index f0c37c550ed..222cf2ab89c 100755
--- a/Build/source/texk/ttf2pk/configure
+++ b/Build/source/texk/ttf2pk/configure
@@ -1705,6 +1705,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4060,37 +4063,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section. Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-t clear
-:clear
-s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
- g
- s/^\n//
- s/\n/ /g
- p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
+DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -4425,6 +4398,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
# Files that config.status was made for.
config_files="$ac_config_files"
+config_headers="$ac_config_headers"
_ACEOF
@@ -4442,10 +4416,15 @@ Usage: $0 [OPTIONS] [FILE]...
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
+Configuration headers:
+$config_headers
+
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
@@ -4495,7 +4474,16 @@ do
$ac_shift
CONFIG_FILES="$CONFIG_FILES $ac_optarg"
ac_need_defaults=false;;
- --he | --h | --help | --hel | -h )
+ --header | --heade | --head | --hea )
+ $ac_shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -4550,6 +4538,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
+ "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
"Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
@@ -4566,6 +4555,7 @@ done
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -4733,7 +4723,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES
+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
@@ -4973,7 +4963,104 @@ which seems to be undefined. Please make sure it is defined." >&2;}
*) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
esac
;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status. If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless. But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
+ac_dB='\\)[ (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+ sed -n '
+ t rset
+ :rset
+ s/^[ ]*#[ ]*define[ ][ ]*//
+ t ok
+ d
+ :ok
+ s/[\\&,]/\\&/g
+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+ ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments. This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+ # Write a here document:
+ cat >>$CONFIG_STATUS <<_ACEOF
+ # First, check the format of the line:
+ cat >"\$tmp/defines.sed" <<\\CEOF
+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
+b
+:def
+_ACEOF
+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+ echo 'CEOF
+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+ grep . conftest.tail >/dev/null || break
+ rm -f conftest.defines
+ mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
+ if test x"$ac_file" != x-; then
+ echo "/* $configure_input */" >"$tmp/config.h"
+ cat "$ac_result" >>"$tmp/config.h"
+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f $ac_file
+ mv "$tmp/config.h" $ac_file
+ fi
+ else
+ echo "/* $configure_input */"
+ cat "$ac_result"
+ fi
+ rm -f "$tmp/out12"
+ ;;
esac
diff --git a/Build/source/texk/ttf2pk/configure.in b/Build/source/texk/ttf2pk/configure.in
index 06fc6a600e6..c8a32886130 100644
--- a/Build/source/texk/ttf2pk/configure.in
+++ b/Build/source/texk/ttf2pk/configure.in
@@ -2,6 +2,8 @@ dnl Public domain.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(ttf2pk.c)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
+
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
diff --git a/Build/source/texk/ttf2pk/stamp-aclocal b/Build/source/texk/ttf2pk/stamp-aclocal
new file mode 100644
index 00000000000..4df5d82d931
--- /dev/null
+++ b/Build/source/texk/ttf2pk/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:33 CET 2008
diff --git a/Build/source/texk/ttf2pk/stamp-auto.in b/Build/source/texk/ttf2pk/stamp-auto.in
new file mode 100644
index 00000000000..1c98811ae95
--- /dev/null
+++ b/Build/source/texk/ttf2pk/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:37:34 CET 2008
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 5b0b89df157..19ddb114271 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.in: replace PACKAGE_... by WEB2C_PACKAGE_... in
+ c-auto.h, to avoid conflicts with other packages.
+
+ * configure.in: use AH_TOP, AH_BOTTOM, and AC_DEFINE's third
+ argument to provide autoheader templates ...
+ * withenable.ac: use AC_DEFINE's third argument to provide
+ autoheader templates ...
+ * acconfig.h: ... removed.
+
2008-02-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.in: remove AC_DECL_YYTEXT to avoid autoconf warning.
diff --git a/Build/source/texk/web2c/acconfig.h b/Build/source/texk/web2c/acconfig.h
deleted file mode 100644
index a97a0853282..00000000000
--- a/Build/source/texk/web2c/acconfig.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.in.
-
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
-
-/* Guard against double inclusion. */
-#ifndef WEB2C_C_AUTO_H
-#define WEB2C_C_AUTO_H
-
-/* web2c: the version string. */
-#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"
-
-@TOP@
-
-/* Define if you get clashes concerning wchar_t, between X's include
- files and system includes. */
-#undef FOIL_X_WCHAR_T
-
-/* tex: Define to enable --ipc. */
-#undef IPC
-
-/* web2c: Define if gcc asm needs _ on external symbols. */
-#undef ASM_NEEDS_UNDERSCORE
-
-/* web2c: Define when using system-specific files for arithmetic. */
-#undef ASM_SCALED_FRACTION
-
-/* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */
-#undef FUNNY_CORE_DUMP
-
-/* web2c: Define to disable architecture-independent dump files.
- Faster on LittleEndian architectures. */
-#undef NO_DUMP_SHARE
-
-/* web2c: Default editor for interactive `e' option. */
-#define EDITOR "vi +%d %s"
-
-/* web2c: Window system support for Metafont. */
-#undef EPSFWIN
-#undef HP2627WIN
-#undef MFTALKWIN
-#undef NEXTWIN
-#undef REGISWIN
-#undef SUNWIN
-#undef TEKTRONIXWIN
-#undef UNITERMWIN
-#undef X11WIN
-
-@BOTTOM@
-#endif /* !WEB2C_C_AUTO_H */
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 57cda6c0ef2..61b721ca28f 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -1,9 +1,22 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader 2.13. */
-/* acconfig.h -- used by autoheader when generating c-auto.in.
+/* c-auto.in. Generated from configure.in by autoheader. */
- If you're thinking of editing acconfig.h to fix a configuration
- problem, don't. Edit the c-auto.h file created by configure,
- instead. Even better, fix configure to give the right answer. */
+/* c-auto.h: defines for web2c, as determined by configure.
+
+ Copyright 1994-97, 2008 Karl Berry.
+ Copyright 1997-99, 2002, 2005 Olaf Weber.
+
+ 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 of the License, 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/>. */
/* Guard against double inclusion. */
#ifndef WEB2C_C_AUTO_H
@@ -12,102 +25,178 @@
/* web2c: the version string. */
#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"
+/* web2c: Define if gcc asm needs _ on external symbols. */
+#undef ASM_NEEDS_UNDERSCORE
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-#undef __CHAR_UNSIGNED__
-#endif
+/* web2c: Default editor for interactive `e' option. */
+#undef EDITOR
-/* Define as __inline if that's what the C compiler calls it. */
-#undef inline
+/* metafont: Define to include EPSF pseudo-window support */
+#undef EPSFWIN
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
+/* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */
+#undef FUNNY_CORE_DUMP
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define if you have Carbon */
+#undef HAVE_CARBON
-/* Define if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
+/* Define to 1 if you have the <ft2build.h> header file. */
+#undef HAVE_FT2BUILD_H
-/* Define if lex declares yytext as a char [] by default. */
-#undef YYTEXT_CHAR
+/* Define to 1 if you have the `ftime' function. */
+#undef HAVE_FTIME
-/* Define if lex declares yytext as a char * by default, not a char[]. */
-#undef YYTEXT_POINTER
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
-/* Define if lex declares yytext as a unsigned char [] by default. */
-#undef YYTEXT_UCHAR
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* tex: Define to enable --ipc. */
-#undef IPC
+/* Define if you have libfontconfig */
+#undef HAVE_LIBFONTCONFIG
-/* web2c: Define if gcc asm needs _ on external symbols. */
-#undef ASM_NEEDS_UNDERSCORE
+/* Define to 1 if you have the `freetype' library (-lfreetype). */
+#undef HAVE_LIBFREETYPE
-/* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */
-#undef FUNNY_CORE_DUMP
+/* Define to 1 if you have the `icuuc' library (-licuuc). */
+#undef HAVE_LIBICUUC
-/* web2c: Define to disable architecture-independent dump files.
- Faster on LittleEndian architectures. */
-#undef NO_DUMP_SHARE
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
-/* web2c: Default editor for interactive `e' option. Although we'd like
- to use ${VISUAL-${EDITOR-foo}} here, chances are a user's editor
- won't understand +lineno, so they'll just have to override
- TEXEDIT/MFEDIT/MPEDIT to get what they want. No particular reason
- for emacs vs. vi, just historical. */
-#ifdef WIN32
-#define EDITOR "emacs +%d \"%s\""
-#else
-#define EDITOR "vi +%d '%s'"
-#endif
+/* Define to 1 if you have the `posix' library (-lposix). */
+#undef HAVE_LIBPOSIX
-/* web2c: Window system support for Metafont. */
-#undef EPSFWIN
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
+/* Define to 1 if you have the `mktemp' function. */
+#undef HAVE_MKTEMP
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#undef HAVE_SYS_TIMEB_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <ubidi.h> header file. */
+#undef HAVE_UBIDI_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
+/* metafont: Define to include HP 2627 window support */
#undef HP2627WIN
+
+/* tex: Define to enable --ipc. */
+#undef IPC
+
+/* metafont: Define to include mftalk (generic server) window support */
#undef MFTALKWIN
+
+/* metafont: Define to include NeXT window support */
#undef NEXTWIN
+
+/* web2c: Define to disable architecture-independent dump files. Faster on
+ LittleEndian architectures. */
+#undef NO_DUMP_SHARE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+ your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* metafont: Define to include Regis window support */
#undef REGISWIN
-#undef SUNWIN
-#undef TEKTRONIXWIN
-#undef UNITERMWIN
-#undef X11WIN
-/* The number of bytes in a long. */
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
-/* Define if you have the ftime function. */
-#undef HAVE_FTIME
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
-/* Define if you have the gettimeofday function. */
-#undef HAVE_GETTIMEOFDAY
+/* metafont: Define to include old Suntools window support (this is not X) */
+#undef SUNWIN
-/* Define if you have the mkstemp function. */
-#undef HAVE_MKSTEMP
+/* metafont: Define to include Tektronix window support */
+#undef TEKTRONIXWIN
-/* Define if you have the mktemp function. */
-#undef HAVE_MKTEMP
+/* metafont: Define to include Uniterm window support */
+#undef UNITERMWIN
-/* Define if you have the strerror function. */
-#undef HAVE_STRERROR
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
-/* Define if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
+/* Define to include X11 window in Metafont. */
+#undef X11WIN
-/* Define if you have the <sys/timeb.h> header file. */
-#undef HAVE_SYS_TIMEB_H
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
-/* Define if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+ `char[]'. */
+#undef YYTEXT_POINTER
-/* Define if you have the m library (-lm). */
-#undef HAVE_LIBM
+/* Define to 1 if type `char' is unsigned and you are not using gcc. */
+#ifndef __CHAR_UNSIGNED__
+# undef __CHAR_UNSIGNED__
+#endif
-/* Define if you have the posix library (-lposix). */
-#undef HAVE_LIBPOSIX
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+#undef inline
+#endif
-/* Define if you have the z library (-lz). */
-#undef HAVE_LIBZ
#endif /* !WEB2C_C_AUTO_H */
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index fffcc82771d..08a90a15f7a 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -5255,19 +5255,23 @@ fi
# Check whether --with-editor was given.
if test "${with_editor+set}" = set; then
- withval=$with_editor; cat >>confdefs.h <<_ACEOF
-#define EDITOR "$with_editor"
-_ACEOF
+ withval=$with_editor;
+else
+ with_editor="vi +%d %s"
+fi
-fi
+cat >>confdefs.h <<_ACEOF
+#define EDITOR "$with_editor"
+_ACEOF
# Check whether --enable-ipc was given.
if test "${enable_ipc+set}" = set; then
enableval=$enable_ipc; if test "x$enableval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define IPC 1
+
+cat >>confdefs.h <<\_ACEOF
+#define IPC
_ACEOF
# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too?
@@ -5429,18 +5433,21 @@ fi
# Check whether --enable-auto-core was given.
if test "${enable_auto_core+set}" = set; then
- enableval=$enable_auto_core; cat >>confdefs.h <<\_ACEOF
-#define FUNNY_CORE_DUMP 1
+ enableval=$enable_auto_core;
+cat >>confdefs.h <<\_ACEOF
+#define FUNNY_CORE_DUMP
_ACEOF
+
fi
# Check whether --enable-dump-share was given.
if test "${enable_dump_share+set}" = set; then
enableval=$enable_dump_share; if test "x$enableval" = xno; then
- cat >>confdefs.h <<\_ACEOF
-#define NO_DUMP_SHARE 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_DUMP_SHARE
_ACEOF
fi
@@ -5466,8 +5473,9 @@ fi
# Check whether --with-epsfwin was given.
if test "${with_epsfwin+set}" = set; then
withval=$with_epsfwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define EPSFWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define EPSFWIN
_ACEOF
fi
@@ -5478,8 +5486,9 @@ fi
# Check whether --with-hp2627win was given.
if test "${with_hp2627win+set}" = set; then
withval=$with_hp2627win; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define HP2627WIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define HP2627WIN
_ACEOF
fi
@@ -5490,8 +5499,9 @@ fi
# Check whether --with-mftalkwin was given.
if test "${with_mftalkwin+set}" = set; then
withval=$with_mftalkwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define MFTALKWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define MFTALKWIN
_ACEOF
fi
@@ -5502,8 +5512,9 @@ fi
# Check whether --with-nextwin was given.
if test "${with_nextwin+set}" = set; then
withval=$with_nextwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define NEXTWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NEXTWIN
_ACEOF
fi
@@ -5514,8 +5525,9 @@ fi
# Check whether --with-regiswin was given.
if test "${with_regiswin+set}" = set; then
withval=$with_regiswin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define REGISWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define REGISWIN
_ACEOF
fi
@@ -5527,8 +5539,9 @@ fi
if test "${with_suntoolswin+set}" = set; then
withval=$with_suntoolswin; if test "x$withval" = xyes; then
wlibs="-lsuntool -lsunwindow -lpixrect $wlibs"
- cat >>confdefs.h <<\_ACEOF
-#define SUNWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define SUNWIN
_ACEOF
fi
@@ -5539,8 +5552,9 @@ fi
# Check whether --with-tektronixwin was given.
if test "${with_tektronixwin+set}" = set; then
withval=$with_tektronixwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define TEKTRONIXWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define TEKTRONIXWIN
_ACEOF
fi
@@ -5551,8 +5565,9 @@ fi
# Check whether --with-unitermwin was given.
if test "${with_unitermwin+set}" = set; then
withval=$with_unitermwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define UNITERMWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define UNITERMWIN
_ACEOF
fi
@@ -10112,7 +10127,8 @@ fi
*) wfile=../$srcdir/window/$wfile;;
esac
(cd window && (rm -f x11.c; $LN_S $wfile x11.c))
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define X11WIN 1
_ACEOF
@@ -10598,6 +10614,11 @@ else
fi
fi
+
+
+
+
+
ac_config_files="$ac_config_files Makefile.aux:Makefile.in"
ac_config_files="$ac_config_files Makefile:Makefile.aux"
ac_config_files="$ac_config_files doc/Makefile.aux:doc/Makefile.in"
@@ -11840,7 +11861,8 @@ echo "$as_me: $ac_file is unchanged" >&6;}
case $ac_file$ac_mode in
- "c-auto.h":H) date >stamp-auto ;;
+ "c-auto.h":H) sed 's/^#define PACKAGE_/#define WEB2C_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
+ date >stamp-auto ;;
"omegafonts/Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
kpse_input=`case omegafonts/Makefile.in in
[\\/$]*) # Absolute
diff --git a/Build/source/texk/web2c/configure.in b/Build/source/texk/web2c/configure.in
index 9671603b042..d91600af948 100644
--- a/Build/source/texk/web2c/configure.in
+++ b/Build/source/texk/web2c/configure.in
@@ -21,7 +21,9 @@ AC_SUBST(WEB2CVERSION)
AC_DEFINE_UNQUOTED(WEB2CVERSION," (Web2C $WEB2CVERSION)")
dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
+ [sed 's/^#define PACKAGE_/#define WEB2C_PACKAGE_/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h
+ date >stamp-auto])
AC_PROG_CC
AC_PROG_INSTALL
@@ -378,7 +380,7 @@ if test "x$with_x" = xyes; then
*) wfile=../$srcdir/window/$wfile;;
esac
(cd window && (rm -f x11.c; $LN_S $wfile x11.c))
- AC_DEFINE(X11WIN)
+ AC_DEFINE([X11WIN], 1, [Define to include X11 window in Metafont.])
fi
AC_SUBST(x_ext_lib)
AC_SUBST(x_tool_libs)
@@ -426,6 +428,32 @@ if test "x$with_omega" = xyes || test "x$with_aleph" = xyes || test "x$with_xete
KPSE_CROSS_PATH_PROG(OTANGLE, otangle, ./otangle)
fi
+AH_TOP([/* c-auto.h: defines for web2c, as determined by configure.
+
+ Copyright 1994-97, 2008 Karl Berry.
+ Copyright 1997-99, 2002, 2005 Olaf Weber.
+
+ 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 of the License, 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/>. */
+
+/* Guard against double inclusion. */
+#ifndef WEB2C_C_AUTO_H
+#define WEB2C_C_AUTO_H
+
+/* web2c: the version string. */
+#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"])
+AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */])
+
dnl Generate `Makefile's, `config.status', and our header file.
KPSE_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile
mpdir/Makefile web2c/Makefile window/Makefile])
diff --git a/Build/source/texk/web2c/mpware/ChangeLog b/Build/source/texk/web2c/mpware/ChangeLog
index 09912135bfe..cc5eeb2ccaf 100644
--- a/Build/source/texk/web2c/mpware/ChangeLog
+++ b/Build/source/texk/web2c/mpware/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * newer.c, makempx.c: replace `#if HAVE_ST_MTIM' by
+ `#ifdef HAVE_STRUCT_STAT_ST_MTIM' (from AC_CHECK_MEMBERS).
+
2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.in: Add @configure_input@ line.
diff --git a/Build/source/texk/web2c/mpware/makempx.c b/Build/source/texk/web2c/mpware/makempx.c
index a04aaacc405..51350126f9b 100644
--- a/Build/source/texk/web2c/mpware/makempx.c
+++ b/Build/source/texk/web2c/mpware/makempx.c
@@ -71,7 +71,7 @@
#define INLINE_NEWER 1
/* We may have high-res timers in struct stat. If we do, use them. */
-#if HAVE_ST_MTIM
+#ifdef HAVE_STRUCT_STAT_ST_MTIM
#define ISNEWER(S,T) (S.st_mtim.tv_sec > T.st_mtim.tv_sec || \
(S.st_mtim.tv_sec == T.st_mtim.tv_sec && \
S.st_mtim.tv_nsec >= T.st_mtim.tv_nsec))
diff --git a/Build/source/texk/web2c/mpware/newer.c b/Build/source/texk/web2c/mpware/newer.c
index 951575cfb75..749c091a7c7 100644
--- a/Build/source/texk/web2c/mpware/newer.c
+++ b/Build/source/texk/web2c/mpware/newer.c
@@ -24,7 +24,7 @@
#define exit_true 0
/* We may have high-res timers in struct stat. If we do, use them. */
-#if HAVE_ST_MTIM
+#ifdef HAVE_STRUCT_STAT_ST_MTIM
#define NEWER(S,T) (S.st_mtim.tv_sec > T.st_mtim.tv_sec || \
(S.st_mtim.tv_sec == T.st_mtim.tv_sec && \
S.st_mtim.tv_nsec >= T.st_mtim.tv_nsec))
diff --git a/Build/source/texk/web2c/stamp-aclocal b/Build/source/texk/web2c/stamp-aclocal
new file mode 100644
index 00000000000..7aecc65552b
--- /dev/null
+++ b/Build/source/texk/web2c/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:36 CET 2008
diff --git a/Build/source/texk/web2c/stamp-auto.in b/Build/source/texk/web2c/stamp-auto.in
index ffe8a99f2a5..f020904ad46 100644
--- a/Build/source/texk/web2c/stamp-auto.in
+++ b/Build/source/texk/web2c/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:26:24 CEST 2005
+Fri Feb 29 13:37:38 CET 2008
diff --git a/Build/source/texk/web2c/window/ChangeLog b/Build/source/texk/web2c/window/ChangeLog
index 37b7f73099d..f4cbc778bfc 100644
--- a/Build/source/texk/web2c/window/ChangeLog
+++ b/Build/source/texk/web2c/window/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * x11-Xt.c: remove unused preprocessor stuff (FOIL...).
+
2008-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.in: Add @configure_input@ line.
diff --git a/Build/source/texk/web2c/window/x11-Xt.c b/Build/source/texk/web2c/window/x11-Xt.c
index c22a586fb92..00f9f0924c4 100644
--- a/Build/source/texk/web2c/window/x11-Xt.c
+++ b/Build/source/texk/web2c/window/x11-Xt.c
@@ -9,11 +9,6 @@
/* For wchar_t et al., that the X files might want. */
#include <kpathsea/systypes.h>
-/* See xdvik/xdvi.h for the purpose of the FOIL... */
-#ifdef FOIL_X_WCHAR_T
-#define wchar_t foil_x_defining_wchar_t
-#define X_WCHAR
-#endif
#undef input /* the XWMHints structure has a field named `input' */
#undef output
#include <X11/Xlib.h>
diff --git a/Build/source/texk/web2c/withenable.ac b/Build/source/texk/web2c/withenable.ac
index 17cc777f564..1a276873754 100644
--- a/Build/source/texk/web2c/withenable.ac
+++ b/Build/source/texk/web2c/withenable.ac
@@ -41,13 +41,14 @@ AC_ARG_WITH([cxx-runtime-hack],
AC_ARG_WITH([editor],
[ --with-editor=CMD invoke CMD from the e option [vi +%d %s]],
- [AC_DEFINE_UNQUOTED(EDITOR, "$with_editor")
-])
+ [], [with_editor="vi +%d %s"])
+AC_DEFINE_UNQUOTED([EDITOR], ["$with_editor"],
+ [web2c: Default editor for interactive `e' option.])
AC_ARG_ENABLE([ipc],
[ --enable-ipc enable TeX's --ipc option, i.e., pipe to a program],
[if test "x$enableval" = xyes; then
- AC_DEFINE(IPC)
+ AC_DEFINE([IPC], , [tex: Define to enable --ipc.])
# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too?
# See ac_path_xtra.
AC_CHECK_FUNC(connect)
@@ -60,12 +61,16 @@ AC_SUBST(socketlibs)
AC_ARG_ENABLE([auto-core],
[ --enable-auto-core cause TeX&MF to dump core given a certain filename],
- [AC_DEFINE(FUNNY_CORE_DUMP)])
+ [AC_DEFINE([FUNNY_CORE_DUMP], ,
+ [web2c: Define to enable HackyInputFileNameForCoreDump.tex.])
+])
AC_ARG_ENABLE([dump-share],
[ --disable-dump-share make fmt/base/mem files architecture-dependent],
[if test "x$enableval" = xno; then
- AC_DEFINE(NO_DUMP_SHARE)
+ AC_DEFINE([NO_DUMP_SHARE], ,
+ [web2c: Define to disable architecture-independent dump files.
+ Faster on LittleEndian architectures.])
fi
])
@@ -82,50 +87,58 @@ AC_ARG_WITH([mf-nowin],
AC_ARG_WITH([epsfwin],
[ --with-epsfwin include EPSF pseudo-window support],
[if test "x$withval" = xyes; then
- AC_DEFINE(EPSFWIN)
+ AC_DEFINE([EPSFWIN], ,
+ [metafont: Define to include EPSF pseudo-window support])
fi
])
AC_ARG_WITH([hp2627win],
[ --with-hp2627win include HP 2627 window support in Metafont],
[if test "x$withval" = xyes; then
- AC_DEFINE(HP2627WIN)
+ AC_DEFINE([HP2627WIN], ,
+ [metafont: Define to include HP 2627 window support])
fi
])
AC_ARG_WITH([mftalkwin],
[ --with-mftalkwin include mftalk (generic server) window support],
[if test "x$withval" = xyes; then
- AC_DEFINE(MFTALKWIN)
+ AC_DEFINE([MFTALKWIN], ,
+ [metafont: Define to include mftalk (generic server) window support])
fi
])
AC_ARG_WITH([nextwin],
[ --with-nextwin include NeXT window support],
[if test "x$withval" = xyes; then
- AC_DEFINE(NEXTWIN)
+ AC_DEFINE([NEXTWIN], ,
+ [metafont: Define to include NeXT window support])
fi
])
AC_ARG_WITH([regiswin],
[ --with-regiswin include Regis window support],
[if test "x$withval" = xyes; then
- AC_DEFINE(REGISWIN)
+ AC_DEFINE([REGISWIN], ,
+ [metafont: Define to include Regis window support])
fi
])
AC_ARG_WITH([suntoolswin],
[ --with-suntoolswin include old Suntools window support (this is not X)],
[if test "x$withval" = xyes; then
wlibs="-lsuntool -lsunwindow -lpixrect $wlibs"
- AC_DEFINE(SUNWIN)
+ AC_DEFINE([SUNWIN], ,
+ [metafont: Define to include old Suntools window support (this is not X)])
fi
])
AC_ARG_WITH([tektronixwin],
[ --with-tektronixwin include Tektronix window support],
[if test "x$withval" = xyes; then
- AC_DEFINE(TEKTRONIXWIN)
+ AC_DEFINE([TEKTRONIXWIN], ,
+ [metafont: Define to include Tektronix window support])
fi
])
AC_ARG_WITH([unitermwin],
[ --with-unitermwin include Uniterm window support],
[if test "x$withval" = xyes; then
- AC_DEFINE(UNITERMWIN)
+ AC_DEFINE([UNITERMWIN], ,
+ [metafont: Define to include Uniterm window support])
fi
])
diff --git a/Build/source/texk/xdv2pdf/ChangeLog b/Build/source/texk/xdv2pdf/ChangeLog
index 70bdc630687..e5f4d01c1a0 100644
--- a/Build/source/texk/xdv2pdf/ChangeLog
+++ b/Build/source/texk/xdv2pdf/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ The Makefile.in uses `kpse_include ../make/config.mk'; thus
+ autoheader most generate c-auto.in.
+ * config.h (new): includes the autogenerated c-auto.h.
+ * configure.in: removed `--enable-maint', added AC_DEFINES's
+ third arg to provide autoheader templates ...
+ * acconfig.h (removed): ... renamed ...
+ * acconfig.h.dist (new): ... into this.
+
2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
Convert from autoconf-2.13 to autoconf-2.59+:
diff --git a/Build/source/texk/xdv2pdf/acconfig.h b/Build/source/texk/xdv2pdf/acconfig.h.dist
index ee49123b348..ee49123b348 100644
--- a/Build/source/texk/xdv2pdf/acconfig.h
+++ b/Build/source/texk/xdv2pdf/acconfig.h.dist
diff --git a/Build/source/texk/xdv2pdf/c-auto.in b/Build/source/texk/xdv2pdf/c-auto.in
index 9c30520187e..8a639db0d1b 100644
--- a/Build/source/texk/xdv2pdf/c-auto.in
+++ b/Build/source/texk/xdv2pdf/c-auto.in
@@ -1,4 +1,89 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* The number of bytes in a int. */
-#undef SIZEOF_INT
+/* Define if you have Carbon */
+#undef HAVE_CARBON
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* define if you have kpathsea */
+#undef HAVE_KPATHSEA
+
+/* define if kpathsea supports type1 and vf formats */
+#undef HAVE_KPSE_FORMATS
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have QuickTime */
+#undef HAVE_QUICKTIME
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strspn' function. */
+#undef HAVE_STRSPN
+
+/* Define to 1 if you have the `system' function. */
+#undef HAVE_SYSTEM
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* define if you have kpathsea */
+#undef KPATHSEA
+
+/* package name */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* package version */
+#undef VERSION
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/Build/source/texk/xdv2pdf/config.h b/Build/source/texk/xdv2pdf/config.h
new file mode 100644
index 00000000000..fa9f370a239
--- /dev/null
+++ b/Build/source/texk/xdv2pdf/config.h
@@ -0,0 +1,11 @@
+/* config.h:
+ * In the original package this file is generated by autoheader.
+ * When part of the teTeX / TeX live tree, we simply include
+ * c-auto.h as generted by autoheader and configure. */
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+#include "c-auto.h"
+
+#endif /* _CONFIG_H */
diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure
index 4c1ac4654ca..88b6022e879 100755
--- a/Build/source/texk/xdv2pdf/configure
+++ b/Build/source/texk/xdv2pdf/configure
@@ -651,7 +651,6 @@ build_alias
host_alias
target_alias
VERSION
-MAINT
CC
CFLAGS
LDFLAGS
@@ -1251,11 +1250,6 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
-Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maint enable autoconf portions of Makefile
-
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
@@ -1695,25 +1689,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
VERSION="0.991"
+
cat >>confdefs.h <<\_ACEOF
#define VERSION "0.991"
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define PACKAGE "xdv2pdf"
_ACEOF
-ac_config_headers="$ac_config_headers config.h"
-
-
-# Check whether --enable-maint was given.
-if test "${enable_maint+set}" = set; then
- enableval=$enable_maint; MAINT=''
-else
- MAINT='#'
-fi
-
+ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
@@ -4211,14 +4198,17 @@ echo "${ECHO_T}no" >&6; }
fi
+
cat >>confdefs.h <<\_ACEOF
#define KPATHSEA 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPATHSEA 1
_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_KPSE_FORMATS 1
_ACEOF
@@ -6050,7 +6040,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
"Makefile.aux") CONFIG_FILES="$CONFIG_FILES Makefile.aux:Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.aux" ;;
@@ -6152,7 +6142,6 @@ build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
VERSION!$VERSION$ac_delim
-MAINT!$MAINT$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -6176,7 +6165,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -6577,6 +6566,7 @@ echo "$as_me: $ac_file is unchanged" >&6;}
case $ac_file$ac_mode in
+ "c-auto.h":H) date >stamp-auto ;;
"Makefile.aux":F) # Discard the file just generated and first resolve kpse_include's
kpse_input=`case Makefile.in in
[\\/$]*) # Absolute
diff --git a/Build/source/texk/xdv2pdf/configure.in b/Build/source/texk/xdv2pdf/configure.in
index 776a5b255a2..06c91f38f34 100644
--- a/Build/source/texk/xdv2pdf/configure.in
+++ b/Build/source/texk/xdv2pdf/configure.in
@@ -5,14 +5,10 @@ define([_version_],"0.991")
VERSION=_version_
AC_SUBST(VERSION)
-AC_DEFINE(VERSION,_version_)
-AC_DEFINE(PACKAGE,"xdv2pdf")
+AC_DEFINE(VERSION, _version_, [package version])
+AC_DEFINE(PACKAGE, "xdv2pdf", [package name])
-AC_CONFIG_HEADERS([config.h])
-
-AC_ARG_ENABLE(maint, [ --enable-maint enable autoconf portions of Makefile],
- [MAINT=''], [MAINT='#'])
-AC_SUBST(MAINT)
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto])
dnl First, check if we're configuring on Mac OS X -- can't build elsewhere
@@ -38,9 +34,9 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_DEFINE(KPATHSEA)
-AC_DEFINE(HAVE_KPATHSEA)
-AC_DEFINE(HAVE_KPSE_FORMATS)
+AC_DEFINE([KPATHSEA], 1, [define if you have kpathsea])
+AC_DEFINE([HAVE_KPATHSEA], 1, [define if you have kpathsea])
+AC_DEFINE([HAVE_KPSE_FORMATS], 1, [define if kpathsea supports type1 and vf formats])
TTF_OPT=''
AC_SUBST(TTF_OPT)
diff --git a/Build/source/texk/xdv2pdf/stamp-aclocal b/Build/source/texk/xdv2pdf/stamp-aclocal
new file mode 100644
index 00000000000..ad1b31d0cc3
--- /dev/null
+++ b/Build/source/texk/xdv2pdf/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:39 CET 2008
diff --git a/Build/source/texk/xdv2pdf/stamp-auto.in b/Build/source/texk/xdv2pdf/stamp-auto.in
new file mode 100644
index 00000000000..477f7088184
--- /dev/null
+++ b/Build/source/texk/xdv2pdf/stamp-auto.in
@@ -0,0 +1 @@
+Fri Feb 29 13:37:40 CET 2008
diff --git a/Build/source/texk/xdvik/CHANGES b/Build/source/texk/xdvik/CHANGES
index f2339651005..44c3a01bbdd 100644
--- a/Build/source/texk/xdvik/CHANGES
+++ b/Build/source/texk/xdvik/CHANGES
@@ -9,6 +9,13 @@ Versions containing major changes are marked as `beta'; these
may contain undetected bugs. Such versions shouldn't be used
by distributors.
+ * 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
+ autoheader templates ...
+ * 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.
diff --git a/Build/source/texk/xdvik/acconfig.h b/Build/source/texk/xdvik/acconfig.h
deleted file mode 100644
index 5f4f8c98b93..00000000000
--- a/Build/source/texk/xdvik/acconfig.h
+++ /dev/null
@@ -1,386 +0,0 @@
-/* regenerate c-auto.in from acconfig.h with:
- /usr/bin/autoheader -m ../etc/autoconf
- then run:
- /usr/bin/autoconf -m ../etc/autoconf
-*/
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
-
-/* Define if using alloca.c. */
-#undef C_ALLOCA
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-#undef HAVE_ALLOCA_H
-
-/* Define if you don't have vprintf but do have _doprnt. */
-#undef HAVE_DOPRNT
-
-/* Define if you have the ANSI # stringizing operator in cpp. */
-#undef HAVE_STRINGIZE
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
-
-/* Define if you have the vprintf function. */
-#undef HAVE_VPRINTF
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
-
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
-
-/* 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 run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
-
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
-/* Define if using alloca.c. */
-#undef C_ALLOCA
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-#undef HAVE_ALLOCA_H
-
-/* Define if you don't have vprintf but do have _doprnt. */
-#undef HAVE_DOPRNT
-
-/* Define if you have the ANSI # stringizing operator in cpp. */
-#undef HAVE_STRINGIZE
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
-
-/* Define if you have the vprintf function. */
-#undef HAVE_VPRINTF
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
-
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
-
-/* 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 run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
-
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
-/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define to determine the integer type to be used in bitmaps. The type used
- will be "unsigned BMTYPE". */
-#define BMTYPE int
-
-/* Define to the length (in bytes) of the above type. */
-#define BMBYTES 4
-
-/* Define if your system has STREAMS (and if X uses it). */
-#undef HAVE_STREAMS
-
-/* Define if you are using SunOS 4.x. */
-#undef SUNOS4
-
-/* Define if you are using Linux 2.1.xxx -- 2.2.8,
- or if you find it necessary. */
-#undef FLAKY_SIGPOLL
-
-/* Define if your system has <poll.h> and poll(). */
-#undef HAVE_POLL
-
-/* Define to use the Xaw toolkit. */
-#undef XAW
-
-/* Define to use the Motif toolkit. */
-#undef MOTIF
-
-/* Define to enable greyscale anti-aliasing for shrunken bitmaps. */
-#undef GREY
-
-/* Define to enable support for color specials. */
-#undef COLOR
-
-/* Define to enable gf format files (in addition to pk format). */
-#undef USE_GF
-
-/* Define to use A4 as the default paper size. */
-#undef A4
-
-/* Define to use hypertex */
-#undef HTEX
-
-/* Define to use ImageMagick */
-#undef MAGICK
-
-/* ??? */
-#undef LDT1LIB
-
-/* Define to compile in t1lib */
-#undef T1LIB
-
-/* Define to compile in t1lib */
-#undef T1LIB
-
-/* Define if your C compiler can do string concatenation */
-#undef HAVE_CC_CONCAT
-
-/* Define if the memicmp() function is in <string.h> */
-#undef HAVE_MEMICMP
-
-/* Define to point to the default command to use for printing (optional). */
-#undef DEFAULT_DVIPS_PATH
-
-/* Define to point to the default command to use for printing (optional). */
-#undef DEFAULT_PS2PDF_PATH
-
-/* Define if you have an old version of the Xaw library */
-#undef HAVE_OLD_XAW
-
-/* Define if you want to use the Xpm library */
-#undef USE_XPM
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* Define to 1 if cpp supports the ANSI # stringizing operator. */
-#undef HAVE_STRINGIZE
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <vfork.h> header file. */
-#undef HAVE_VFORK_H
-
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* 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 run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-#undef uint32_t
-
-/* Define if you have the fchdir function. */
-#undef HAVE_FCHDIR
-
-/* Define if you have the ftruncate function. */
-#undef HAVE_FTRUNCATE
-
-/* Define if you have the getcwd function. */
-#undef HAVE_GETCWD
-
-/* Define if you have the getpwnam function. */
-#undef HAVE_GETPWNAM
-
-/* Define if you have the getpwuid function. */
-#undef HAVE_GETPWUID
-
-/* Define if you have the getuid function. */
-#undef HAVE_GETUID
-
-/* Define if you have the isinf function. */
-#undef HAVE_ISINF
-
-/* Define if you have the lstat function. */
-#undef HAVE_LSTAT
-
-/* Define if you have the memcpy function. */
-#undef HAVE_MEMCPY
-
-/* Define if you have the mkstemp function. */
-#undef HAVE_MKSTEMP
-
-/* Define if you have the realpath function. */
-#undef HAVE_REALPATH
-
-/* Define if you have the setenv function. */
-#undef HAVE_SETENV
-
-/* Define if you have the sigaction function. */
-#undef HAVE_SIGACTION
-
-/* Define if you have the snprintf function. */
-#undef HAVE_SNPRINTF
-
-/* Define if you have the strchr function. */
-#undef HAVE_STRCHR
-
-/* Define if you have the strerror function. */
-#undef HAVE_STRERROR
-
-/* Define if you have the ulltostr function. */
-#undef HAVE_ULLTOSTR
-
-/* Define if you have the vsnprintf function. */
-#undef HAVE_VSNPRINTF
-
-/* Define if the vsnprintf function works. */
-#undef HAVE_GOOD_VSNPRINTF
-
-/* Define if your system allows setsid() within vfork(). */
-#undef HAVE_GOOD_SETSID_VFORK
-
-/* Define if your system allows multiple definitions of functions. */
-#undef LD_ALLOWS_MULTIPLE_DEFINITIONS
-
-/* Define if you have the waitpid function. */
-#undef HAVE_WAITPID
-
-/* Define if you have the <X11/Xmu/Editres.h> header file. */
-#undef HAVE_X11_XMU_EDITRES_H
-
-/* Define if you have the <X11/Xosdefs.h> header file. */
-#undef HAVE_X11_XOSDEFS_H
-
-/* Define if you have the <X11/xpm.h> header file. */
-#undef HAVE_X11_XPM_H
-
-/* Define if you have the <Xm/XpmP.h> header file. */
-#undef HAVE_XM_XPMP_H
-
-/* Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8). */
-#undef HAVE_XPM_H
-
-/* Define if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
-
-/* Define if you have the iconv function. */
-#undef HAVE_ICONV
-
-/* Define the type of the iconv input string (char ** or const char **) */
-#undef ICONV_CHAR_PPTR_TYPE
-
-/* Define if you have the <ieeefp.h> header file. */
-#undef HAVE_IEEEFP_H
-
-/* Define if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
-
-/* Define if you have the <regex.h> header file. */
-#undef HAVE_REGEX_H
-
-/* Define if you have the <select.h> header file. */
-#undef HAVE_SELECT_H
-
-/* Define if you have the <sys/bsdtypes.h> header file. */
-#undef HAVE_SYS_BSDTYPES_H
-
-/* Define if you have the <sys/fcntl.h> header file. */
-#undef HAVE_SYS_FCNTL_H
-
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if the CODESET argument to nl_langinfo works. */
-#undef HAVE_WORKING_NL_LANGINFO_CODESET
-
-/* Define to use Xaw panner. */
-#undef USE_XAW_PANNER
-
-/* Define to use libXp. */
-#undef HAVE_LIB_XP
-
diff --git a/Build/source/texk/xdvik/acinclude.m4 b/Build/source/texk/xdvik/acinclude.m4
index 023354bc00e..be8459aa1fd 100644
--- a/Build/source/texk/xdvik/acinclude.m4
+++ b/Build/source/texk/xdvik/acinclude.m4
@@ -86,10 +86,11 @@ CXXFLAGS="$xdvi_iconv_save_cxxflags"
LDFLAGS="$xdvi_iconv_save_ldflags"
#
if test $xdvi_iconv_char_pptr_type = "const_char_pptr"; then
- AC_DEFINE(ICONV_CHAR_PPTR_TYPE, const char **)
+ 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_DEFINE([ICONV_CHAR_PPTR_TYPE], [char **])
AC_MSG_RESULT([char **])
fi
AC_LANG_RESTORE]
@@ -145,7 +146,8 @@ xdvi_cv_setsid_in_vfork=no,
# safe value for cross-compiling
xdvi_cv_setsid_in_vfork=no)])
if test $xdvi_cv_setsid_in_vfork = yes; then
- AC_DEFINE(HAVE_GOOD_SETSID_VFORK)
+ AC_DEFINE([HAVE_GOOD_SETSID_VFORK], 1,
+ [Define if your system allows setsid() within vfork().])
fi]
fi)
@@ -171,7 +173,8 @@ x_linker_options=""
if test $xdvi_linker_multiple_defns = yes; then
x_linker_options="-Xlinker --allow-multiple-definition"
LDFLAGS="$xdvi_save_LDFLAGS"
- AC_DEFINE(LD_ALLOWS_MULTIPLE_DEFINITIONS)
+ AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS], 1,
+ [Define if your system allows multiple definitions of functions.])
else
LDFLAGS="$xdvi_save_LDFLAGS"
@@ -207,7 +210,7 @@ else
if test $xdvi_linker_multiple_defns = yes; then
AC_MSG_RESULT(yes)
- AC_DEFINE(LD_ALLOWS_MULTIPLE_DEFINITIONS)
+ AC_DEFINE([LD_ALLOWS_MULTIPLE_DEFINITIONS])
else
AC_MSG_RESULT(no)
AC_MSG_WARN([Linker does not allow multiple definitions.
@@ -251,8 +254,10 @@ main()
xdvi_cv_bitmap_type="`cat conftestval`",
AC_MSG_ERROR(could not determine integer type for bitmap))])
eval "$xdvi_cv_bitmap_type"
-AC_DEFINE_UNQUOTED(BMTYPE, $BMTYPE)
-AC_DEFINE_UNQUOTED(BMBYTES, $BMBYTES)
+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])])
@@ -265,7 +270,7 @@ AC_DEFUN([XDVI_CC_CONCAT],
], [puts("Testing" " string" " concatenation");
], xdvi_cc_concat=yes, xdvi_cc_concat=no)])
if test $xdvi_cc_concat = yes; then
- AC_DEFINE(HAVE_CC_CONCAT)
+ AC_DEFINE([HAVE_CC_CONCAT], 1, [Define if your C compiler can do string concatenation])
fi])
@@ -281,7 +286,7 @@ choke me
isastream(0);
#endif], xdvi_cv_sys_streams=yes, xdvi_cv_sys_streams=no)])
if test $xdvi_cv_sys_streams = yes; then
- AC_DEFINE(HAVE_STREAMS)
+ AC_DEFINE([HAVE_STREAMS], 1, [Define if your system has STREAMS (and if X uses it).])
fi])
@@ -294,7 +299,7 @@ AC_DEFUN([XDVI_FUNC_POLL],
], [poll((struct pollfd *) 0, 0, 0);],
xdvi_cv_func_poll=yes, xdvi_cv_func_poll=no)])
if test $xdvi_cv_func_poll = yes; then
- AC_DEFINE(HAVE_POLL)
+ AC_DEFINE([HAVE_POLL], 1, [Define if your system has <poll.h> and poll().])
else
AC_CHECK_HEADERS(sys/select.h select.h)
fi])
@@ -310,7 +315,7 @@ AC_DEFUN([XDVI_SYS_SUNOS_4],
*) xdvi_cv_sys_sunos_4=no ;;
esac])
if test $xdvi_cv_sys_sunos_4 = yes; then
- AC_DEFINE(SUNOS4)
+ AC_DEFINE([SUNOS4], 1, [Define if you are using SunOS 4.x.])
fi])
dnl ### Check for certain broken versions of Linux
@@ -323,15 +328,16 @@ AC_DEFUN([XDVI_SYS_OLD_LINUX],
*) xdvi_cv_sys_old_linux=no ;;
esac])
if test $xdvi_cv_sys_old_linux = yes; then
- AC_DEFINE(FLAKY_SIGPOLL)
+ AC_DEFINE([FLAKY_SIGPOLL], 1,
+ [Define if you are using Linux 2.1.xxx -- 2.2.8, or if you find it necessary.])
fi])
dnl ### Process a string argument
-dnl XDVI_ARG_STRING(PACKAGE, HELP-STRING, VARIABLE, DEFAULT_VALUE)
+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")
-], [AC_DEFINE($3, [$4])
+[AC_ARG_WITH([$1], [$2], [AC_DEFINE_UNQUOTED($3, ["$withval"], [$5])
+], [AC_DEFINE([$3], [$4])
])])
@@ -371,7 +377,7 @@ xdvi_cv_func_good_vsnprintf=no,
# safe value for cross-compiling
xdvi_cv_func_good_vsnprintf=no)])
if test $xdvi_cv_func_good_vsnprintf = yes; then
- AC_DEFINE(HAVE_GOOD_VSNPRINTF)
+ AC_DEFINE([HAVE_GOOD_VSNPRINTF], 1, [Define if the vsnprintf function works.])
fi])
dnl ### Check for memicmp(), which some installations have in string.h
@@ -382,7 +388,7 @@ AC_DEFUN([AC_FUNC_MEMICMP],
], [(void)memicmp((char *)NULL, (char *)NULL, 0);],
xdvi_cv_memicmp=yes, xdvi_cv_memicmp=no)])
if test $xdvi_cv_memicmp = yes; then
- AC_DEFINE(HAVE_MEMICMP)
+ AC_DEFINE([HAVE_MEMICMP], 1, [Define if the memicmp() function is in <string.h>])
fi])
dnl dnl ### Check for realpath() added by SU 2002/04/10
@@ -492,11 +498,12 @@ dnl moved them out. Peter Breitenlohner <peb@mppmu.mpg.de>
dnl
if test "x$xpm_includes" != x; then
if test "x$xpm_includes" = xdefault; then
- AC_DEFINE(HAVE_X11_XPM_H, 1)
+ AC_DEFINE([HAVE_X11_XPM_H], 1, [Define if you have the <X11/xpm.h> header file.])
elif test -f "$xpm_includes/X11/xpm.h"; then
- AC_DEFINE(HAVE_X11_XPM_H, 1)
+ AC_DEFINE([HAVE_X11_XPM_H], 1)
elif test -f "$xpm_includes/xpm.h"; then
- AC_DEFINE(HAVE_XPM_H, 1)
+ AC_DEFINE([HAVE_XPM_H], 1,
+ [Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).])
fi
fi
@@ -588,7 +595,7 @@ x_xpm_libs="-lXpm"
# Now check the results of headers and libraries and set USE_XPM to 0
# if one of them hadn't been found.
#
-AC_DEFINE(USE_XPM, 1)
+AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library])
xpm_libraries_result="$xpm_libraries"
xpm_includes_result="$xpm_includes"
if test "x$xpm_libraries_result" = "xdefault" ; then
@@ -762,9 +769,9 @@ fi
motif_libdir_result="$motif_libdir"
motif_include_result="$motif_include"
test "$motif_libdir_result" = "" &&
- motif_libdir_result="in default path" && AC_DEFINE(MOTIF, 1)
+ motif_libdir_result="in default path" && AC_DEFINE([MOTIF], 1, [Define to use the Motif toolkit.])
test "$motif_include_result" = "" &&
- motif_include_result="in default path" && AC_DEFINE(MOTIF, 1)
+ motif_include_result="in default path" && AC_DEFINE([MOTIF], 1)
if test "$motif_libdir_result" = "no"; then
if test "$default_toolkit" = "none"; then
motif_libdir_result="(none)"
@@ -813,7 +820,7 @@ xdvi_use_xaw_panner=yes, xdvi_use_xaw_panner=no
CPPFLAGS=$save_CPPFLAGS
if test $xdvi_use_xaw_panner = yes; then
AC_MSG_RESULT(yes)
- AC_DEFINE(USE_XAW_PANNER)
+ AC_DEFINE([USE_XAW_PANNER], 1, [Define to use Xaw panner.])
else
AC_MSG_RESULT(no)
fi
@@ -1028,7 +1035,8 @@ if test "${with_xdvi_x_toolkit}" = xaw; then
CPPFLAGS=$save_CPPFLAGS
if test $xdvi_old_xaw = yes; then
AC_MSG_RESULT(old)
- AC_DEFINE(HAVE_OLD_XAW)
+ AC_DEFINE([HAVE_OLD_XAW], 1,
+ [Define if you have an old version of the Xaw library])
else
AC_MSG_RESULT(current)
fi
diff --git a/Build/source/texk/xdvik/c-auto.in b/Build/source/texk/xdvik/c-auto.in
index dc4e0669407..cf4595ea96a 100644
--- a/Build/source/texk/xdvik/c-auto.in
+++ b/Build/source/texk/xdvik/c-auto.in
@@ -1,460 +1,322 @@
-/* c-auto.in. Generated automatically from configure.in by autoheader. */
-
-/* Define if using alloca.c. */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work. */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-#undef HAVE_ALLOCA_H
-
-/* Define if you don't have vprintf but do have _doprnt. */
-#undef HAVE_DOPRNT
-
-/* Define if you have the ANSI # stringizing operator in cpp. */
-#undef HAVE_STRINGIZE
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
-
-/* Define if you have the vprintf function. */
-#undef HAVE_VPRINTF
+/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
+/* Define to use A4 as the default paper size. */
+#undef A4
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
+/* Define to the length (in bytes) of type BMTYPE. */
+#undef BMBYTES
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
+/* Define to determine the integer type to be used in bitmaps. The type used
+ will be "unsigned BMTYPE". */
+#undef BMTYPE
-/* 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 run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
+/* Define to enable support for color specials. */
+#undef COLOR
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+ systems. This function is required for `alloca.c' support on those systems.
+ */
+#undef CRAY_STACKSEG_END
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define to point to the default command to use for printing (optional). */
+#undef DEFAULT_DVIPS_PATH
-/* Define if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
+/* Define to point to the default command to use for printing (optional). */
+#undef DEFAULT_PS2PDF_PATH
-/* Define if using alloca.c. */
-#undef C_ALLOCA
+/* Define if you are using Linux 2.1.xxx -- 2.2.8, or if you find it
+ necessary. */
+#undef FLAKY_SIGPOLL
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-#undef CRAY_STACKSEG_END
+/* Define to enable greyscale anti-aliasing for shrunken bitmaps. */
+#undef GREY
-/* Define if you have alloca, as a function or macro. */
+/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+ */
#undef HAVE_ALLOCA_H
-/* Define if you don't have vprintf but do have _doprnt. */
-#undef HAVE_DOPRNT
-
-/* Define if you have the ANSI # stringizing operator in cpp. */
-#undef HAVE_STRINGIZE
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
-
-/* Define if you have the vprintf function. */
-#undef HAVE_VPRINTF
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
-
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
-
-/* 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 run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define if your C compiler can do string concatenation */
+#undef HAVE_CC_CONCAT
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define to 1 if you have the `fchdir' function. */
+#undef HAVE_FCHDIR
-/* Define if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
-/* Define if using alloca.c. */
-#undef C_ALLOCA
+/* Define to 1 if you have the `ftruncate' function. */
+#undef HAVE_FTRUNCATE
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-#undef CRAY_STACKSEG_END
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
-/* Define if you have alloca, as a function or macro. */
-#undef HAVE_ALLOCA
+/* Define to 1 if you have the `getpwnam' function. */
+#undef HAVE_GETPWNAM
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
-/* Define if you don't have vprintf but do have _doprnt. */
-#undef HAVE_DOPRNT
+/* Define to 1 if you have the `getuid' function. */
+#undef HAVE_GETUID
-/* Define if you have the ANSI # stringizing operator in cpp. */
-#undef HAVE_STRINGIZE
+/* Define if your system allows setsid() within vfork(). */
+#undef HAVE_GOOD_SETSID_VFORK
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
+/* Define if the vsnprintf function works. */
+#undef HAVE_GOOD_VSNPRINTF
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
+/* Define to 1 if you have the `iconv' function. */
+#undef HAVE_ICONV
-/* Define if you have the vprintf function. */
-#undef HAVE_VPRINTF
+/* Define to 1 if you have the <iconv.h> header file. */
+#undef HAVE_ICONV_H
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
+/* Define to 1 if you have the <ieeefp.h> header file. */
+#undef HAVE_IEEEFP_H
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
+/* Define to 1 if you have the `isinf' function. */
+#undef HAVE_ISINF
-/* 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 run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
+/* Define to 1 if you have the `lstat' function. */
+#undef HAVE_LSTAT
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
-/* Define if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
+/* Define if the memicmp() function is in <string.h> */
+#undef HAVE_MEMICMP
-/* c-auto.in. Generated from configure.in by autoheader. */
-/* Define to determine the integer type to be used in bitmaps. The type used
- will be "unsigned BMTYPE". */
-#define BMTYPE int
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define to the length (in bytes) of the above type. */
-#define BMBYTES 4
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
-/* Define if your system has STREAMS (and if X uses it). */
-#undef HAVE_STREAMS
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
-/* Define if you are using SunOS 4.x. */
-#undef SUNOS4
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
-/* Define if you are using Linux 2.1.xxx -- 2.2.8,
- or if you find it necessary. */
-#undef FLAKY_SIGPOLL
+/* Define if you have an old version of the Xaw library */
+#undef HAVE_OLD_XAW
-/* Define if your system has <poll.h> and poll(). */
+/* Define if your system has <poll.h> and poll(). */
#undef HAVE_POLL
-/* Define to use the Xaw toolkit. */
-#undef XAW
-
-/* Define to use the Motif toolkit. */
-#undef MOTIF
+/* Define to 1 if you have the `realpath' function. */
+#undef HAVE_REALPATH
-/* Define to enable greyscale anti-aliasing for shrunken bitmaps. */
-#undef GREY
+/* Define to 1 if you have the <regex.h> header file. */
+#undef HAVE_REGEX_H
-/* Define to enable support for color specials. */
-#undef COLOR
+/* Define to 1 if you have the <select.h> header file. */
+#undef HAVE_SELECT_H
-/* Define to enable gf format files (in addition to pk format). */
-#undef USE_GF
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
-/* Define to use A4 as the default paper size. */
-#undef A4
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
-/* Define to use ImageMagick */
-#undef MAGICK
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
-/* ??? */
-#undef LDT1LIB
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
-/* Define to compile in t1lib */
-#undef T1LIB
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-/* Define to compile in t1lib */
-#undef T1LIB
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
-/* Define if your C compiler can do string concatenation */
-#undef HAVE_CC_CONCAT
+/* Define if your system has STREAMS (and if X uses it). */
+#undef HAVE_STREAMS
-/* Define if the memicmp() function is in <string.h> */
-#undef HAVE_MEMICMP
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
-/* Define to point to the default command to use for printing (optional). */
-#undef DEFAULT_DVIPS_PATH
+/* Define to 1 if cpp supports the ANSI # stringizing operator. */
+#undef HAVE_STRINGIZE
-/* Define to point to the default command to use for printing (optional). */
-#undef DEFAULT_PS2PDF_PATH
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have an old version of the Xaw library */
-#undef HAVE_OLD_XAW
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-/* Define if you want to use the Xpm library */
-#undef USE_XPM
+/* Define to 1 if you have the <sys/bsdtypes.h> header file. */
+#undef HAVE_SYS_BSDTYPES_H
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
+/* Define to 1 if you have the <sys/fcntl.h> header file. */
+#undef HAVE_SYS_FCNTL_H
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* Define to 1 if cpp supports the ANSI # stringizing operator. */
-#undef HAVE_STRINGIZE
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
+/* Define to 1 if you have the `ulltostr' function. */
+#undef HAVE_ULLTOSTR
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
/* Define to 1 if you have the <vfork.h> header file. */
#undef HAVE_VFORK_H
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* 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 run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
+/* Define to 1 if you have the `waitpid' function. */
+#undef HAVE_WAITPID
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
+/* Define if the CODESET argument to nl_langinfo works. */
+#undef HAVE_WORKING_NL_LANGINFO_CODESET
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-#undef uint32_t
+/* Define to 1 if you have the <X11/Intrinsic.h> header file. */
+#undef HAVE_X11_INTRINSIC_H
-/* Define if the vsnprintf function works. */
-#undef HAVE_GOOD_VSNPRINTF
+/* Define to 1 if you have the <X11/Xmu/Editres.h> header file. */
+#undef HAVE_X11_XMU_EDITRES_H
-/* Define if your system allows setsid() within vfork(). */
-#undef HAVE_GOOD_SETSID_VFORK
+/* Define to 1 if you have the <X11/Xmu/Xmu.h> header file. */
+#undef HAVE_X11_XMU_XMU_H
-/* Define if your system allows multiple definitions of functions. */
-#undef LD_ALLOWS_MULTIPLE_DEFINITIONS
+/* Define to 1 if you have the <X11/Xosdefs.h> header file. */
+#undef HAVE_X11_XOSDEFS_H
-/* Define if you have the <X11/xpm.h> header file. */
+/* Define if you have the <X11/xpm.h> header file. */
#undef HAVE_X11_XPM_H
-/* Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8). */
-#undef HAVE_XPM_H
-
-/* Define if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* Define to 1 if you have the <Xm/XpmP.h> header file. */
+#undef HAVE_XM_XPMP_H
-/* Define if you have the iconv function. */
-#undef HAVE_ICONV
+/* Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).
+ */
+#undef HAVE_XPM_H
/* Define the type of the iconv input string (char ** or const char **) */
#undef ICONV_CHAR_PPTR_TYPE
-/* Define if the CODESET argument to nl_langinfo works. */
-#undef HAVE_WORKING_NL_LANGINFO_CODESET
-
-/* Define to use Xaw panner. */
-#undef USE_XAW_PANNER
-
-/* Define if you have the fchdir function. */
-#undef HAVE_FCHDIR
-
-/* Define if you have the ftruncate function. */
-#undef HAVE_FTRUNCATE
-
-/* Define if you have the getcwd function. */
-#undef HAVE_GETCWD
-
-/* Define if you have the getpwnam function. */
-#undef HAVE_GETPWNAM
-
-/* Define if you have the getpwuid function. */
-#undef HAVE_GETPWUID
-
-/* Define if you have the getuid function. */
-#undef HAVE_GETUID
-
-/* Define if you have the iconv function. */
-#undef HAVE_ICONV
-
-/* Define if you have the isinf function. */
-#undef HAVE_ISINF
-
-/* Define if you have the lstat function. */
-#undef HAVE_LSTAT
-
-/* Define if you have the memcpy function. */
-#undef HAVE_MEMCPY
-
-/* Define if you have the mkstemp function. */
-#undef HAVE_MKSTEMP
-
-/* Define if you have the nl_langinfo function. */
-#undef HAVE_NL_LANGINFO
-
-/* Define if you have the realpath function. */
-#undef HAVE_REALPATH
-
-/* Define if you have the setenv function. */
-#undef HAVE_SETENV
-
-/* Define if you have the sigaction function. */
-#undef HAVE_SIGACTION
+/* Define to compile in t1lib (libtool) */
+#undef LDT1LIB
-/* Define if you have the snprintf function. */
-#undef HAVE_SNPRINTF
+/* Define if your system allows multiple definitions of functions. */
+#undef LD_ALLOWS_MULTIPLE_DEFINITIONS
-/* Define if you have the strchr function. */
-#undef HAVE_STRCHR
+/* Define to use ImageMagick */
+#undef MAGICK
-/* Define if you have the strerror function. */
-#undef HAVE_STRERROR
+/* Define to use the Motif toolkit. */
+#undef MOTIF
-/* Define if you have the ulltostr function. */
-#undef HAVE_ULLTOSTR
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
-/* Define if you have the vsnprintf function. */
-#undef HAVE_VSNPRINTF
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
-/* Define if you have the waitpid function. */
-#undef HAVE_WAITPID
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
-/* Define if you have the <X11/Xmu/Editres.h> header file. */
-#undef HAVE_X11_XMU_EDITRES_H
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
-/* Define if you have the <X11/Xmu/Xmu.h> header file. */
-#undef HAVE_X11_XMU_XMU_H
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
-/* Define if you have the <X11/Xosdefs.h> header file. */
-#undef HAVE_X11_XOSDEFS_H
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
-/* Define if you have the <X11/xpm.h> header file. */
-#undef HAVE_X11_XPM_H
+/* 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.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
-/* Define if you have the <Xm/XpmP.h> header file. */
-#undef HAVE_XM_XPMP_H
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
-/* Define if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* Define if you are using SunOS 4.x. */
+#undef SUNOS4
-/* Define if you have the <ieeefp.h> header file. */
-#undef HAVE_IEEEFP_H
+/* Define to compile in t1lib */
+#undef T1LIB
-/* Define if you have the <langinfo.h> header file. */
-#undef HAVE_LANGINFO_H
+/* Define to enable gf format files (in addition to pk format). */
+#undef USE_GF
-/* Define if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
+/* Define to use Xaw panner. */
+#undef USE_XAW_PANNER
-/* Define if you have the <regex.h> header file. */
-#undef HAVE_REGEX_H
+/* Define if you want to use the Xpm library */
+#undef USE_XPM
-/* Define if you have the <select.h> header file. */
-#undef HAVE_SELECT_H
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
-/* Define if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+/* Define to use the Xaw toolkit. */
+#undef XAW
-/* Define if you have the <sys/bsdtypes.h> header file. */
-#undef HAVE_SYS_BSDTYPES_H
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
-/* Define if you have the <sys/fcntl.h> header file. */
-#undef HAVE_SYS_FCNTL_H
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
-/* Define if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/* Define to `unsigned long' if <sys/types.h> does not define. */
+#undef uint32_t
-/* Define if you have the m library (-lm). */
-#undef HAVE_LIBM
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 52c5231a09c..3e89b7f8cd1 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -4613,7 +4613,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cv_func_good_vsnprintf" >&5
echo "${ECHO_T}$xdvi_cv_func_good_vsnprintf" >&6; }
if test $xdvi_cv_func_good_vsnprintf = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_GOOD_VSNPRINTF 1
_ACEOF
@@ -4671,7 +4672,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cv_memicmp" >&5
echo "${ECHO_T}$xdvi_cv_memicmp" >&6; }
if test $xdvi_cv_memicmp = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_MEMICMP 1
_ACEOF
@@ -6987,7 +6989,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cv_setsid_in_vfork" >&5
echo "${ECHO_T}$xdvi_cv_setsid_in_vfork" >&6; }
if test $xdvi_cv_setsid_in_vfork = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_GOOD_SETSID_VFORK 1
_ACEOF
@@ -7045,7 +7048,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cc_concat" >&5
echo "${ECHO_T}$xdvi_cc_concat" >&6; }
if test $xdvi_cc_concat = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_CC_CONCAT 1
_ACEOF
@@ -7122,10 +7126,12 @@ fi
fi
eval "$xdvi_cv_bitmap_type"
+
cat >>confdefs.h <<_ACEOF
#define BMTYPE $BMTYPE
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define BMBYTES $BMBYTES
_ACEOF
@@ -7189,7 +7195,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cv_sys_streams" >&5
echo "${ECHO_T}$xdvi_cv_sys_streams" >&6; }
if test $xdvi_cv_sys_streams = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_STREAMS 1
_ACEOF
@@ -7208,7 +7215,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cv_sys_sunos_4" >&5
echo "${ECHO_T}$xdvi_cv_sys_sunos_4" >&6; }
if test $xdvi_cv_sys_sunos_4 = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define SUNOS4 1
_ACEOF
@@ -7227,7 +7235,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cv_sys_old_linux" >&5
echo "${ECHO_T}$xdvi_cv_sys_old_linux" >&6; }
if test $xdvi_cv_sys_old_linux = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define FLAKY_SIGPOLL 1
_ACEOF
@@ -7285,7 +7294,8 @@ fi
{ echo "$as_me:$LINENO: result: $xdvi_cv_func_poll" >&5
echo "${ECHO_T}$xdvi_cv_func_poll" >&6; }
if test $xdvi_cv_func_poll = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_POLL 1
_ACEOF
@@ -7541,7 +7551,8 @@ echo "${ECHO_T}$xdvi_linker_multiple_defns" >&6; }
if test $xdvi_linker_multiple_defns = yes; then
x_linker_options="-Xlinker --allow-multiple-definition"
LDFLAGS="$xdvi_save_LDFLAGS"
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define LD_ALLOWS_MULTIPLE_DEFINITIONS 1
_ACEOF
@@ -8515,7 +8526,8 @@ fi
# Check whether --enable-grey was given.
if test "${enable_grey+set}" = set; then
enableval=$enable_grey; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GREY 1
_ACEOF
@@ -8533,7 +8545,8 @@ fi
# Check whether --enable-color was given.
if test "${enable_color+set}" = set; then
enableval=$enable_color; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define COLOR 1
_ACEOF
@@ -8555,11 +8568,13 @@ if test "${enable_t1lib+set}" = set; then
enableval=$enable_t1lib; if test "$enableval" = yes; then
T1LIB=1
LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define LDT1LIB 1
_ACEOF
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define T1LIB 1
_ACEOF
@@ -8585,7 +8600,8 @@ fi
# Check whether --enable-gf was given.
if test "${enable_gf+set}" = set; then
enableval=$enable_gf; if test "$enableval" != no; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define USE_GF 1
_ACEOF
@@ -8598,7 +8614,8 @@ fi
# Check whether --enable-a4 was given.
if test "${enable_a4+set}" = set; then
enableval=$enable_a4; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define A4 1
_ACEOF
@@ -8642,7 +8659,8 @@ if test "${enable_magick+set}" = set; then
X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD"
X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP"
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAGICK 1
_ACEOF
@@ -9155,7 +9173,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $xdvi_old_xaw = yes; then
{ echo "$as_me:$LINENO: result: old" >&5
echo "${ECHO_T}old" >&6; }
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_OLD_XAW 1
_ACEOF
@@ -9201,9 +9220,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_WORKING_NL_LANGINFO_CODESET 1
_ACEOF
+
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
@@ -9504,7 +9525,8 @@ fi
if test "x$xpm_includes" != x; then
if test "x$xpm_includes" = xdefault; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_X11_XPM_H 1
_ACEOF
@@ -9514,7 +9536,8 @@ _ACEOF
_ACEOF
elif test -f "$xpm_includes/xpm.h"; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_XPM_H 1
_ACEOF
@@ -9653,6 +9676,7 @@ x_xpm_libs="-lXpm"
# Now check the results of headers and libraries and set USE_XPM to 0
# if one of them hadn't been found.
#
+
cat >>confdefs.h <<\_ACEOF
#define USE_XPM 1
_ACEOF
@@ -9937,7 +9961,8 @@ fi
motif_libdir_result="$motif_libdir"
motif_include_result="$motif_include"
test "$motif_libdir_result" = "" &&
- motif_libdir_result="in default path" && cat >>confdefs.h <<\_ACEOF
+ motif_libdir_result="in default path" &&
+cat >>confdefs.h <<\_ACEOF
#define MOTIF 1
_ACEOF
@@ -10043,7 +10068,8 @@ CPPFLAGS=$save_CPPFLAGS
if test $xdvi_use_xaw_panner = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define USE_XAW_PANNER 1
_ACEOF
@@ -10054,7 +10080,8 @@ fi
elif test "x$with_xdvi_x_toolkit" = xxaw; then
prog_extension="xaw"
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define XAW 1
_ACEOF
@@ -10289,7 +10316,8 @@ fi
motif_libdir_result="$motif_libdir"
motif_include_result="$motif_include"
test "$motif_libdir_result" = "" &&
- motif_libdir_result="in default path" && cat >>confdefs.h <<\_ACEOF
+ motif_libdir_result="in default path" &&
+cat >>confdefs.h <<\_ACEOF
#define MOTIF 1
_ACEOF
@@ -10395,7 +10423,8 @@ CPPFLAGS=$save_CPPFLAGS
if test $xdvi_use_xaw_panner = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define USE_XAW_PANNER 1
_ACEOF
@@ -11078,7 +11107,8 @@ CXXFLAGS="$xdvi_iconv_save_cxxflags"
LDFLAGS="$xdvi_iconv_save_ldflags"
#
if test $xdvi_iconv_char_pptr_type = "const_char_pptr"; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define ICONV_CHAR_PPTR_TYPE const char **
_ACEOF
@@ -11434,7 +11464,8 @@ fi
# 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
+ withval=$with_default_dvips_path;
+cat >>confdefs.h <<_ACEOF
#define DEFAULT_DVIPS_PATH "$withval"
_ACEOF
@@ -11451,7 +11482,8 @@ fi
# 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
+ withval=$with_default_ps2pdf_path;
+cat >>confdefs.h <<_ACEOF
#define DEFAULT_PS2PDF_PATH "$withval"
_ACEOF
diff --git a/Build/source/texk/xdvik/configure.in b/Build/source/texk/xdvik/configure.in
index 604e455329e..d17c977cb9f 100644
--- a/Build/source/texk/xdvik/configure.in
+++ b/Build/source/texk/xdvik/configure.in
@@ -101,8 +101,10 @@ XDVI_OLD_XAW
dnl nl_langinfo checks
AC_MSG_CHECKING(if nl_langinfo(CODESET) is working)
AC_TRY_LINK([#include <langinfo.h>], [char* cs = nl_langinfo(CODESET);],
- AC_DEFINE(HAVE_WORKING_NL_LANGINFO_CODESET) AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no)
+ [AC_DEFINE([HAVE_WORKING_NL_LANGINFO_CODESET], 1,
+ [Define if the CODESET argument to nl_langinfo works.])
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
)
dnl First, check for libXp and libXext:
@@ -161,7 +163,7 @@ dnl XDVI_FIND_MOTIF also defines $prog_extension, AC_DEFINE(toolkit) and $x_tool
XDVI_FIND_MOTIF(none, "$motif_include", "$motif_libdir")
elif test "x$with_xdvi_x_toolkit" = xxaw; then
prog_extension="xaw"
- AC_DEFINE(XAW)
+ AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.])
x_tool_libs="-lXaw"
else
dnl Motif with xaw as fallback
@@ -254,12 +256,14 @@ fi
XDVI_ARG_STRING(default-dvips-path,
[ --with-default-dvips-path=CMD
Use CMD as default DVI to PS converter],
-DEFAULT_DVIPS_PATH, "dvips")
+[DEFAULT_DVIPS_PATH], ["dvips"],
+[Define to point to the default command to use for printing (optional).])
XDVI_ARG_STRING(default-ps2pdf-path,
[ --with-default-ps2pdf-path=CMD
Use CMD as default PS to PDF converter],
-DEFAULT_PS2PDF_PATH, "ps2pdf")
+[DEFAULT_PS2PDF_PATH], ["ps2pdf"],
+[Define to point to the default command to use for printing (optional).])
dnl ImageMagick support
PS_DEF="$PS_DEF $MAGICK_DEF"
diff --git a/Build/source/texk/xdvik/stamp-aclocal b/Build/source/texk/xdvik/stamp-aclocal
new file mode 100644
index 00000000000..8fd44ea5d80
--- /dev/null
+++ b/Build/source/texk/xdvik/stamp-aclocal
@@ -0,0 +1 @@
+Fri Feb 29 13:37:42 CET 2008
diff --git a/Build/source/texk/xdvik/stamp-auto.in b/Build/source/texk/xdvik/stamp-auto.in
index 684d91df8ae..7a930a28eed 100644
--- a/Build/source/texk/xdvik/stamp-auto.in
+++ b/Build/source/texk/xdvik/stamp-auto.in
@@ -1 +1 @@
-Mo Aug 22 08:29:17 CEST 2005
+Fri Feb 29 13:37:44 CET 2008
diff --git a/Build/source/texk/xdvik/withenable.ac b/Build/source/texk/xdvik/withenable.ac
index a6bb7495cc5..8a1f6c32f42 100644
--- a/Build/source/texk/xdvik/withenable.ac
+++ b/Build/source/texk/xdvik/withenable.ac
@@ -16,20 +16,20 @@ AC_ARG_ENABLE([grey],
[ --disable-grey Disable greyscale anti-aliasing for shrunken bitmaps]
,
[if test "$enableval" = yes; then
- AC_DEFINE(GREY)
+ AC_DEFINE([GREY], 1, [Define to enable greyscale anti-aliasing for shrunken bitmaps.])
else
echo DISABLED grey
fi],
-[AC_DEFINE(GREY)])
+[AC_DEFINE([GREY], 1)])
AC_ARG_ENABLE([color],
[ --disable-color Disable support for color specials],
[if test "$enableval" = yes; then
- AC_DEFINE(COLOR)
+ AC_DEFINE([COLOR], 1, [Define to enable support for color specials.])
else
echo DISABLED color
fi],
-[AC_DEFINE(COLOR)])
+[AC_DEFINE([COLOR], 1)])
dnl OBSOLETE AC_ARG_ENABLE([buttons],
dnl OBSOLETE [ --disable-buttons Disable buttons on the side of the window],
@@ -54,8 +54,8 @@ AC_ARG_ENABLE([t1lib],
[if test "$enableval" = yes; then
T1LIB=1
LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
- AC_DEFINE(LDT1LIB)
- AC_DEFINE(T1LIB)
+ AC_DEFINE([LDT1LIB], 1, [Define to compile in t1lib (libtool)])
+ AC_DEFINE([T1LIB], 1, [Define to compile in t1lib])
else
T1LIB=
LDT1LIB=
@@ -63,13 +63,13 @@ else
fi],
[T1LIB=1
LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
-AC_DEFINE(LDT1LIB)
-AC_DEFINE(T1LIB)])
+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)
+ 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])
@@ -77,11 +77,11 @@ 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)
+ 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)])
+[AC_DEFINE([A4], 1)])
AC_ARG_ENABLE([magick],
[ --enable-magick Use ImageMagick to load/render image files.
@@ -113,7 +113,7 @@ AC_ARG_ENABLE([magick],
X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD"
X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP"
- AC_DEFINE(MAGICK)
+ AC_DEFINE([MAGICK], 1, [Define to use ImageMagick])
#echo MAGICK_DEF=\"$MAGICK_DEF\"
else
echo "ImageMagick version too old - ImageMagick support disabled"
diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in
index 6fd62fbf906..c3d8589300c 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/Makefile.in
@@ -102,6 +102,7 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FREETYPE2CPPFLAGS = @FREETYPE2CPPFLAGS@
FREETYPE2DEP = @FREETYPE2DEP@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -131,6 +133,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -140,6 +143,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -148,12 +152,9 @@ TDS_VERSION_11_TRUE = @TDS_VERSION_11_TRUE@
VERSION = @VERSION@
ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
ZLIBDEP = @ZLIBDEP@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -170,6 +171,9 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
exec_prefix = @exec_prefix@
host = @host@
@@ -177,17 +181,21 @@ host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/xdvipdfmx/aclocal.m4 b/Build/source/texk/xdvipdfmx/aclocal.m4
index d6b96ca4a2a..75aff297f60 100644
--- a/Build/source/texk/xdvipdfmx/aclocal.m4
+++ b/Build/source/texk/xdvipdfmx/aclocal.m4
@@ -11,499 +11,9 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Copyright (C) 2002, 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.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 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 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 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 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[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_$1_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/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_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 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 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _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, 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 12
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 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 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -591,7 +101,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -666,7 +175,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
@@ -693,6 +202,8 @@ file_magic*)
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -753,8 +264,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+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*
@@ -766,13 +278,85 @@ $rm conftest*
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+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 conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -783,12 +367,20 @@ $rm conftest*
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
@@ -1019,13 +611,17 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -1042,6 +638,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
;;
*64-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -1082,7 +681,11 @@ sparc*-*solaris*)
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -1113,7 +716,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -1154,11 +757,12 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
[$2=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ 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
@@ -1174,7 +778,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
$2=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -1272,24 +876,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
fi
;;
*)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
])
@@ -1442,7 +1049,7 @@ else
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -1450,7 +1057,7 @@ else
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@ -1516,7 +1123,8 @@ fi
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1524,7 +1132,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 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
@@ -1664,6 +1272,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -1681,7 +1290,8 @@ fi
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -1695,20 +1305,58 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
if test "$GCC" = yes; then
- 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 ';' >/dev/null ; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ lt_search_path_spec=`echo "$lt_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"`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -1726,7 +1374,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1865,12 +1513,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+ m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -1887,18 +1531,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-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
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -1936,7 +1568,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
- freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
@@ -1999,7 +1631,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
-interix3*)
+interix[[3-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2054,7 +1686,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2070,7 +1702,7 @@ linux*)
# 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ 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
@@ -2083,18 +1715,6 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-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
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -2176,6 +1796,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
+rdos*)
+ dynamic_linker=no
+ ;;
+
solaris*)
version_type=linux
need_lib_prefix=no
@@ -2271,6 +1895,17 @@ esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+ AC_MSG_NOTICE([overriding sys_lib_search_path_spec with])
+ AC_MSG_NOTICE([ predefined value: $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"
+ AC_MSG_NOTICE([overriding sys_lib_dlsearch_path_spec with])
+ AC_MSG_NOTICE([ predefined value: $sys_lib_dlsearch_path_spec])
+fi
+
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"
@@ -2281,7 +1916,8 @@ fi
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
@@ -2542,7 +2178,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
# AC_PATH_TOOL_PREFIX
# -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
@@ -2605,7 +2241,7 @@ fi
# AC_PATH_MAGIC
# -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2752,7 +2388,7 @@ esac
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
@@ -2769,7 +2405,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2791,16 +2427,22 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -2838,7 +2480,7 @@ hpux10.20* | hpux11*)
esac
;;
-interix3*)
+interix[[3-9]]*)
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
@@ -2854,7 +2496,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2888,6 +2530,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2940,7 +2586,7 @@ AC_DEFUN([AC_PROG_NM],
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
@@ -3156,10 +2802,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
_LT_AC_SYS_COMPILER
@@ -3195,7 +2841,7 @@ aix3*)
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -3252,6 +2898,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -3261,10 +2908,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+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); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -3361,7 +3008,7 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aix4* | aix5*)
+ 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.
@@ -3374,7 +3021,7 @@ case $host_os in
# 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]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -3410,7 +3057,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ :
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3520,59 +3167,31 @@ case $host_os in
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="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}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="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
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$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}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="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
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$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'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -3606,7 +3225,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3655,9 +3274,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- ;;
+ hppa*64*|ia64*) ;;
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3725,7 +3342,7 @@ case $host_os in
;;
esac
;;
- interix3*)
+ interix[[3-9]]*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3765,7 +3382,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3817,7 +3434,7 @@ case $host_os in
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$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'
@@ -3845,6 +3462,29 @@ case $host_os in
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "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 $list'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${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'
+
+ # 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.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ esac
+ ;;
esac
;;
lynxos*)
@@ -3883,16 +3523,20 @@ case $host_os in
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
- output_verbose_link_cmd='echo'
;;
osf3*)
case $cc_basename in
@@ -4054,15 +3698,10 @@ case $host_os in
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
- # linker. We must also pass each convience library through
- # to the system linker between allextract/defaultextract.
- # The C++ compiler will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -4109,6 +3748,12 @@ case $host_os in
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
fi
;;
esac
@@ -4224,7 +3869,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@ -4349,10 +3995,15 @@ fi
$rm -f confest.$objext
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
-interix3*)
+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.
_LT_AC_TAGVAR(predep_objects,$1)=
@@ -4360,19 +4011,51 @@ interix3*)
_LT_AC_TAGVAR(postdeps,$1)=
;;
+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
+ _LT_AC_TAGVAR(postdeps,$1)='-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.
- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
;;
esac
;;
esac
])
-
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -4415,10 +4098,17 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
+lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
+lt_simple_link_test_code="\
+ program t
+ end
+"
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -4450,7 +4140,7 @@ aix3*)
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -4497,10 +4187,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -4553,7 +4243,7 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4627,6 +4317,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4642,6 +4333,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
@@ -4688,7 +4380,7 @@ ifelse([$1], [],
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -4925,6 +4617,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -5013,7 +4709,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -5096,6 +4792,7 @@ fi
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5132,7 +4829,7 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -5273,7 +4970,7 @@ EOF
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -5322,13 +5019,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | os2* | pw32*)
+ mingw* | cygwin* | os2* | pw32*)
# 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).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -5339,7 +5039,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
- interix3*)
+ interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -5365,7 +5065,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -5405,7 +5105,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -5448,7 +5148,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -5461,7 +5161,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5475,6 +5175,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+ esac
;;
esac
;;
@@ -5595,14 +5303,17 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# 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).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@@ -5611,7 +5322,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
- interix3*)
+ interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -5669,10 +5380,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
esac
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# 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).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
hpux9* | hpux10* | hpux11*)
@@ -5702,7 +5414,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5721,6 +5433,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
+ esac
+ ;;
esac
;;
@@ -5730,6 +5458,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+ rdos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5789,7 +5521,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
@@ -5813,7 +5545,7 @@ esac
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5824,11 +5556,12 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ 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
@@ -5841,12 +5574,13 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$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'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$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'
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5877,12 +5611,14 @@ ifelse([$1],[CXX],[
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
@@ -5932,7 +5668,7 @@ ifelse([$1],[CXX],[
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5980,7 +5716,7 @@ EOF
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5998,7 +5734,7 @@ EOF
fi
;;
- interix3*)
+ interix[[3-9]]*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -6013,7 +5749,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='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'
;;
- linux*)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -6031,13 +5767,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${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'
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
if test $supports_anon_versioning = yes; then
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -6077,7 +5822,7 @@ EOF
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -6142,7 +5887,7 @@ _LT_EOF
fi
;;
- aix4* | aix5*)
+ 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.
@@ -6162,7 +5907,7 @@ _LT_EOF
# 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]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -6196,7 +5941,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ :
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -6289,7 +6034,7 @@ _LT_EOF
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
@@ -6322,19 +6067,18 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="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}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="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}"
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -6374,7 +6118,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6496,24 +6240,28 @@ _LT_EOF
;;
openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+ case $host_os in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
@@ -6572,17 +6320,16 @@ _LT_EOF
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- # The compiler driver will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl, iff we do not link with $LD.
- # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- case $wlarc in
- '')
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- *)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- esac ;;
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -6639,7 +6386,7 @@ _LT_EOF
fi
;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6714,7 +6461,7 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
@@ -6817,6 +6564,30 @@ AC_DEFUN([LT_AC_PROG_RC],
[AC_CHECK_TOOL(RC, windres, no)
])
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+ as_executable_p='test -x'
+else
+ as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
@@ -6837,12 +6608,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
fi
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6875,9 +6647,500 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
+# Copyright (C) 2002, 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.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+# Copyright (C) 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.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 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 7
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+
+# Copyright (C) 1999, 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 8
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[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_$1_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/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_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+# Copyright (C) 1999, 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 3
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+ [test x"$AMDEP_TRUE" != x"" || _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, 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 12
+
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.58])dnl
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 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.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 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 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
diff --git a/Build/source/texk/xdvipdfmx/data/Makefile.in b/Build/source/texk/xdvipdfmx/data/Makefile.in
index ff0a654daaf..005438badd1 100644
--- a/Build/source/texk/xdvipdfmx/data/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/data/Makefile.in
@@ -86,6 +86,7 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -96,6 +97,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FREETYPE2CPPFLAGS = @FREETYPE2CPPFLAGS@
FREETYPE2DEP = @FREETYPE2DEP@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -115,6 +117,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -124,6 +127,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -132,12 +136,9 @@ TDS_VERSION_11_TRUE = @TDS_VERSION_11_TRUE@
VERSION = @VERSION@
ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
ZLIBDEP = @ZLIBDEP@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -154,6 +155,9 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
exec_prefix = @exec_prefix@
host = @host@
@@ -161,17 +165,21 @@ host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in
index a264ce1f58a..cfd5f3e5705 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.in
@@ -131,6 +131,7 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -141,6 +142,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FREETYPE2CPPFLAGS = @FREETYPE2CPPFLAGS@
FREETYPE2DEP = @FREETYPE2DEP@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -160,6 +162,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -169,6 +172,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -177,12 +181,9 @@ TDS_VERSION_11_TRUE = @TDS_VERSION_11_TRUE@
VERSION = @VERSION@
ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
ZLIBDEP = @ZLIBDEP@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -199,6 +200,9 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
exec_prefix = @exec_prefix@
host = @host@
@@ -206,17 +210,21 @@ host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@