summaryrefslogtreecommitdiff
path: root/Build/source/texk/detex
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-22 12:09:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-22 12:09:38 +0000
commitb287d7f6a13823ea17e0bd415981d3a5953ca703 (patch)
treea420b28a35f7761f064d50bb610dbb2b46c71486 /Build/source/texk/detex
parent5fd6fd3479fcbbda52ebca7b5e80a5aaa1add69f (diff)
build system: various small fixes for mingw32 cross compilation
still incomplete git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/detex')
-rw-r--r--Build/source/texk/detex/ChangeLog5
-rw-r--r--Build/source/texk/detex/Makefile.in2
-rwxr-xr-xBuild/source/texk/detex/configure371
-rw-r--r--Build/source/texk/detex/detex.c192
-rw-r--r--Build/source/texk/detex/detex.l6
5 files changed, 451 insertions, 125 deletions
diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog
index e52181c894f..19bad30ec86 100644
--- a/Build/source/texk/detex/ChangeLog
+++ b/Build/source/texk/detex/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * detex.l: #undef IGNORE after #including kpathsea headers.
+ #define NOFILE if not defined by <sys/param.h>.
+
2009-08-21 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid maximal compiler warnings.
diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in
index d79aef445f4..2fda1d95cd4 100644
--- a/Build/source/texk/detex/Makefile.in
+++ b/Build/source/texk/detex/Makefile.in
@@ -137,6 +137,7 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -149,6 +150,7 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index 233fef68cdd..3b17de81c6a 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -764,7 +764,6 @@ DSYMUTIL
lt_ECHO
RANLIB
AR
-OBJDUMP
LN_S
NM
ac_ct_DUMPBIN
@@ -799,6 +798,9 @@ build_vendor
build_cpu
build
LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -4489,13 +4491,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4492: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4494: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4495: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4497: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4498: output\"" >&5)
+ (eval echo "\"\$as_me:4500: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4841,9 +4843,6 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
if test "${lt_cv_deplibs_check_method+set}" = set; then :
@@ -5701,7 +5700,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5704 "configure"' > conftest.$ac_ext
+ echo '#line 5703 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6834,13 +6833,311 @@ fi
# Set options
+enable_win32_dll=yes
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- enable_dlopen=no
+fi
+if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
+ # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AS"; then
+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AS="as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_AS" = x; then
+ AS="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AS=$ac_ct_AS
+ fi
+else
+ AS="$ac_cv_prog_AS"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+ ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+ enable_dlopen=no
- enable_win32_dll=no
# Check whether --enable-shared was given.
@@ -7333,11 +7630,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7336: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7633: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7340: \$? = $ac_status" >&5
+ echo "$as_me:7637: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7672,11 +7969,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7675: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7972: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7679: \$? = $ac_status" >&5
+ echo "$as_me:7976: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7777,11 +8074,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7780: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7784: \$? = $ac_status" >&5
+ echo "$as_me:8081: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7832,11 +8129,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7835: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8132: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7839: \$? = $ac_status" >&5
+ echo "$as_me:8136: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10199,7 +10496,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10202 "configure"
+#line 10499 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10295,7 +10592,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10298 "configure"
+#line 10595 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12049,6 +12346,9 @@ double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
@@ -12075,7 +12375,6 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
@@ -12181,7 +12480,6 @@ LN_S \
lt_SP2NL \
lt_NL2SP \
reload_flag \
-OBJDUMP \
deplibs_check_method \
file_magic_cmd \
AR \
@@ -12355,6 +12653,15 @@ available_tags=""
macro_version=$macro_version
macro_revision=$macro_revision
+# Assembler program.
+AS=$AS
+
+# DLL creation program.
+DLLTOOL=$DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$OBJDUMP
+
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
@@ -12420,9 +12727,6 @@ NL2SP=$lt_lt_NL2SP
reload_flag=$lt_reload_flag
reload_cmds=$lt_reload_cmds
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -13754,6 +14058,9 @@ double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
@@ -13780,7 +14087,6 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
@@ -13886,7 +14192,6 @@ LN_S \
lt_SP2NL \
lt_NL2SP \
reload_flag \
-OBJDUMP \
deplibs_check_method \
file_magic_cmd \
AR \
@@ -14748,6 +15053,15 @@ available_tags=""
macro_version=$macro_version
macro_revision=$macro_revision
+# Assembler program.
+AS=$AS
+
+# DLL creation program.
+DLLTOOL=$DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$OBJDUMP
+
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
@@ -14813,9 +15127,6 @@ NL2SP=$lt_lt_NL2SP
reload_flag=$lt_reload_flag
reload_cmds=$lt_reload_cmds
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
diff --git a/Build/source/texk/detex/detex.c b/Build/source/texk/detex/detex.c
index 5467819c90d..dcda71cc208 100644
--- a/Build/source/texk/detex/detex.c
+++ b/Build/source/texk/detex/detex.c
@@ -742,7 +742,6 @@ static char rcsid[] = "$Header: /p/src/local/bin/detex/RCS/detex.l,v 2.19 1997/0
#ifdef FPTEX
#include <win32lib.h>
#undef ERROR
-#undef IGNORE
#endif
#include "detex.h"
@@ -782,6 +781,8 @@ char *malloc();
#endif
+#undef IGNORE
+
void SetEnvIgnore(const char *sbEnvList);
int BeginEnv(const char *sbEnv);
int EndEnv(const char *sbEnv);
@@ -812,6 +813,9 @@ char *rgsbIncList[MAXINCLIST]; /* list of includeonly files */
char *rgsbInputPaths[MAXINPUTPATHS]; /* list of input paths in order */
char sbCurrentEnv[CCHMAXENV]; /* current environment being ignored */
char *sbProgName; /* name we were invoked with */
+#ifndef NOFILE /* might be defined in <sys/param.h> */
+#define NOFILE 256
+#endif
FILE *rgfp[NOFILE+1]; /* stack of input/include files */
int cfp = 0; /* count of files in stack */
int cOpenBrace = 0; /* count of `{' in <LaMacro2> */
@@ -827,7 +831,7 @@ int fForcetex = 0; /* flag to inhibit latex mode */
-#line 831 "detex.c"
+#line 835 "detex.c"
#define INITIAL 0
#define Define 1
@@ -1025,9 +1029,9 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 113 "detex.l"
+#line 117 "detex.l"
-#line 1031 "detex.c"
+#line 1035 "detex.c"
if ( !(yy_init) )
{
@@ -1112,24 +1116,24 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 114 "detex.l"
+#line 118 "detex.l"
/* ignore comments */ ;
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 116 "detex.l"
+#line 120 "detex.l"
{fLatex = !fForcetex; IGNORE;}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 118 "detex.l"
+#line 122 "detex.l"
/* environment start */ {LaBEGIN LaBegin; IGNORE;}
YY_BREAK
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
-#line 120 "detex.l"
+#line 124 "detex.l"
{ if (BeginEnv("verbatim"))
BEGIN LaEnv;
else
@@ -1140,17 +1144,17 @@ YY_RULE_SETUP
case 5:
/* rule 5 can match eol */
YY_RULE_SETUP
-#line 127 "detex.l"
+#line 131 "detex.l"
/* verbatim mode */ {BEGIN Normal; IGNORE;}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 128 "detex.l"
+#line 132 "detex.l"
ECHO;
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 130 "detex.l"
+#line 134 "detex.l"
{ if (BeginEnv(yytext))
BEGIN LaEnv;
else
@@ -1161,33 +1165,33 @@ YY_RULE_SETUP
case 8:
/* rule 8 can match eol */
YY_RULE_SETUP
-#line 136 "detex.l"
+#line 140 "detex.l"
NEWLINE;
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 137 "detex.l"
+#line 141 "detex.l"
;
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 139 "detex.l"
+#line 143 "detex.l"
/* absorb some environments */ {LaBEGIN LaEnd; IGNORE;}
YY_BREAK
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 140 "detex.l"
+#line 144 "detex.l"
NEWLINE;
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 141 "detex.l"
+#line 145 "detex.l"
;
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 143 "detex.l"
+#line 147 "detex.l"
/* end environment */ { if (EndEnv(yytext))
BEGIN Normal;
IGNORE;
@@ -1195,88 +1199,88 @@ YY_RULE_SETUP
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 147 "detex.l"
+#line 151 "detex.l"
{BEGIN LaEnv; IGNORE;}
YY_BREAK
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 148 "detex.l"
+#line 152 "detex.l"
NEWLINE;
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 149 "detex.l"
+#line 153 "detex.l"
;
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 151 "detex.l"
+#line 155 "detex.l"
/* ignore args */ {LaBEGIN LaMacro2; IGNORE;}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 152 "detex.l"
+#line 156 "detex.l"
/* of these \cs */ {LaBEGIN LaMacro; IGNORE;}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 153 "detex.l"
+#line 157 "detex.l"
{LaBEGIN LaMacro; IGNORE;}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 154 "detex.l"
+#line 158 "detex.l"
{CITEBEGIN LaMacro2; IGNORE;}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 155 "detex.l"
+#line 159 "detex.l"
{LaBEGIN LaMacro; IGNORE;}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 156 "detex.l"
+#line 160 "detex.l"
{LaBEGIN LaMacro; IGNORE;}
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 157 "detex.l"
+#line 161 "detex.l"
{SPACE;}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 158 "detex.l"
+#line 162 "detex.l"
{LaBEGIN LaMacro2; SPACE;}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 159 "detex.l"
+#line 163 "detex.l"
{LaBEGIN LaMacro; IGNORE;}
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 160 "detex.l"
+#line 164 "detex.l"
{CITEBEGIN LaMacro; IGNORE;}
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 161 "detex.l"
+#line 165 "detex.l"
{LaBEGIN LaMacro; IGNORE;}
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 162 "detex.l"
+#line 166 "detex.l"
{CITEBEGIN LaMacro; IGNORE;}
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 163 "detex.l"
+#line 167 "detex.l"
{LaBEGIN LaMacro; IGNORE;}
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 164 "detex.l"
+#line 168 "detex.l"
/* ignore \verb<ch>...<ch> */ { if (fLatex) {
char verbchar, c;
verbchar = input();
@@ -1289,28 +1293,28 @@ YY_RULE_SETUP
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 173 "detex.l"
+#line 177 "detex.l"
BEGIN Normal;
YY_BREAK
case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
-#line 174 "detex.l"
+#line 178 "detex.l"
NEWLINE;
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 175 "detex.l"
+#line 179 "detex.l"
;
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 176 "detex.l"
+#line 180 "detex.l"
{ cOpenBrace++; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 177 "detex.l"
+#line 181 "detex.l"
{ cOpenBrace--;
if (cOpenBrace == 0)
BEGIN Normal;
@@ -1319,132 +1323,132 @@ YY_RULE_SETUP
case 36:
/* rule 36 can match eol */
YY_RULE_SETUP
-#line 181 "detex.l"
+#line 185 "detex.l"
NEWLINE;
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 182 "detex.l"
+#line 186 "detex.l"
;
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 184 "detex.l"
+#line 188 "detex.l"
/* ignore def begin */ {BEGIN Define; IGNORE;}
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 185 "detex.l"
+#line 189 "detex.l"
BEGIN Normal;
YY_BREAK
case 40:
/* rule 40 can match eol */
YY_RULE_SETUP
-#line 186 "detex.l"
+#line 190 "detex.l"
NEWLINE;
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 187 "detex.l"
+#line 191 "detex.l"
;
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 189 "detex.l"
+#line 193 "detex.l"
/* formula mode */ {LaBEGIN LaFormula; IGNORE;}
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 190 "detex.l"
+#line 194 "detex.l"
BEGIN Normal;
YY_BREAK
case 44:
/* rule 44 can match eol */
YY_RULE_SETUP
-#line 191 "detex.l"
+#line 195 "detex.l"
NEWLINE;
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 192 "detex.l"
+#line 196 "detex.l"
;
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 194 "detex.l"
+#line 198 "detex.l"
/* display mode */ {LaBEGIN LaDisplay; IGNORE;}
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 195 "detex.l"
+#line 199 "detex.l"
BEGIN Normal;
YY_BREAK
case 48:
/* rule 48 can match eol */
YY_RULE_SETUP
-#line 196 "detex.l"
+#line 200 "detex.l"
NEWLINE;
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 197 "detex.l"
+#line 201 "detex.l"
;
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 199 "detex.l"
+#line 203 "detex.l"
/* display mode */ {BEGIN Display; IGNORE;}
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 200 "detex.l"
+#line 204 "detex.l"
BEGIN Normal;
YY_BREAK
case 52:
/* rule 52 can match eol */
YY_RULE_SETUP
-#line 201 "detex.l"
+#line 205 "detex.l"
NEWLINE;
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 202 "detex.l"
+#line 206 "detex.l"
;
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 204 "detex.l"
+#line 208 "detex.l"
/* math mode */ {BEGIN Math; IGNORE;}
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 205 "detex.l"
+#line 209 "detex.l"
BEGIN Normal;
YY_BREAK
case 56:
/* rule 56 can match eol */
YY_RULE_SETUP
-#line 206 "detex.l"
+#line 210 "detex.l"
NEWLINE;
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 207 "detex.l"
+#line 211 "detex.l"
;
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 208 "detex.l"
+#line 212 "detex.l"
;
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 210 "detex.l"
+#line 214 "detex.l"
/* process files */ {LaBEGIN LaInclude; IGNORE;}
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 211 "detex.l"
+#line 215 "detex.l"
{ IncludeFile(yytext);
BEGIN Normal;
}
@@ -1452,27 +1456,27 @@ YY_RULE_SETUP
case 61:
/* rule 61 can match eol */
YY_RULE_SETUP
-#line 214 "detex.l"
+#line 218 "detex.l"
NEWLINE;
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 215 "detex.l"
+#line 219 "detex.l"
;
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 217 "detex.l"
+#line 221 "detex.l"
{BEGIN IncludeOnly; IGNORE;}
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 218 "detex.l"
+#line 222 "detex.l"
AddInclude(yytext);
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 219 "detex.l"
+#line 223 "detex.l"
{ if (csbIncList == 0)
rgsbIncList[csbIncList++] = '\0';
BEGIN Normal;
@@ -1481,22 +1485,22 @@ YY_RULE_SETUP
case 66:
/* rule 66 can match eol */
YY_RULE_SETUP
-#line 223 "detex.l"
+#line 227 "detex.l"
NEWLINE;
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 224 "detex.l"
+#line 228 "detex.l"
;
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 226 "detex.l"
+#line 230 "detex.l"
{BEGIN Input; IGNORE;}
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 227 "detex.l"
+#line 231 "detex.l"
{ InputFile(yytext);
BEGIN Normal;
}
@@ -1504,85 +1508,85 @@ YY_RULE_SETUP
case 70:
/* rule 70 can match eol */
YY_RULE_SETUP
-#line 230 "detex.l"
+#line 234 "detex.l"
NEWLINE;
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 231 "detex.l"
+#line 235 "detex.l"
;
YY_BREAK
case 72:
/* rule 72 can match eol */
YY_RULE_SETUP
-#line 233 "detex.l"
+#line 237 "detex.l"
/* handle ligatures */ {(void)printf("%.2s", yytext+1);}
YY_BREAK
case 73:
/* rule 73 can match eol */
YY_RULE_SETUP
-#line 234 "detex.l"
+#line 238 "detex.l"
{(void)printf("%.1s", yytext+1);}
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 236 "detex.l"
+#line 240 "detex.l"
/* ignore other \cs */ {BEGIN Control; IGNORE;}
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 237 "detex.l"
+#line 241 "detex.l"
SPACE;
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 238 "detex.l"
+#line 242 "detex.l"
IGNORE;
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 239 "detex.l"
+#line 243 "detex.l"
IGNORE;
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 240 "detex.l"
+#line 244 "detex.l"
IGNORE;
YY_BREAK
case 79:
/* rule 79 can match eol */
YY_RULE_SETUP
-#line 241 "detex.l"
+#line 245 "detex.l"
{BEGIN Normal; NEWLINE;}
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 242 "detex.l"
+#line 246 "detex.l"
{BEGIN Normal; IGNORE;}
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 243 "detex.l"
+#line 247 "detex.l"
{yyless(0);BEGIN Normal;}
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 245 "detex.l"
+#line 249 "detex.l"
/* special characters */ IGNORE;
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 246 "detex.l"
+#line 250 "detex.l"
IGNORE;
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 247 "detex.l"
+#line 251 "detex.l"
SPACE;
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 249 "detex.l"
+#line 253 "detex.l"
{ if (fWord)
(void)printf("%s\n", yytext);
else
@@ -1591,21 +1595,21 @@ YY_RULE_SETUP
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 254 "detex.l"
+#line 258 "detex.l"
if (!fWord) ECHO;
YY_BREAK
case 87:
/* rule 87 can match eol */
YY_RULE_SETUP
-#line 255 "detex.l"
+#line 259 "detex.l"
if (!fWord) ECHO;
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 256 "detex.l"
+#line 260 "detex.l"
ECHO;
YY_BREAK
-#line 1609 "detex.c"
+#line 1613 "detex.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(Define):
case YY_STATE_EOF(Display):
@@ -2619,7 +2623,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 256 "detex.l"
+#line 260 "detex.l"
/******
diff --git a/Build/source/texk/detex/detex.l b/Build/source/texk/detex/detex.l
index 8e1752328ac..3d9a961dfa6 100644
--- a/Build/source/texk/detex/detex.l
+++ b/Build/source/texk/detex/detex.l
@@ -19,7 +19,6 @@ static char rcsid[] = "$Header: /p/src/local/bin/detex/RCS/detex.l,v 2.19 1997/0
#ifdef FPTEX
#include <win32lib.h>
#undef ERROR
-#undef IGNORE
#endif
#include "detex.h"
@@ -59,6 +58,8 @@ char *malloc();
#endif
+#undef IGNORE
+
void SetEnvIgnore(const char *sbEnvList);
int BeginEnv(const char *sbEnv);
int EndEnv(const char *sbEnv);
@@ -89,6 +90,9 @@ char *rgsbIncList[MAXINCLIST]; /* list of includeonly files */
char *rgsbInputPaths[MAXINPUTPATHS]; /* list of input paths in order */
char sbCurrentEnv[CCHMAXENV]; /* current environment being ignored */
char *sbProgName; /* name we were invoked with */
+#ifndef NOFILE /* might be defined in <sys/param.h> */
+#define NOFILE 256
+#endif
FILE *rgfp[NOFILE+1]; /* stack of input/include files */
int cfp = 0; /* count of files in stack */
int cOpenBrace = 0; /* count of `{' in <LaMacro2> */