summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-07-16 17:37:55 +0000
committerKarl Berry <karl@freefriends.org>2006-07-16 17:37:55 +0000
commit198ad22677ede977cfdde0655559af4b179bf63f (patch)
tree993db467b0b9b516fcfedde97c389c59e062e75f /Build/source
parent5fff74807ab16d24983d39ba647292555217ff73 (diff)
regenerate configure scripts with ./reautoconf
git-svn-id: svn://tug.org/texlive/trunk@1857 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/README4
-rwxr-xr-xBuild/source/libs/expat/configure90
-rwxr-xr-xBuild/source/libs/gd/configure21
-rwxr-xr-xBuild/source/libs/t1lib/configure126
-rwxr-xr-xBuild/source/libs/type1/configure9
-rwxr-xr-xBuild/source/reautoconf6
-rwxr-xr-xBuild/source/texk/afm2pl/configure46
-rwxr-xr-xBuild/source/texk/bibtex8/configure27
-rwxr-xr-xBuild/source/texk/chktex/configure21
-rwxr-xr-xBuild/source/texk/cjkutils/configure30
-rwxr-xr-xBuild/source/texk/configure207
-rwxr-xr-xBuild/source/texk/detex/configure112
-rwxr-xr-xBuild/source/texk/devnag/configure37
-rwxr-xr-xBuild/source/texk/dtl/configure157
-rwxr-xr-xBuild/source/texk/dvi2tty/configure27
-rwxr-xr-xBuild/source/texk/dvidvi/configure157
-rwxr-xr-xBuild/source/texk/dviljk/configure31
-rwxr-xr-xBuild/source/texk/dvipdfm/configure87
-rwxr-xr-xBuild/source/texk/dvipng/configure15
-rwxr-xr-xBuild/source/texk/dvipsk/configure9
-rwxr-xr-xBuild/source/texk/gsftopk/configure89
-rwxr-xr-xBuild/source/texk/kpathsea/configure9
-rwxr-xr-xBuild/source/texk/lacheck/configure187
-rwxr-xr-xBuild/source/texk/makeindexk/configure29
-rwxr-xr-xBuild/source/texk/musixflx/configure157
-rwxr-xr-xBuild/source/texk/owindvi/configure234
-rwxr-xr-xBuild/source/texk/ps2pkm/configure61
-rwxr-xr-xBuild/source/texk/seetexk/configure161
-rwxr-xr-xBuild/source/texk/tetex/configure3
-rwxr-xr-xBuild/source/texk/tex4htk/configure149
-rwxr-xr-xBuild/source/texk/texlive/configure143
-rwxr-xr-xBuild/source/texk/ttf2pk/configure59
-rwxr-xr-xBuild/source/texk/web2c/configure165
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rwxr-xr-xBuild/source/texk/windvi/configure267
-rwxr-xr-xBuild/source/texk/xdvik/configure457
36 files changed, 1380 insertions, 2013 deletions
diff --git a/Build/source/README b/Build/source/README
index 9f8a7474f76..975cc8c2b91 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -1,4 +1,5 @@
Public domain. Originally written by Karl Berry, 6jun05.
+$Id$
To build the source tree, run ./Build.
To build (mostly) without optimization, try CFLAGS=-g Build.
@@ -7,6 +8,9 @@ The binaries will be left in ./inst/bin/<stdplatform>.
Then copy the binaries to texmf/bin/<tlplatform> and p4 add/edit/delete them.
(Don't worry about the other files and directories in inst.)
+Running ./reautoconf here reruns autoconf, both old (the hacked 2.13
+we have here) and new (assumed to be in /usr/bin/autoconf).
+
Automadness:
should be oldest > newest in this order (often used alternate names
in parentheses):
diff --git a/Build/source/libs/expat/configure b/Build/source/libs/expat/configure
index 7686f8b7fcd..674287bb9a9 100755
--- a/Build/source/libs/expat/configure
+++ b/Build/source/libs/expat/configure
@@ -954,7 +954,7 @@ esac
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -2113,7 +2113,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2171,7 +2172,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2287,7 +2289,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2341,7 +2344,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2386,7 +2390,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2430,7 +2435,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2639,7 +2645,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
case "$lt_target" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 2642 "configure"' > conftest.$ac_ext
+ echo '#line 2648 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -2693,7 +2699,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3198,7 +3205,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3256,7 +3264,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3372,7 +3381,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3426,7 +3436,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3471,7 +3482,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3515,7 +3527,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3918,7 +3931,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4088,7 +4102,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4156,7 +4171,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4307,7 +4323,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4349,7 +4366,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4406,7 +4424,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4574,7 +4593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4637,7 +4657,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4702,7 +4723,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4853,7 +4875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5037,7 +5060,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5321,7 +5345,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6167,6 +6192,11 @@ esac
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -6205,12 +6235,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index f16d3ae72fe..eda7c2783db 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -1321,6 +1321,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1324: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1425,7 +1428,7 @@ else
if test "$with_system_zlib" = yes; then
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:1429: checking for inflate in -lz" >&5
+echo "configure:1432: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1433,7 +1436,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1437 "configure"
+#line 1440 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1444,7 +1447,7 @@ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1480,17 +1483,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1484: checking for $ac_hdr" >&5
+echo "configure:1487: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1489 "configure"
+#line 1492 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1590,7 +1593,7 @@ else
if test "$with_system_pnglib" = yes; then
echo $ac_n "checking for png_set_read_fn in -lpng""... $ac_c" 1>&6
-echo "configure:1594: checking for png_set_read_fn in -lpng" >&5
+echo "configure:1597: checking for png_set_read_fn in -lpng" >&5
ac_lib_var=`echo png'_'png_set_read_fn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1598,7 +1601,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1602 "configure"
+#line 1605 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1609,7 +1612,7 @@ int main() {
png_set_read_fn()
; return 0; }
EOF
-if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/Build/source/libs/t1lib/configure b/Build/source/libs/t1lib/configure
index c12aae93f5d..a319e5d5d34 100755
--- a/Build/source/libs/t1lib/configure
+++ b/Build/source/libs/t1lib/configure
@@ -2042,6 +2042,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:2045: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -2101,14 +2104,14 @@ fi
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:2105: checking whether char is unsigned" >&5
+echo "configure:2108: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 2112 "configure"
+#line 2115 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -2130,7 +2133,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2134 "configure"
+#line 2137 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -2140,7 +2143,7 @@ main() {
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:2144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -2164,7 +2167,7 @@ EOF
fi
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:2168: checking size of char" >&5
+echo "configure:2171: checking size of char" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2172,7 +2175,7 @@ else
ac_cv_sizeof_char=0
else
cat > conftest.$ac_ext <<EOF
-#line 2176 "configure"
+#line 2179 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2183,7 +2186,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
@@ -2203,7 +2206,7 @@ EOF
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2207: checking size of short" >&5
+echo "configure:2210: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2211,7 +2214,7 @@ else
ac_cv_sizeof_short=0
else
cat > conftest.$ac_ext <<EOF
-#line 2215 "configure"
+#line 2218 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2222,7 +2225,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
@@ -2242,7 +2245,7 @@ EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2246: checking size of int" >&5
+echo "configure:2249: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2250,7 +2253,7 @@ else
ac_cv_sizeof_int=0
else
cat > conftest.$ac_ext <<EOF
-#line 2254 "configure"
+#line 2257 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2261,7 +2264,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -2281,7 +2284,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2285: checking size of long" >&5
+echo "configure:2288: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2289,7 +2292,7 @@ else
ac_cv_sizeof_long=0
else
cat > conftest.$ac_ext <<EOF
-#line 2293 "configure"
+#line 2296 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2300,7 +2303,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -2320,7 +2323,7 @@ EOF
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:2324: checking size of long long" >&5
+echo "configure:2327: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2328,7 +2331,7 @@ else
ac_cv_sizeof_long_long=0
else
cat > conftest.$ac_ext <<EOF
-#line 2332 "configure"
+#line 2335 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2339,7 +2342,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
@@ -2359,7 +2362,7 @@ EOF
echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:2363: checking size of float" >&5
+echo "configure:2366: checking size of float" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2367,7 +2370,7 @@ else
ac_cv_sizeof_float=0
else
cat > conftest.$ac_ext <<EOF
-#line 2371 "configure"
+#line 2374 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2378,7 +2381,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_float=`cat conftestval`
else
@@ -2398,7 +2401,7 @@ EOF
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:2402: checking size of double" >&5
+echo "configure:2405: checking size of double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2406,7 +2409,7 @@ else
ac_cv_sizeof_double=0
else
cat > conftest.$ac_ext <<EOF
-#line 2410 "configure"
+#line 2413 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2417,7 +2420,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_double=`cat conftestval`
else
@@ -2437,7 +2440,7 @@ EOF
echo $ac_n "checking size of long double""... $ac_c" 1>&6
-echo "configure:2441: checking size of long double" >&5
+echo "configure:2444: checking size of long double" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2445,7 +2448,7 @@ else
ac_cv_sizeof_long_double=0
else
cat > conftest.$ac_ext <<EOF
-#line 2449 "configure"
+#line 2452 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2456,7 +2459,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_double=`cat conftestval`
else
@@ -2476,7 +2479,7 @@ EOF
echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:2480: checking size of void *" >&5
+echo "configure:2483: checking size of void *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2484,7 +2487,7 @@ else
ac_cv_sizeof_void_p=0
else
cat > conftest.$ac_ext <<EOF
-#line 2488 "configure"
+#line 2491 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2495,7 +2498,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_void_p=`cat conftestval`
else
@@ -2519,7 +2522,7 @@ if test "x${GCC}" = "xyes"
then
CFLAGS="$CFLAGS"
echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6
-echo "configure:2523: checking "for gcc strength-reduce bug"" >&5
+echo "configure:2526: checking "for gcc strength-reduce bug"" >&5
if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2527,7 +2530,7 @@ else
ac_cv_c_gcc_strength_bug="yes"
else
cat > conftest.$ac_ext <<EOF
-#line 2531 "configure"
+#line 2534 "configure"
#include "confdefs.h"
int main(void) {
@@ -2538,7 +2541,7 @@ int main(void) {
exit( Array[1] != -2 );
}
EOF
-if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_gcc_strength_bug="no"
else
@@ -2561,7 +2564,7 @@ fi
echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6
-echo "configure:2565: checking "whether external symbols need an underscore prefix"" >&5
+echo "configure:2568: checking "whether external symbols need an underscore prefix"" >&5
if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2573,14 +2576,14 @@ _ac_test:
.long 0
EOF
cat > conftest.$ac_ext <<EOF
-#line 2577 "configure"
+#line 2580 "configure"
#include "confdefs.h"
extern int ac_test;
int main() {
if (ac_test) return 1
; return 0; }
EOF
-if { (eval echo configure:2584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_c_extern_prefix="yes"
else
@@ -2603,7 +2606,7 @@ EOF
fi
echo $ac_n "checking "which ANSI integer type is 16 bit"""... $ac_c" 1>&6
-echo "configure:2607: checking "which ANSI integer type is 16 bit"" >&5
+echo "configure:2610: checking "which ANSI integer type is 16 bit"" >&5
if eval "test \"`echo '$''{'ac_16bit_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2611,7 +2614,7 @@ else
ac_16bit_type=
else
cat > conftest.$ac_ext <<EOF
-#line 2615 "configure"
+#line 2618 "configure"
#include "confdefs.h"
int main(void) {
@@ -2623,7 +2626,7 @@ int main(void) {
return(2);
}
EOF
-if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_16bit_type="short"
else
@@ -2647,7 +2650,7 @@ fi
echo $ac_n "checking "which ANSI integer type is 32 bit"""... $ac_c" 1>&6
-echo "configure:2651: checking "which ANSI integer type is 32 bit"" >&5
+echo "configure:2654: checking "which ANSI integer type is 32 bit"" >&5
if eval "test \"`echo '$''{'ac_32bit_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2655,7 +2658,7 @@ else
ac_32bit_type=
else
cat > conftest.$ac_ext <<EOF
-#line 2659 "configure"
+#line 2662 "configure"
#include "confdefs.h"
int main(void) {
@@ -2667,7 +2670,7 @@ int main(void) {
return(2);
}
EOF
-if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_32bit_type="int"
else
@@ -2691,7 +2694,7 @@ fi
echo $ac_n "checking "which ANSI integer type is 64 bit"""... $ac_c" 1>&6
-echo "configure:2695: checking "which ANSI integer type is 64 bit"" >&5
+echo "configure:2698: checking "which ANSI integer type is 64 bit"" >&5
if eval "test \"`echo '$''{'ac_64bit_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2699,7 +2702,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2703 "configure"
+#line 2706 "configure"
#include "confdefs.h"
int main(void) {
@@ -2709,7 +2712,7 @@ int main(void) {
return(1);
}
EOF
-if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_64bit_type="long"
else
@@ -2736,12 +2739,12 @@ fi
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:2740: checking whether stat file-mode macros are broken" >&5
+echo "configure:2743: checking whether stat file-mode macros are broken" >&5
if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2745 "configure"
+#line 2748 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -2792,12 +2795,12 @@ EOF
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2796: checking for working const" >&5
+echo "configure:2799: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2801 "configure"
+#line 2804 "configure"
#include "confdefs.h"
int main() {
@@ -2846,7 +2849,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:2850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2867,12 +2870,12 @@ EOF
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2871: checking for ANSI C header files" >&5
+echo "configure:2874: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
+#line 2879 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2880,7 +2883,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2897,7 +2900,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 2901 "configure"
+#line 2904 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2915,7 +2918,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 2919 "configure"
+#line 2922 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2936,7 +2939,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2940 "configure"
+#line 2943 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2947,7 +2950,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2971,18 +2974,21 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2975: checking for size_t" >&5
+echo "configure:2978: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2980 "configure"
+#line 2983 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
diff --git a/Build/source/libs/type1/configure b/Build/source/libs/type1/configure
index 8699b3c73d8..4a9e6384813 100755
--- a/Build/source/libs/type1/configure
+++ b/Build/source/libs/type1/configure
@@ -1150,6 +1150,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1153: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1212,7 +1215,7 @@ if test "x${GCC}" = "xyes"
then
CFLAGS="$CFLAGS"
echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6
-echo "configure:1216: checking "for gcc strength-reduce bug"" >&5
+echo "configure:1219: checking "for gcc strength-reduce bug"" >&5
if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1220,7 +1223,7 @@ else
ac_cv_c_gcc_strength_bug="yes"
else
cat > conftest.$ac_ext <<EOF
-#line 1224 "configure"
+#line 1227 "configure"
#include "confdefs.h"
int main(void) {
@@ -1231,7 +1234,7 @@ int main(void) {
exit( Array[1] != -2 );
}
EOF
-if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_gcc_strength_bug="no"
else
diff --git a/Build/source/reautoconf b/Build/source/reautoconf
index bc912de65cb..6f7b29511ae 100755
--- a/Build/source/reautoconf
+++ b/Build/source/reautoconf
@@ -69,7 +69,7 @@ acnew () { # $dir=current, $dir/$rdir->./texk/m4 with the KPSE macros.
#echo "Running aclocal-1.9 (patched) in \`$dir'"
#$topdir/config/aclocal-1.9peb --force $arg || return
echo " Running autoconf-2.59 in \`$dir'"
- /usr/bin/autoconf2.50 --force || return
+ /usr/bin/autoconf --force || return
#rm -rf autom4te.cache
}
@@ -84,6 +84,8 @@ for dir in `find utils libs texk -name configure.in | sed 's,/configure.in$,,'`;
;;
*/ncurses) # ncurses has it's own special configure
;;
+ */libgnuw32) # only for windows
+ ;;
utils/*) # Skip everything in utils for now.
;;
*/curl) # Is automade.
@@ -93,7 +95,7 @@ for dir in `find utils libs texk -name configure.in | sed 's,/configure.in$,,'`;
;;
texk/*) rdir=`echo $dir | sed -e 's,^texk/,,' -e 's,[^/]*,..,g'`/m4
case $dir in
- */dvipng|*/devnag|*/dvipdfmx)
+ */devnag|*/dvipdfmx)
(cd $dir; acnew);;
*) (cd $dir; acold);;
esac
diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure
index bf7168b6a4e..034695fe4a5 100755
--- a/Build/source/texk/afm2pl/configure
+++ b/Build/source/texk/afm2pl/configure
@@ -550,13 +550,12 @@ fi
-
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:560: checking for $ac_word" >&5
+echo "configure:559: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -587,7 +586,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:591: checking for $ac_word" >&5
+echo "configure:590: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -639,7 +638,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:643: checking for $ac_word" >&5
+echo "configure:642: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -672,7 +671,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:676: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:675: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -683,12 +682,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 687 "configure"
+#line 686 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -714,12 +713,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:717: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:723: checking whether we are using GNU C" >&5
+echo "configure:722: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -728,7 +727,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -747,7 +746,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:751: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:750: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -815,7 +814,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:819: checking for a BSD compatible install" >&5
+echo "configure:818: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -870,7 +869,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:874: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:873: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -897,7 +896,7 @@ else
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:901: checking whether ln -s works" >&5
+echo "configure:900: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -922,7 +921,7 @@ fi
# If libm is present, use it.
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:926: checking for main in -lm" >&5
+echo "configure:925: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -930,14 +929,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 934 "configure"
+#line 933 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -960,7 +959,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:964: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:963: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -979,7 +978,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:983: checking for loader (symbol LD)" >&5
+echo "configure:982: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -993,7 +992,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:997: checking for archiver (symbol AR)" >&5
+echo "configure:996: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1007,7 +1006,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:1011: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:1010: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1077,7 +1076,10 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:1081: checking where the main texmf tree is located" >&5
+echo "configure:1080: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure
index c2a04a0d5f6..b16c963f448 100755
--- a/Build/source/texk/bibtex8/configure
+++ b/Build/source/texk/bibtex8/configure
@@ -1039,13 +1039,12 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1042: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -1054,17 +1053,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -1091,7 +1088,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure
index 6f2bcd9c57c..408cafe32de 100755
--- a/Build/source/texk/chktex/configure
+++ b/Build/source/texk/chktex/configure
@@ -1840,6 +1840,9 @@ else
#include <stdlib.h>
#include <stddef.h>
#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
@@ -1862,12 +1865,12 @@ fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1866: checking for vprintf" >&5
+echo "configure:1869: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1871 "configure"
+#line 1874 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -1890,7 +1893,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1914,12 +1917,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1918: checking for _doprnt" >&5
+echo "configure:1921: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1923 "configure"
+#line 1926 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -1942,7 +1945,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:1946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1969,12 +1972,12 @@ fi
for ac_func in access closedir fileno isatty opendir readdir stat strcasecmp strdup strlwr strtol
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1973: checking for $ac_func" >&5
+echo "configure:1976: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1981 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1997,7 +2000,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index de0280dba98..1811815c249 100755
--- a/Build/source/texk/cjkutils/configure
+++ b/Build/source/texk/cjkutils/configure
@@ -1617,13 +1617,12 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1620: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -1632,17 +1631,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -1669,7 +1666,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -1681,8 +1678,7 @@ fi
-ac_config_files="$ac_config_files Makefile conv/Makefile
- hbf2gf/Makefile scripts/Makefile"
+ac_config_files="$ac_config_files Makefile conv/Makefile hbf2gf/Makefile scripts/Makefile"
trap '' 1 2 15
cat > confcache <<\EOF
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 3c97fbb867c..08ccdf85086 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -1712,6 +1712,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1715: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1835,12 +1838,12 @@ EOF
# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too?
# See ac_path_xtra.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:1839: checking for connect" >&5
+echo "configure:1842: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1844 "configure"
+#line 1847 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -1863,7 +1866,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -1884,7 +1887,7 @@ fi
if test x$ac_cv_func_connect = xno; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:1888: checking for connect in -lsocket" >&5
+echo "configure:1891: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1892,7 +1895,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1896 "configure"
+#line 1899 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1903,7 +1906,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2299,12 +2302,12 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:2303: checking for Cygwin environment" >&5
+echo "configure:2306: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2311 "configure"
#include "confdefs.h"
int main() {
@@ -2315,7 +2318,7 @@ int main() {
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:2319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -2332,19 +2335,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:2336: checking for mingw32 environment" >&5
+echo "configure:2339: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2341 "configure"
+#line 2344 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:2348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -2361,7 +2364,7 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6
MINGW32=
test "$ac_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2365: checking how to run the C preprocessor" >&5
+echo "configure:2368: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -2376,13 +2379,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2380 "configure"
+#line 2383 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2393,13 +2396,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2397 "configure"
+#line 2400 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2410,13 +2413,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2414 "configure"
+#line 2417 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2516,7 +2519,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:2520: checking host system type" >&5
+echo "configure:2523: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -2537,7 +2540,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:2541: checking build system type" >&5
+echo "configure:2544: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -2566,7 +2569,7 @@ ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:2570: checking for ld used by GCC" >&5
+echo "configure:2573: checking for ld used by GCC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -2596,10 +2599,10 @@ echo "configure:2570: checking for ld used by GCC" >&5
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:2600: checking for GNU ld" >&5
+echo "configure:2603: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:2603: checking for non-GNU ld" >&5
+echo "configure:2606: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2634,7 +2637,7 @@ else
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:2638: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:2641: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2651,7 +2654,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:2655: checking for $LD option to reload object files" >&5
+echo "configure:2658: checking for $LD option to reload object files" >&5
if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2663,7 +2666,7 @@ reload_flag=$lt_cv_ld_reload_flag
test -n "$reload_flag" && reload_flag=" $reload_flag"
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2667: checking for BSD-compatible nm" >&5
+echo "configure:2670: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2701,7 +2704,7 @@ NM="$lt_cv_path_NM"
echo "$ac_t""$NM" 1>&6
echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
-echo "configure:2705: checking for a sed that does not truncate output" >&5
+echo "configure:2708: checking for a sed that does not truncate output" >&5
if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2785,7 +2788,7 @@ fi
echo "$ac_t""$SED" 1>&6
echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
-echo "configure:2789: checking how to recognise dependent libraries" >&5
+echo "configure:2792: checking how to recognise dependent libraries" >&5
if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2971,13 +2974,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2975: checking for object suffix" >&5
+echo "configure:2978: checking for object suffix" >&5
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -2997,7 +3000,7 @@ ac_objext=$ac_cv_objext
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:3001: checking for executable suffix" >&5
+echo "configure:3004: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3007,7 +3010,7 @@ else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:3014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -3038,7 +3041,7 @@ fi
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:3042: checking command to parse $NM output" >&5
+echo "configure:3045: checking command to parse $NM output" >&5
if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3121,10 +3124,10 @@ void nm_test_func(){}
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:3128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo configure:3128: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+ if { (eval echo configure:3131: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -3175,7 +3178,7 @@ EOF
save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
- if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+ if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS="$save_LIBS"
@@ -3224,17 +3227,17 @@ for ac_hdr in dlfcn.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3228: checking for $ac_hdr" >&5
+echo "configure:3231: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3233 "configure"
+#line 3236 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3270,7 +3273,7 @@ case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:3274: checking for ${ac_tool_prefix}file" >&5
+echo "configure:3277: checking for ${ac_tool_prefix}file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3332,7 +3335,7 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:3336: checking for file" >&5
+echo "configure:3339: checking for file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3403,7 +3406,7 @@ esac
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3407: checking for $ac_word" >&5
+echo "configure:3410: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3436,7 +3439,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3440: checking for $ac_word" >&5
+echo "configure:3443: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3472,7 +3475,7 @@ fi
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3476: checking for $ac_word" >&5
+echo "configure:3479: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3505,7 +3508,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3509: checking for $ac_word" >&5
+echo "configure:3512: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3555,8 +3558,8 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3559 "configure"' > conftest.$ac_ext
- if { (eval echo configure:3560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 3562 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:3563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -32"
@@ -3577,7 +3580,7 @@ case $host in
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:3581: checking whether the C compiler needs -belf" >&5
+echo "configure:3584: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3590,14 +3593,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 3594 "configure"
+#line 3597 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_needs_belf=yes
else
@@ -3719,7 +3722,7 @@ compiler="$2"
## FIXME: this should be a separate macro
##
echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:3723: checking for objdir" >&5
+echo "configure:3726: checking for objdir" >&5
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
@@ -3750,7 +3753,7 @@ test -z "$pic_mode" && pic_mode=default
# in isolation, and that seeing it set (from the cache) indicates that
# the associated values are set (in the cache) correctly too.
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:3754: checking for $compiler option to produce PIC" >&5
+echo "configure:3757: checking for $compiler option to produce PIC" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3898,21 +3901,21 @@ else
# Check to make sure the pic_flag actually works.
echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:3902: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo "configure:3905: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 3909 "configure"
+#line 3912 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
case $host_os in
hpux9* | hpux10* | hpux11*)
@@ -3968,7 +3971,7 @@ fi
## FIXME: this should be a separate macro
##
echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:3972: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "configure:3975: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3976,14 +3979,14 @@ else
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
cat > conftest.$ac_ext <<EOF
-#line 3980 "configure"
+#line 3983 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_prog_cc_static_works=yes
else
@@ -4014,7 +4017,7 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared"
##
# Check to see if options -o and -c are simultaneously supported by compiler
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:4018: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:4021: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4033,7 +4036,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:4037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4040: \"$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
@@ -4062,7 +4065,7 @@ echo "$ac_t""$compiler_c_o" 1>&6
if test x"$compiler_c_o" = x"yes"; then
# Check to see if we can write to a .lo
echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:4066: checking if $compiler supports -c -o file.lo" >&5
+echo "configure:4069: checking if $compiler supports -c -o file.lo" >&5
if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4073,14 +4076,14 @@ else
save_objext="$ac_objext"
ac_objext=lo
cat > conftest.$ac_ext <<EOF
-#line 4077 "configure"
+#line 4080 "configure"
#include "confdefs.h"
int main() {
int some_variable = 0;
; return 0; }
EOF
-if { (eval echo configure:4084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -4115,7 +4118,7 @@ hard_links="nottested"
if test "$compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:4119: checking if we can lock with hard links" >&5
+echo "configure:4122: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -4138,20 +4141,20 @@ fi
if test "$GCC" = yes; then
# Check to see if options -fno-rtti -fno-exceptions are supported by compiler
echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:4142: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:4145: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo "int some_variable = 0;" > conftest.$ac_ext
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
compiler_rtti_exceptions=no
cat > conftest.$ac_ext <<EOF
-#line 4148 "configure"
+#line 4151 "configure"
#include "confdefs.h"
int main() {
int some_variable = 0;
; return 0; }
EOF
-if { (eval echo configure:4155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -4182,7 +4185,7 @@ fi
##
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:4186: checking whether the linker ($LD) supports shared libraries" >&5
+echo "configure:4189: checking whether the linker ($LD) supports shared libraries" >&5
allow_undefined_flag=
no_undefined_flag=
@@ -4885,7 +4888,7 @@ test "$ld_shlibs" = no && can_build_shared=no
##
# Check hardcoding attributes.
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:4889: checking how to hardcode library paths into programs" >&5
+echo "configure:4892: checking how to hardcode library paths into programs" >&5
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var"; then
@@ -4917,7 +4920,7 @@ echo "$ac_t""$hardcode_action" 1>&6
striplib=
old_striplib=
echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:4921: checking whether stripping libraries is possible" >&5
+echo "configure:4924: checking whether stripping libraries is possible" >&5
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
@@ -4935,7 +4938,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
##
# PORTME Fill in your ld.so characteristics
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:4939: checking dynamic linker characteristics" >&5
+echo "configure:4942: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5363,7 +5366,7 @@ test "$dynamic_linker" = no && can_build_shared=no
##
# Report the final consequences.
echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:5367: checking if libtool supports shared libraries" >&5
+echo "configure:5370: checking if libtool supports shared libraries" >&5
echo "$ac_t""$can_build_shared" 1>&6
##
## END FIXME
@@ -5371,7 +5374,7 @@ echo "$ac_t""$can_build_shared" 1>&6
## FIXME: this should be a separate macro
##
echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-echo "configure:5375: checking whether to build shared libraries" >&5
+echo "configure:5378: checking whether to build shared libraries" >&5
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
@@ -5398,7 +5401,7 @@ echo "$ac_t""$enable_shared" 1>&6
## FIXME: this should be a separate macro
##
echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-echo "configure:5402: checking whether to build static libraries" >&5
+echo "configure:5405: checking whether to build static libraries" >&5
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
echo "$ac_t""$enable_static" 1>&6
@@ -5441,12 +5444,12 @@ else
*)
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:5445: checking for shl_load" >&5
+echo "configure:5448: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5450 "configure"
+#line 5453 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
@@ -5469,7 +5472,7 @@ shl_load();
; return 0; }
EOF
-if { (eval echo configure:5473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@@ -5487,7 +5490,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:5491: checking for shl_load in -ldld" >&5
+echo "configure:5494: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5495,7 +5498,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5499 "configure"
+#line 5502 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5506,7 +5509,7 @@ int main() {
shl_load()
; return 0; }
EOF
-if { (eval echo configure:5510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5525,12 +5528,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:5529: checking for dlopen" >&5
+echo "configure:5532: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5534 "configure"
+#line 5537 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -5553,7 +5556,7 @@ dlopen();
; return 0; }
EOF
-if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@@ -5571,7 +5574,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5575: checking for dlopen in -ldl" >&5
+echo "configure:5578: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5579,7 +5582,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5583 "configure"
+#line 5586 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5590,7 +5593,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:5594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5609,7 +5612,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:5613: checking for dlopen in -lsvld" >&5
+echo "configure:5616: checking for dlopen in -lsvld" >&5
ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5617,7 +5620,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5621 "configure"
+#line 5624 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5628,7 +5631,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:5632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5647,7 +5650,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:5651: checking for dld_link in -ldld" >&5
+echo "configure:5654: checking for dld_link in -ldld" >&5
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5655,7 +5658,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5659 "configure"
+#line 5662 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5666,7 +5669,7 @@ int main() {
dld_link()
; return 0; }
EOF
-if { (eval echo configure:5670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5722,7 +5725,7 @@ fi
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:5726: checking whether a program can dlopen itself" >&5
+echo "configure:5729: checking whether a program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5732,7 +5735,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 5736 "configure"
+#line 5739 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -5793,7 +5796,7 @@ int main ()
exit (status);
}
EOF
- if { (eval echo configure:5797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -5816,7 +5819,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
if test "x$lt_cv_dlopen_self" = xyes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:5820: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:5823: checking whether a statically linked program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5826,7 +5829,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 5830 "configure"
+#line 5833 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -5887,7 +5890,7 @@ int main ()
exit (status);
}
EOF
- if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:5894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -5938,14 +5941,14 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:5942: checking whether -lc should be explicitly linked in" >&5
+echo "configure:5945: checking whether -lc should be explicitly linked in" >&5
if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
$rm conftest*
echo 'static int dummy;' > conftest.$ac_ext
- if { (eval echo configure:5949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -5958,7 +5961,7 @@ else
libname=conftest
save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo configure:5962: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:5965: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
lt_cv_archive_cmds_need_lc=no
else
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index f5dac960f58..f967cc59da4 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -550,13 +550,12 @@ fi
-
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:560: checking for $ac_word" >&5
+echo "configure:559: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -587,7 +586,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:591: checking for $ac_word" >&5
+echo "configure:590: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -639,7 +638,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:643: checking for $ac_word" >&5
+echo "configure:642: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -672,7 +671,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:676: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:675: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -683,12 +682,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 687 "configure"
+#line 686 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -714,12 +713,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:717: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:723: checking whether we are using GNU C" >&5
+echo "configure:722: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -728,7 +727,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -747,7 +746,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:751: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:750: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -815,7 +814,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:819: checking for a BSD compatible install" >&5
+echo "configure:818: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -870,7 +869,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:874: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:873: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -897,7 +896,7 @@ else
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:901: checking whether ln -s works" >&5
+echo "configure:900: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -923,7 +922,7 @@ fi
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:927: checking for $ac_word" >&5
+echo "configure:926: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -958,7 +957,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:962: checking for yywrap in -l$ac_lib" >&5
+echo "configure:961: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -966,7 +965,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 970 "configure"
+#line 969 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -977,7 +976,7 @@ int main() {
yywrap()
; return 0; }
EOF
-if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1000,7 +999,7 @@ fi
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1004: checking how to run the C preprocessor" >&5
+echo "configure:1003: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1015,13 +1014,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1019 "configure"
+#line 1018 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1032,13 +1031,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1036 "configure"
+#line 1035 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1049,13 +1048,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1053 "configure"
+#line 1052 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1080,7 +1079,7 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1084: checking lex output file root" >&5
+echo "configure:1083: checking lex output file root" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1102,7 +1101,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
rm -f "${LEX_OUTPUT_ROOT}.c"
echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:1106: checking whether yytext is a pointer" >&5
+echo "configure:1105: checking whether yytext is a pointer" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1123,14 +1122,14 @@ int yywrap () { return 1; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1126 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_prog_lex_yytext_pointer=yes
else
@@ -1151,7 +1150,7 @@ EOF
else
echo $ac_n "checking whether yytext is an array of char""... $ac_c" 1>&6
-echo "configure:1155: checking whether yytext is an array of char" >&5
+echo "configure:1154: checking whether yytext is an array of char" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1174,14 +1173,14 @@ int yywrap () { return 1; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 1178 "configure"
+#line 1177 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_prog_lex_yytext_char=yes
else
@@ -1202,7 +1201,7 @@ EOF
else
echo $ac_n "checking whether yytext is an array of unsigned char""... $ac_c" 1>&6
-echo "configure:1206: checking whether yytext is an array of unsigned char" >&5
+echo "configure:1205: checking whether yytext is an array of unsigned char" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_uchar'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1224,14 +1223,14 @@ int yywrap () { return 1; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 1228 "configure"
+#line 1227 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_prog_lex_yytext_uchar=yes
else
@@ -1255,12 +1254,12 @@ fi
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1259: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1258: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1264 "configure"
+#line 1263 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1269,7 +1268,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1292,7 +1291,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1296: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1295: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -1311,7 +1310,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:1315: checking for loader (symbol LD)" >&5
+echo "configure:1314: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1325,7 +1324,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:1329: checking for archiver (symbol AR)" >&5
+echo "configure:1328: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1339,7 +1338,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:1343: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:1342: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1409,14 +1408,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:1413: checking where the main texmf tree is located" >&5
+echo "configure:1412: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -1425,17 +1423,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -1462,7 +1458,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
diff --git a/Build/source/texk/devnag/configure b/Build/source/texk/devnag/configure
index d2dc8563f1b..b34e2a9e834 100755
--- a/Build/source/texk/devnag/configure
+++ b/Build/source/texk/devnag/configure
@@ -911,7 +911,7 @@ esac
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -2215,7 +2215,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2273,7 +2274,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2389,7 +2391,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2443,7 +2446,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2488,7 +2492,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2532,7 +2537,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3078,7 +3084,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3281,7 +3288,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4147,6 +4155,11 @@ esac
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -4185,12 +4198,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure
index c00e96b4367..009aed243f8 100755
--- a/Build/source/texk/dtl/configure
+++ b/Build/source/texk/dtl/configure
@@ -1824,7 +1824,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3601,7 +3601,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4071,7 +4071,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6305,98 +6305,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6314: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6322 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6400: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6312: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6404,7 +6316,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6408 "configure"
+#line 6320 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6416,7 +6328,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6441,7 +6353,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6445: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6357: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6460,7 +6372,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6464: checking for loader (symbol LD)" >&5
+echo "configure:6376: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6474,7 +6386,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6478: checking for archiver (symbol AR)" >&5
+echo "configure:6390: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6488,7 +6400,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6492: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6404: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6558,14 +6470,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6562: checking where the main texmf tree is located" >&5
+echo "configure:6474: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -6574,17 +6485,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -6611,7 +6520,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -6669,7 +6578,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6673: checking for main in -lm" >&5
+echo "configure:6582: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6677,14 +6586,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6681 "configure"
+#line 6590 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6783,14 +6692,14 @@ fi
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:6787: checking whether char is unsigned" >&5
+echo "configure:6696: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 6794 "configure"
+#line 6703 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -6812,7 +6721,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6816 "configure"
+#line 6725 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -6822,7 +6731,7 @@ main() {
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -6846,7 +6755,7 @@ EOF
fi
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:6850: checking size of long" >&5
+echo "configure:6759: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6854,7 +6763,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6858 "configure"
+#line 6767 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -6865,7 +6774,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure
index e7420f17b21..db37cf30a82 100755
--- a/Build/source/texk/dvi2tty/configure
+++ b/Build/source/texk/dvi2tty/configure
@@ -1039,13 +1039,12 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1042: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -1054,17 +1053,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -1091,7 +1088,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure
index c891cef371f..073090c5a8b 100755
--- a/Build/source/texk/dvidvi/configure
+++ b/Build/source/texk/dvidvi/configure
@@ -1824,7 +1824,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3601,7 +3601,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4071,7 +4071,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6305,98 +6305,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6314: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6322 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6400: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6312: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6404,7 +6316,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6408 "configure"
+#line 6320 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6416,7 +6328,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6441,7 +6353,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6445: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6357: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6460,7 +6372,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6464: checking for loader (symbol LD)" >&5
+echo "configure:6376: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6474,7 +6386,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6478: checking for archiver (symbol AR)" >&5
+echo "configure:6390: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6488,7 +6400,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6492: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6404: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6558,14 +6470,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6562: checking where the main texmf tree is located" >&5
+echo "configure:6474: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -6574,17 +6485,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -6611,7 +6520,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -6669,7 +6578,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6673: checking for main in -lm" >&5
+echo "configure:6582: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6677,14 +6586,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6681 "configure"
+#line 6590 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6783,14 +6692,14 @@ fi
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:6787: checking whether char is unsigned" >&5
+echo "configure:6696: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 6794 "configure"
+#line 6703 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -6812,7 +6721,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6816 "configure"
+#line 6725 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -6822,7 +6731,7 @@ main() {
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -6846,7 +6755,7 @@ EOF
fi
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:6850: checking size of long" >&5
+echo "configure:6759: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6854,7 +6763,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6858 "configure"
+#line 6767 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -6865,7 +6774,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure
index c80782a4bc9..f5044944032 100755
--- a/Build/source/texk/dviljk/configure
+++ b/Build/source/texk/dviljk/configure
@@ -1039,6 +1039,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1042: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1098,7 +1101,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1102: checking how to run the C preprocessor" >&5
+echo "configure:1105: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1113,13 +1116,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1117 "configure"
+#line 1120 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1130,13 +1133,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1134 "configure"
+#line 1137 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1147,13 +1150,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1151 "configure"
+#line 1154 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1178,14 +1181,14 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:1182: checking whether char is unsigned" >&5
+echo "configure:1185: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 1189 "configure"
+#line 1192 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -1207,7 +1210,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1214 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -1217,7 +1220,7 @@ main() {
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:1221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -1241,7 +1244,7 @@ EOF
fi
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1245: checking size of long" >&5
+echo "configure:1248: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1249,7 +1252,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1253 "configure"
+#line 1256 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1260,7 +1263,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
diff --git a/Build/source/texk/dvipdfm/configure b/Build/source/texk/dvipdfm/configure
index fa1038cab5d..d7c4d2295ba 100755
--- a/Build/source/texk/dvipdfm/configure
+++ b/Build/source/texk/dvipdfm/configure
@@ -1160,6 +1160,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1163: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1285,7 +1288,7 @@ else
if test "$with_system_zlib" = yes; then
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:1289: checking for inflate in -lz" >&5
+echo "configure:1292: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1293,7 +1296,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1297 "configure"
+#line 1300 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1304,7 +1307,7 @@ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1340,17 +1343,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1344: checking for $ac_hdr" >&5
+echo "configure:1347: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1349 "configure"
+#line 1352 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1429,7 +1432,7 @@ else
if test "$with_system_pnglib" = yes; then
echo $ac_n "checking for png_set_read_fn in -lpng""... $ac_c" 1>&6
-echo "configure:1433: checking for png_set_read_fn in -lpng" >&5
+echo "configure:1436: checking for png_set_read_fn in -lpng" >&5
ac_lib_var=`echo png'_'png_set_read_fn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1437,7 +1440,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1441 "configure"
+#line 1444 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1448,7 +1451,7 @@ int main() {
png_set_read_fn()
; return 0; }
EOF
-if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1537,12 +1540,12 @@ TTF_OPT=''
# AC_SUBST(TEXMF)
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1541: checking for ANSI C header files" >&5
+echo "configure:1544: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1546 "configure"
+#line 1549 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1550,7 +1553,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1567,7 +1570,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1571 "configure"
+#line 1574 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1585,7 +1588,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1589 "configure"
+#line 1592 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1606,7 +1609,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1610 "configure"
+#line 1613 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1617,7 +1620,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1644,17 +1647,17 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1648: checking for $ac_hdr" >&5
+echo "configure:1651: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1653 "configure"
+#line 1656 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1682,16 +1685,16 @@ done
echo $ac_n "checking whether time.h defines timezone as an external variable""... $ac_c" 1>&6
-echo "configure:1686: checking whether time.h defines timezone as an external variable" >&5
+echo "configure:1689: checking whether time.h defines timezone as an external variable" >&5
cat > conftest.$ac_ext <<EOF
-#line 1688 "configure"
+#line 1691 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
-timezone;
; return 0; }
EOF
-if { (eval echo configure:1695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_TIMEZONE 1
@@ -1705,16 +1708,16 @@ else
fi
rm -f conftest*
echo $ac_n "checking whether struct tz has tm_gmtoff as a member""... $ac_c" 1>&6
-echo "configure:1709: checking whether struct tz has tm_gmtoff as a member" >&5
+echo "configure:1712: checking whether struct tz has tm_gmtoff as a member" >&5
cat > conftest.$ac_ext <<EOF
-#line 1711 "configure"
+#line 1714 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
struct tm *tp; tp->tm_gmtoff
; return 0; }
EOF
-if { (eval echo configure:1718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_TM_GMTOFF 1
@@ -1729,12 +1732,12 @@ fi
rm -f conftest*
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1733: checking for working const" >&5
+echo "configure:1736: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1738 "configure"
+#line 1741 "configure"
#include "confdefs.h"
int main() {
@@ -1783,7 +1786,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1804,12 +1807,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1808: checking for size_t" >&5
+echo "configure:1811: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1813 "configure"
+#line 1816 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1840,12 +1843,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:1844: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:1847: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1849 "configure"
+#line 1852 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -1853,7 +1856,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:1857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -1875,7 +1878,7 @@ fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:1879: checking for 8-bit clean memcmp" >&5
+echo "configure:1882: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1883,7 +1886,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 1887 "configure"
+#line 1890 "configure"
#include "confdefs.h"
main()
@@ -1893,7 +1896,7 @@ main()
}
EOF
-if { (eval echo configure:1897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -1913,12 +1916,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
for ac_func in strspn system
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1917: checking for $ac_func" >&5
+echo "configure:1920: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1922 "configure"
+#line 1925 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1941,7 +1944,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1966,7 +1969,7 @@ fi
done
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:1970: checking for main in -lm" >&5
+echo "configure:1973: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1974,14 +1977,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1981 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 00c05f4fde5..fd6f130788c 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -2960,6 +2960,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:2963: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -3024,7 +3027,7 @@ EOF
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:3028: checking for main in -lm" >&5
+echo "configure:3031: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3032,14 +3035,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3036 "configure"
+#line 3039 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3067,7 +3070,7 @@ else
fi
echo $ac_n "checking for basename in -lgen""... $ac_c" 1>&6
-echo "configure:3071: checking for basename in -lgen" >&5
+echo "configure:3074: checking for basename in -lgen" >&5
ac_lib_var=`echo gen'_'basename | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3075,7 +3078,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3079 "configure"
+#line 3082 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3086,7 +3089,7 @@ int main() {
basename()
; return 0; }
EOF
-if { (eval echo configure:3090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index ed9c57caaca..21cbd655e9d 100755
--- a/Build/source/texk/dvipsk/configure
+++ b/Build/source/texk/dvipsk/configure
@@ -1078,6 +1078,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1081: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1147,7 +1150,7 @@ cross_compiling=no
fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1151: checking size of int" >&5
+echo "configure:1154: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1155,7 +1158,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1159 "configure"
+#line 1162 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1166,7 +1169,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure
index 3f9fef7a551..6307185b4cb 100755
--- a/Build/source/texk/gsftopk/configure
+++ b/Build/source/texk/gsftopk/configure
@@ -1039,6 +1039,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1042: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1098,12 +1101,12 @@ fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1102: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1105: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1107 "configure"
+#line 1110 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -1119,7 +1122,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:1123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -1140,12 +1143,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1144: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1147: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1149 "configure"
+#line 1152 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1154,7 +1157,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1175,7 +1178,7 @@ EOF
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1179: checking how to run the C preprocessor" >&5
+echo "configure:1182: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1190,13 +1193,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1194 "configure"
+#line 1197 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1207,13 +1210,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1214 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1224,13 +1227,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1228 "configure"
+#line 1231 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1258,17 +1261,17 @@ for ac_hdr in poll.h sys/time.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1262: checking for $ac_hdr" >&5
+echo "configure:1265: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1267 "configure"
+#line 1270 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1296,12 +1299,12 @@ done
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1300: checking for ANSI C header files" >&5
+echo "configure:1303: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1305 "configure"
+#line 1308 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1309,7 +1312,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1326,7 +1329,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1330 "configure"
+#line 1333 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1344,7 +1347,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1348 "configure"
+#line 1351 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1365,7 +1368,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1369 "configure"
+#line 1372 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1376,7 +1379,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1400,12 +1403,12 @@ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1404: checking for pid_t" >&5
+echo "configure:1407: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1409 "configure"
+#line 1412 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1437,17 +1440,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1441: checking for vfork.h" >&5
+echo "configure:1444: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1446 "configure"
+#line 1449 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1472,18 +1475,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1476: checking for working vfork" >&5
+echo "configure:1479: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:1482: checking for vfork" >&5
+echo "configure:1485: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1487 "configure"
+#line 1490 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -1506,7 +1509,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -1528,7 +1531,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1535 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -1623,7 +1626,7 @@ main() {
}
}
EOF
-if { (eval echo configure:1627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -1646,12 +1649,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1650: checking return type of signal handlers" >&5
+echo "configure:1653: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1655 "configure"
+#line 1658 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1668,7 +1671,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1689,12 +1692,12 @@ EOF
for ac_func in poll sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1693: checking for $ac_func" >&5
+echo "configure:1696: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1698 "configure"
+#line 1701 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1717,7 +1720,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1747,17 +1750,17 @@ if test "$ac_cv_header_poll_h" = no || test "$ac_cv_func_poll" = no; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1751: checking for $ac_hdr" >&5
+echo "configure:1754: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1756 "configure"
+#line 1759 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 47f17bab956..d9e665337f1 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -6479,6 +6479,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:6482: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -6583,7 +6586,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6587: checking for main in -lm" >&5
+echo "configure:6590: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6591,14 +6594,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6595 "configure"
+#line 6598 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/Build/source/texk/lacheck/configure b/Build/source/texk/lacheck/configure
index feb5f13d109..f6d12e80bd6 100755
--- a/Build/source/texk/lacheck/configure
+++ b/Build/source/texk/lacheck/configure
@@ -1824,7 +1824,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3601,7 +3601,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4071,7 +4071,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6305,98 +6305,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6314: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6322 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6400: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6312: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6404,7 +6316,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6408 "configure"
+#line 6320 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6416,7 +6328,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6441,7 +6353,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6445: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6357: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6460,7 +6372,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6464: checking for loader (symbol LD)" >&5
+echo "configure:6376: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6474,7 +6386,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6478: checking for archiver (symbol AR)" >&5
+echo "configure:6390: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6488,7 +6400,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6492: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6404: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6558,14 +6470,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6562: checking where the main texmf tree is located" >&5
+echo "configure:6474: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -6574,17 +6485,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -6611,7 +6520,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -6669,7 +6578,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6673: checking for main in -lm" >&5
+echo "configure:6582: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6677,14 +6586,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6681 "configure"
+#line 6590 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6783,14 +6692,14 @@ fi
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:6787: checking whether char is unsigned" >&5
+echo "configure:6696: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 6794 "configure"
+#line 6703 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -6812,7 +6721,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6816 "configure"
+#line 6725 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -6822,7 +6731,7 @@ main() {
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -6846,7 +6755,7 @@ EOF
fi
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:6850: checking size of long" >&5
+echo "configure:6759: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6854,7 +6763,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6858 "configure"
+#line 6767 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -6865,7 +6774,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -6889,7 +6798,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6893: checking for $ac_word" >&5
+echo "configure:6802: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6923,7 +6832,7 @@ test -n "$YACC" || YACC="yacc"
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6927: checking for $ac_word" >&5
+echo "configure:6836: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6958,7 +6867,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:6962: checking for yywrap in -l$ac_lib" >&5
+echo "configure:6871: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6966,7 +6875,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6970 "configure"
+#line 6879 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -6977,7 +6886,7 @@ int main() {
yywrap()
; return 0; }
EOF
-if { (eval echo configure:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7000,7 +6909,7 @@ fi
fi
echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:7004: checking lex output file root" >&5
+echo "configure:6913: checking lex output file root" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7022,7 +6931,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
rm -f "${LEX_OUTPUT_ROOT}.c"
echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:7026: checking whether yytext is a pointer" >&5
+echo "configure:6935: checking whether yytext is a pointer" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7043,14 +6952,14 @@ int yywrap () { return 1; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 7047 "configure"
+#line 6956 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:7054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_prog_lex_yytext_pointer=yes
else
@@ -7071,7 +6980,7 @@ EOF
else
echo $ac_n "checking whether yytext is an array of char""... $ac_c" 1>&6
-echo "configure:7075: checking whether yytext is an array of char" >&5
+echo "configure:6984: checking whether yytext is an array of char" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7094,14 +7003,14 @@ int yywrap () { return 1; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 7098 "configure"
+#line 7007 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_prog_lex_yytext_char=yes
else
@@ -7122,7 +7031,7 @@ EOF
else
echo $ac_n "checking whether yytext is an array of unsigned char""... $ac_c" 1>&6
-echo "configure:7126: checking whether yytext is an array of unsigned char" >&5
+echo "configure:7035: checking whether yytext is an array of unsigned char" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_uchar'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7144,14 +7053,14 @@ int yywrap () { return 1; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 7148 "configure"
+#line 7057 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:7155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_prog_lex_yytext_uchar=yes
else
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index af1e552ca16..27c32a1a366 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -1039,6 +1039,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1042: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1117,7 +1120,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1121: checking how to run the C preprocessor" >&5
+echo "configure:1124: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1132,13 +1135,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1136 "configure"
+#line 1139 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1149,13 +1152,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1153 "configure"
+#line 1156 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1166,13 +1169,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1170 "configure"
+#line 1173 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1200,17 +1203,17 @@ for ac_hdr in ctype.h types.h locale.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1204: checking for $ac_hdr" >&5
+echo "configure:1207: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1209 "configure"
+#line 1212 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1239,12 +1242,12 @@ done
for ac_func in strchr strrchr setlocale
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1243: checking for $ac_func" >&5
+echo "configure:1246: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1248 "configure"
+#line 1251 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1267,7 +1270,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
diff --git a/Build/source/texk/musixflx/configure b/Build/source/texk/musixflx/configure
index d7e5967ffcc..9d4b937a952 100755
--- a/Build/source/texk/musixflx/configure
+++ b/Build/source/texk/musixflx/configure
@@ -1824,7 +1824,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3601,7 +3601,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4071,7 +4071,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6305,98 +6305,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6314: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6322 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6400: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6312: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6404,7 +6316,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6408 "configure"
+#line 6320 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6416,7 +6328,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6441,7 +6353,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6445: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6357: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6460,7 +6372,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6464: checking for loader (symbol LD)" >&5
+echo "configure:6376: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6474,7 +6386,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6478: checking for archiver (symbol AR)" >&5
+echo "configure:6390: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6488,7 +6400,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6492: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6404: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6558,14 +6470,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6562: checking where the main texmf tree is located" >&5
+echo "configure:6474: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -6574,17 +6485,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -6611,7 +6520,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -6669,7 +6578,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6673: checking for main in -lm" >&5
+echo "configure:6582: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6677,14 +6586,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6681 "configure"
+#line 6590 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6783,14 +6692,14 @@ fi
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:6787: checking whether char is unsigned" >&5
+echo "configure:6696: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 6794 "configure"
+#line 6703 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
@@ -6812,7 +6721,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6816 "configure"
+#line 6725 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
@@ -6822,7 +6731,7 @@ main() {
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
@@ -6846,7 +6755,7 @@ EOF
fi
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:6850: checking size of long" >&5
+echo "configure:6759: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6854,7 +6763,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6858 "configure"
+#line 6767 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -6865,7 +6774,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
diff --git a/Build/source/texk/owindvi/configure b/Build/source/texk/owindvi/configure
index 8983e01078f..db1477e403d 100755
--- a/Build/source/texk/owindvi/configure
+++ b/Build/source/texk/owindvi/configure
@@ -1828,7 +1828,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3605,7 +3605,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4075,7 +4075,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6309,98 +6309,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6318: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6326 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6404: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6316: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6408,7 +6320,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6412 "configure"
+#line 6324 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6420,7 +6332,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6445,7 +6357,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6449: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6361: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6464,7 +6376,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6468: checking for loader (symbol LD)" >&5
+echo "configure:6380: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6478,7 +6390,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6482: checking for archiver (symbol AR)" >&5
+echo "configure:6394: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6492,7 +6404,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6496: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6408: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6562,7 +6474,10 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6566: checking where the main texmf tree is located" >&5
+echo "configure:6478: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -6667,7 +6582,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6671: checking for main in -lm" >&5
+echo "configure:6586: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6675,14 +6590,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6679 "configure"
+#line 6594 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6780,18 +6695,21 @@ fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6784: checking for pid_t" >&5
+echo "configure:6699: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6789 "configure"
+#line 6704 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
@@ -6814,17 +6732,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:6818: checking for vfork.h" >&5
+echo "configure:6736: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6823 "configure"
+#line 6741 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6849,18 +6767,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:6853: checking for working vfork" >&5
+echo "configure:6771: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:6859: checking for vfork" >&5
+echo "configure:6777: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6864 "configure"
+#line 6782 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -6883,7 +6801,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -6905,7 +6823,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 6909 "configure"
+#line 6827 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -7000,7 +6918,7 @@ main() {
}
}
EOF
-if { (eval echo configure:7004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -7023,12 +6941,12 @@ EOF
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:7027: checking for vprintf" >&5
+echo "configure:6945: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7032 "configure"
+#line 6950 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -7051,7 +6969,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:7055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -7075,12 +6993,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:7079: checking for _doprnt" >&5
+echo "configure:6997: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7084 "configure"
+#line 7002 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -7103,7 +7021,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:7107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -7128,7 +7046,7 @@ fi
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:7132: checking for 8-bit clean memcmp" >&5
+echo "configure:7050: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7136,7 +7054,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 7140 "configure"
+#line 7058 "configure"
#include "confdefs.h"
main()
@@ -7146,7 +7064,7 @@ main()
}
EOF
-if { (eval echo configure:7150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -7164,12 +7082,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:7168: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:7086: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7173 "configure"
+#line 7091 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -7185,7 +7103,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:7189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -7206,12 +7124,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:7210: checking return type of signal handlers" >&5
+echo "configure:7128: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7215 "configure"
+#line 7133 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -7228,7 +7146,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:7232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -7251,12 +7169,12 @@ EOF
for ac_func in memcpy strerror waitpid poll sigaction strrchr strchr
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7255: checking for $ac_func" >&5
+echo "configure:7173: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7260 "configure"
+#line 7178 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -7279,7 +7197,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:7283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -7307,17 +7225,17 @@ for ac_hdr in netdb.h sys/bsdtypes.h poll.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7311: checking for $ac_hdr" >&5
+echo "configure:7229: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7316 "configure"
+#line 7234 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7346,7 +7264,7 @@ done
# For the bitmap size.
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:7350: checking size of long" >&5
+echo "configure:7268: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7354,7 +7272,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 7358 "configure"
+#line 7276 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -7365,7 +7283,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:7369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -7387,12 +7305,12 @@ EOF
# Do we have the SIGIO signal (and F_SETOWN and FASYNC)?
echo $ac_n "checking for SIGIO""... $ac_c" 1>&6
-echo "configure:7391: checking for SIGIO" >&5
+echo "configure:7309: checking for SIGIO" >&5
if eval "test \"`echo '$''{'kb_cv_sys_sigio'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7396 "configure"
+#line 7314 "configure"
#include "confdefs.h"
#include <signal.h>
#include <fcntl.h>
@@ -7400,7 +7318,7 @@ int main() {
int x = SIGIO + F_SETOWN + FASYNC;
; return 0; }
EOF
-if { (eval echo configure:7404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
kb_cv_sys_sigio=yes
else
@@ -7470,17 +7388,17 @@ else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7474: checking for $ac_hdr" >&5
+echo "configure:7392: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7479 "configure"
+#line 7397 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -7527,7 +7445,7 @@ if test $libwww_include_found = yes; then
www_ldflags=-lwww
libwww_libdir_found=yes
echo $ac_n "checking for HTParse in -lwww""... $ac_c" 1>&6
-echo "configure:7531: checking for HTParse in -lwww" >&5
+echo "configure:7449: checking for HTParse in -lwww" >&5
ac_lib_var=`echo www'_'HTParse | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7535,7 +7453,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lwww $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7539 "configure"
+#line 7457 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7546,7 +7464,7 @@ int main() {
HTParse()
; return 0; }
EOF
-if { (eval echo configure:7550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7605,7 +7523,7 @@ if test -z "$x_ext_lib"; then # allow envvar override
XLFLAG=
fi
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:7609: checking for XextCreateExtension in -lXext" >&5
+echo "configure:7527: checking for XextCreateExtension in -lXext" >&5
ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7613,7 +7531,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7617 "configure"
+#line 7535 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7624,7 +7542,7 @@ int main() {
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:7628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7672,7 +7590,7 @@ if echo "$PS_DEF" | grep PS_DPS >/dev/null; then
echo "$ac_t""adding DPS includes and libraries for Solaris" 1>&6
X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11"
echo $ac_n "checking for isinf in -lsunmath""... $ac_c" 1>&6
-echo "configure:7676: checking for isinf in -lsunmath" >&5
+echo "configure:7594: checking for isinf in -lsunmath" >&5
ac_lib_var=`echo sunmath'_'isinf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7680,7 +7598,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsunmath $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7684 "configure"
+#line 7602 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -7691,7 +7609,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:7695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -7718,12 +7636,12 @@ fi
for ac_func in isinf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7722: checking for $ac_func" >&5
+echo "configure:7640: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7727 "configure"
+#line 7645 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -7746,7 +7664,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:7750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -7774,17 +7692,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7778: checking for $ac_hdr" >&5
+echo "configure:7696: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7783 "configure"
+#line 7701 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pkm/configure
index 676e28e5ff8..627e9068cdc 100755
--- a/Build/source/texk/ps2pkm/configure
+++ b/Build/source/texk/ps2pkm/configure
@@ -1039,6 +1039,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1042: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1097,7 +1100,7 @@ fi
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:1101: checking for main in -lm" >&5
+echo "configure:1104: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1105,14 +1108,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1109 "configure"
+#line 1112 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1141,7 +1144,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1145: checking how to run the C preprocessor" >&5
+echo "configure:1148: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1156,13 +1159,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1160 "configure"
+#line 1163 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1173,13 +1176,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1177 "configure"
+#line 1180 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1190,13 +1193,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1194 "configure"
+#line 1197 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1221,12 +1224,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1225: checking for ANSI C header files" >&5
+echo "configure:1228: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1230 "configure"
+#line 1233 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1234,7 +1237,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1251,7 +1254,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1255 "configure"
+#line 1258 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1269,7 +1272,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1273 "configure"
+#line 1276 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1290,7 +1293,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1294 "configure"
+#line 1297 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1301,7 +1304,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1328,17 +1331,17 @@ for ac_hdr in fcntl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1332: checking for $ac_hdr" >&5
+echo "configure:1335: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1337 "configure"
+#line 1340 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1366,12 +1369,12 @@ done
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1370: checking for vprintf" >&5
+echo "configure:1373: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1375 "configure"
+#line 1378 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -1394,7 +1397,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1418,12 +1421,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1422: checking for _doprnt" >&5
+echo "configure:1425: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1427 "configure"
+#line 1430 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -1446,7 +1449,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:1450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1473,12 +1476,12 @@ fi
for ac_func in memset
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1477: checking for $ac_func" >&5
+echo "configure:1480: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1482 "configure"
+#line 1485 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1501,7 +1504,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure
index 0f6781ef900..968e8ab8a36 100755
--- a/Build/source/texk/seetexk/configure
+++ b/Build/source/texk/seetexk/configure
@@ -1825,7 +1825,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3602,7 +3602,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4072,7 +4072,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6306,98 +6306,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6315: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6323 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6401: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6313: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6405,7 +6317,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6409 "configure"
+#line 6321 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6417,7 +6329,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6442,7 +6354,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6446: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6358: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6461,7 +6373,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6465: checking for loader (symbol LD)" >&5
+echo "configure:6377: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6475,7 +6387,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6479: checking for archiver (symbol AR)" >&5
+echo "configure:6391: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6489,7 +6401,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6493: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6405: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6559,14 +6471,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6563: checking where the main texmf tree is located" >&5
+echo "configure:6475: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -6575,17 +6486,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -6612,7 +6521,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -6670,7 +6579,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6674: checking for main in -lm" >&5
+echo "configure:6583: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6678,14 +6587,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6682 "configure"
+#line 6591 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6783,7 +6692,7 @@ fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:6787: checking size of int" >&5
+echo "configure:6696: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6791,7 +6700,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6795 "configure"
+#line 6704 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -6802,7 +6711,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -6824,12 +6733,12 @@ EOF
for ac_func in strerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6828: checking for $ac_func" >&5
+echo "configure:6737: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6833 "configure"
+#line 6742 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6852,7 +6761,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:6856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -6880,17 +6789,17 @@ for ac_hdr in errno.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6884: checking for $ac_hdr" >&5
+echo "configure:6793: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6889 "configure"
+#line 6798 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
diff --git a/Build/source/texk/tetex/configure b/Build/source/texk/tetex/configure
index 87f89bc1c7d..ba75b8843a4 100755
--- a/Build/source/texk/tetex/configure
+++ b/Build/source/texk/tetex/configure
@@ -1037,6 +1037,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1040: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure
index 21464034feb..609ca52742a 100755
--- a/Build/source/texk/tex4htk/configure
+++ b/Build/source/texk/tex4htk/configure
@@ -1825,7 +1825,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3602,7 +3602,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4072,7 +4072,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6306,98 +6306,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6315: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6323 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6401: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6313: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6405,7 +6317,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6409 "configure"
+#line 6321 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6417,7 +6329,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6442,7 +6354,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6446: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6358: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6461,7 +6373,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6465: checking for loader (symbol LD)" >&5
+echo "configure:6377: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6475,7 +6387,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6479: checking for archiver (symbol AR)" >&5
+echo "configure:6391: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6489,7 +6401,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6493: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6405: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6559,14 +6471,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6563: checking where the main texmf tree is located" >&5
+echo "configure:6475: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -6575,17 +6486,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -6612,7 +6521,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -6670,7 +6579,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6674: checking for main in -lm" >&5
+echo "configure:6583: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6678,14 +6587,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6682 "configure"
+#line 6591 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6783,7 +6692,7 @@ fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:6787: checking size of int" >&5
+echo "configure:6696: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6791,7 +6700,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 6795 "configure"
+#line 6704 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -6802,7 +6711,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:6806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure
index 3dad967400d..c25c45e7b55 100755
--- a/Build/source/texk/texlive/configure
+++ b/Build/source/texk/texlive/configure
@@ -1853,7 +1853,7 @@ darwin* | rhapsody*)
esac
;;
-freebsd*)
+freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3630,7 +3630,7 @@ else
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
+ freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -4100,7 +4100,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd*-gnu*)
+kfreebsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -6334,98 +6334,10 @@ EOF
fi
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6
-echo "configure:6343: checking whether putenv uses malloc" >&5
-if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- kb_cv_func_putenv_malloc=no
-else
- cat > conftest.$ac_ext <<EOF
-#line 6351 "configure"
-#include "confdefs.h"
-
-#define VAR "YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!" /* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-extern char *malloc (); /* ditto */
-main ()
-{
- char *str1, *rstr1, *str2, *rstr2;
- str1 = getenv (VAR);
- if (str1)
- exit (1);
- str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
- if (str1 == 0)
- exit (2);
- strcpy (str1, VAR);
- strcat (str1, "=");
- strcat (str1, STRING1);
- if (putenv (str1) < 0)
- exit (3);
- rstr1 = getenv (VAR);
- if (rstr1 == 0)
- exit (4);
- rstr1 -= strlen (VAR) + 1;
- if (strncmp (rstr1, VAR, strlen (VAR)))
- exit (5);
- str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
- if (str2 == 0 || str1 == str2)
- exit (6);
- strcpy (str2, VAR);
- strcat (str2, "=");
- strcat (str2, STRING2);
- if (putenv (str2) < 0)
- exit (7);
- rstr2 = getenv (VAR);
- if (rstr2 == 0)
- exit (8);
- rstr2 -= strlen (VAR) + 1;
-#if 0
- printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
- /*
- * If string from first call was reused for the second call,
- * you had better not do a free on the first string!
- */
- if (rstr1 == rstr2)
- printf ("#define SMART_PUTENV\n");
- else
- printf ("#undef SMART_PUTENV\n");
-#endif
- exit (rstr1 == rstr2 ? 0 : 1);
-}
-EOF
-if { (eval echo configure:6405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- kb_cv_func_putenv_malloc=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- kb_cv_func_putenv_malloc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$kb_cv_func_putenv_malloc" 1>&6
-if test $kb_cv_func_putenv_malloc = yes; then
- cat >> confdefs.h <<\EOF
-#define SMART_PUTENV 1
-EOF
-
-fi
-
if test $ac_cv_func_getcwd = yes; then
# We only need to run this if we have getcwd.
echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6
-echo "configure:6429: checking whether getcwd uses fork or vfork" >&5
+echo "configure:6341: checking whether getcwd uses fork or vfork" >&5
if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6433,7 +6345,7 @@ else
kb_cv_func_getcwd_forks=no
else
cat > conftest.$ac_ext <<EOF
-#line 6437 "configure"
+#line 6349 "configure"
#include "confdefs.h"
int fork() { exit(1); }
@@ -6445,7 +6357,7 @@ getcwd(path,100);
return 0;
}
EOF
-if { (eval echo configure:6449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
kb_cv_func_getcwd_forks=no
else
@@ -6470,7 +6382,7 @@ fi
# Common --with and --enable options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6474: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6386: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -6489,7 +6401,7 @@ fi
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:6493: checking for loader (symbol LD)" >&5
+echo "configure:6405: checking for loader (symbol LD)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6503,7 +6415,7 @@ echo "$ac_t""$LD" 1>&6
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:6507: checking for archiver (symbol AR)" >&5
+echo "configure:6419: checking for archiver (symbol AR)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6517,7 +6429,7 @@ echo "$ac_t""$AR" 1>&6
echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6
-echo "configure:6521: checking for archiver options (symbol ARFLAGS)" >&5
+echo "configure:6433: checking for archiver options (symbol ARFLAGS)" >&5
if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6587,14 +6499,13 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
-echo "configure:6591: checking where the main texmf tree is located" >&5
+echo "configure:6503: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -6603,17 +6514,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -6640,7 +6549,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -6698,7 +6607,7 @@ fi
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:6702: checking for main in -lm" >&5
+echo "configure:6611: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6706,14 +6615,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6710 "configure"
+#line 6619 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure
index 674a47cc9f8..60740f861a3 100755
--- a/Build/source/texk/ttf2pk/configure
+++ b/Build/source/texk/ttf2pk/configure
@@ -1045,13 +1045,12 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1048: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
-if test -n "$TEXMFMAIN"; then
- texmfmain="$TEXMFMAIN"
- echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6
-
-elif test "x$datadir" != 'x${prefix}/share'; then
- # datadir is explicitly defined, assume datadir/texmf.
+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'`
@@ -1060,17 +1059,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then
echo "$ac_t"""$texmfmain"" 1>&6
else
echo "$ac_t""not found" 1>&6
- echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2
- echo "configure: warning: proceeding anyway.
+ echo "configure: warning: No texmf tree found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
- * If you do not have the files, you should be able to find them *
- * at the same place you got these sources, or from one of the *
- * CTAN hosts. Good luck. *
+ * 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. *
*****************************************************************
-" 1>&2
+ Winging it." 1>&2
fi
-
else
# Second case, datadir is default...
if test "x$prefix" = "xNONE"; then
@@ -1097,7 +1094,7 @@ else
echo "$ac_t""not found" 1>&6
echo "configure: warning: The main texmf tree was not found at $texmfmain.
*****************************************************************
- * Warning: The main texmf tree was not found. *
+ * 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 *
@@ -1155,7 +1152,7 @@ else
if test "$with_system_freetype" = yes; then
echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
-echo "configure:1159: checking for TT_Init_FreeType in -lttf" >&5
+echo "configure:1156: checking for TT_Init_FreeType in -lttf" >&5
ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1163,7 +1160,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lttf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1167 "configure"
+#line 1164 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1174,7 +1171,7 @@ int main() {
TT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1207,7 +1204,7 @@ fi
if test "$with_system_freetype" = yes; then
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1211: checking how to run the C preprocessor" >&5
+echo "configure:1208: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1222,13 +1219,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1226 "configure"
+#line 1223 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1239,13 +1236,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1243 "configure"
+#line 1240 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1256,13 +1253,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1260 "configure"
+#line 1257 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1290,17 +1287,17 @@ for ac_hdr in freetype.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1294: checking for $ac_hdr" >&5
+echo "configure:1291: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1299 "configure"
+#line 1296 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1355,7 +1352,7 @@ fi
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:1359: checking for main in -lm" >&5
+echo "configure:1356: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1363,14 +1360,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1367 "configure"
+#line 1364 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index efaab7924de..9f1fd0b010e 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -2403,6 +2403,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:2406: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -2528,7 +2531,7 @@ else
if test "$with_system_zlib" = yes; then
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:2532: checking for inflate in -lz" >&5
+echo "configure:2535: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2536,7 +2539,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2540 "configure"
+#line 2543 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2547,7 +2550,7 @@ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:2551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2583,17 +2586,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2587: checking for $ac_hdr" >&5
+echo "configure:2590: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2592 "configure"
+#line 2595 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2672,7 +2675,7 @@ else
if test "$with_system_pnglib" = yes; then
echo $ac_n "checking for png_set_read_fn in -lpng""... $ac_c" 1>&6
-echo "configure:2676: checking for png_set_read_fn in -lpng" >&5
+echo "configure:2679: checking for png_set_read_fn in -lpng" >&5
ac_lib_var=`echo png'_'png_set_read_fn | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2680,7 +2683,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2684 "configure"
+#line 2687 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2691,7 +2694,7 @@ int main() {
png_set_read_fn()
; return 0; }
EOF
-if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2829,7 +2832,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2833: checking for $ac_word" >&5
+echo "configure:2836: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2862,7 +2865,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2866: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2869: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2873,12 +2876,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 2877 "configure"
+#line 2880 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -2904,12 +2907,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2908: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2911: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:2913: checking whether we are using GNU C++" >&5
+echo "configure:2916: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2918,7 +2921,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -2937,7 +2940,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:2941: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2944: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2974,7 +2977,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2978: checking for $ac_word" >&5
+echo "configure:2981: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3007,7 +3010,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:3011: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:3014: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -3018,12 +3021,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 3022 "configure"
+#line 3025 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -3049,12 +3052,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:3053: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:3056: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:3058: checking whether we are using GNU C++" >&5
+echo "configure:3061: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3063,7 +3066,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:3070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -3082,7 +3085,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:3086: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:3089: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3139,7 +3142,7 @@ if test "x$with_cxx_runtime_hack" = xyes &&
test "x$with_pdfetex" = xyes; }
then
echo $ac_n "checking for statically linking C++ runtime library""... $ac_c" 1>&6
-echo "configure:3143: checking for statically linking C++ runtime library" >&5
+echo "configure:3146: checking for statically linking C++ runtime library" >&5
cpp_link_hack=false
old_flags=$flags
@@ -3229,7 +3232,7 @@ fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3233: checking for X" >&5
+echo "configure:3236: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -3291,12 +3294,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 3295 "configure"
+#line 3298 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3366,14 +3369,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3370 "configure"
+#line 3373 "configure"
#include "confdefs.h"
#include <${x_direct_test_include}>
int main() {
${x_direct_test_function}(${x_direct_test_arguments})
; return 0; }
EOF
-if { (eval echo configure:3377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -3479,17 +3482,17 @@ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:3483: checking whether -R must be followed by a space" >&5
+echo "configure:3486: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3486 "configure"
+#line 3489 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -3505,14 +3508,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 3509 "configure"
+#line 3512 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -3551,7 +3554,7 @@ rm -f conftest*
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3555: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3558: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3559,7 +3562,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3563 "configure"
+#line 3566 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3570,7 +3573,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3592,7 +3595,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3596: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3599: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3600,7 +3603,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3604 "configure"
+#line 3607 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3611,7 +3614,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3640,12 +3643,12 @@ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3644: checking for gethostbyname" >&5
+echo "configure:3647: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3649 "configure"
+#line 3652 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -3668,7 +3671,7 @@ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:3672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -3689,7 +3692,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3693: checking for gethostbyname in -lnsl" >&5
+echo "configure:3696: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3697,7 +3700,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3701 "configure"
+#line 3704 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3708,7 +3711,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3738,12 +3741,12 @@ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3742: checking for connect" >&5
+echo "configure:3745: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3747 "configure"
+#line 3750 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -3766,7 +3769,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -3787,7 +3790,7 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:3791: checking for connect in -lsocket" >&5
+echo "configure:3794: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3795,7 +3798,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3799 "configure"
+#line 3802 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3806,7 +3809,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:3810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3830,12 +3833,12 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:3834: checking for remove" >&5
+echo "configure:3837: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3839 "configure"
+#line 3842 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -3858,7 +3861,7 @@ remove();
; return 0; }
EOF
-if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -3879,7 +3882,7 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:3883: checking for remove in -lposix" >&5
+echo "configure:3886: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3887,7 +3890,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3891 "configure"
+#line 3894 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3898,7 +3901,7 @@ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:3902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3922,12 +3925,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3926: checking for shmat" >&5
+echo "configure:3929: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3931 "configure"
+#line 3934 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3950,7 +3953,7 @@ shmat();
; return 0; }
EOF
-if { (eval echo configure:3954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -3971,7 +3974,7 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3975: checking for shmat in -lipc" >&5
+echo "configure:3978: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3979,7 +3982,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3983 "configure"
+#line 3986 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3990,7 +3993,7 @@ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4023,7 +4026,7 @@ fi
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4027: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4030: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4031,7 +4034,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4035 "configure"
+#line 4038 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4042,7 +4045,7 @@ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:4046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4075,7 +4078,7 @@ if test "x$with_x" = xyes; then
fi
if test -z "$x_ext_lib"; then # allow envvar override
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4079: checking for XextCreateExtension in -lXext" >&5
+echo "configure:4082: checking for XextCreateExtension in -lXext" >&5
ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4083,7 +4086,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext $wlibs $X_EXTRA_LIBS $XLFLAG $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4087 "configure"
+#line 4090 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4094,7 +4097,7 @@ int main() {
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:4098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4165,7 +4168,7 @@ test -d tests || mkdir tests
# Is libm present. FIXME: do we need it at all?
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:4169: checking for main in -lm" >&5
+echo "configure:4172: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4173,14 +4176,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4177 "configure"
+#line 4180 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4285,7 +4288,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "tangle", so it can be a program name with args.
set dummy tangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4289: checking for $ac_word" >&5
+echo "configure:4292: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TANGLEBOOT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4329,7 +4332,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "tangle", so it can be a program name with args.
set dummy tangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4333: checking for $ac_word" >&5
+echo "configure:4336: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TANGLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4373,7 +4376,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "ctangle", so it can be a program name with args.
set dummy ctangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4377: checking for $ac_word" >&5
+echo "configure:4380: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CTANGLEBOOT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4417,7 +4420,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "ctangle", so it can be a program name with args.
set dummy ctangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4421: checking for $ac_word" >&5
+echo "configure:4424: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CTANGLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4461,7 +4464,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "tie", so it can be a program name with args.
set dummy tie; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4465: checking for $ac_word" >&5
+echo "configure:4468: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TIE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4506,7 +4509,7 @@ if test "$cross_compiling" = yes; then
# Extract the first word of "otangle", so it can be a program name with args.
set dummy otangle; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4510: checking for $ac_word" >&5
+echo "configure:4513: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_OTANGLE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index d79df6ec6f2..3a23ea805c4 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-16 Karl Berry <karl@tug.org>
+
+ * mfmpi386.asm: missing " chars.
+
2006-07-15 Karl Berry <karl@tug.org>
* mfmpi386.asm (asm): prepend with .text to avoid seg fault with
diff --git a/Build/source/texk/windvi/configure b/Build/source/texk/windvi/configure
index fdf8703c762..8d1e7936f13 100755
--- a/Build/source/texk/windvi/configure
+++ b/Build/source/texk/windvi/configure
@@ -1063,6 +1063,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1066: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1122,7 +1125,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1126: checking how to run the C preprocessor" >&5
+echo "configure:1129: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1137,13 +1140,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1141 "configure"
+#line 1144 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1154,13 +1157,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1158 "configure"
+#line 1161 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1171,13 +1174,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1175 "configure"
+#line 1178 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1202,12 +1205,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1206: checking for ANSI C header files" >&5
+echo "configure:1209: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1214 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1215,7 +1218,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1232,7 +1235,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1236 "configure"
+#line 1239 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1250,7 +1253,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1254 "configure"
+#line 1257 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1271,7 +1274,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1275 "configure"
+#line 1278 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1282,7 +1285,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1306,18 +1309,21 @@ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1310: checking for pid_t" >&5
+echo "configure:1313: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1315 "configure"
+#line 1318 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
@@ -1340,17 +1346,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1344: checking for vfork.h" >&5
+echo "configure:1350: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1349 "configure"
+#line 1355 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1375,18 +1381,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1379: checking for working vfork" >&5
+echo "configure:1385: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:1385: checking for vfork" >&5
+echo "configure:1391: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1390 "configure"
+#line 1396 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -1409,7 +1415,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:1413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -1431,7 +1437,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 1435 "configure"
+#line 1441 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -1526,7 +1532,7 @@ main() {
}
}
EOF
-if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -1549,12 +1555,12 @@ EOF
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1553: checking for vprintf" >&5
+echo "configure:1559: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1558 "configure"
+#line 1564 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -1577,7 +1583,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:1581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1601,12 +1607,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1605: checking for _doprnt" >&5
+echo "configure:1611: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1610 "configure"
+#line 1616 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -1629,7 +1635,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:1633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1654,7 +1660,7 @@ fi
fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:1658: checking for 8-bit clean memcmp" >&5
+echo "configure:1664: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1662,7 +1668,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 1666 "configure"
+#line 1672 "configure"
#include "confdefs.h"
main()
@@ -1672,7 +1678,7 @@ main()
}
EOF
-if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -1690,12 +1696,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1694: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1700: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1699 "configure"
+#line 1705 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -1711,7 +1717,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:1715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -1732,12 +1738,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1736: checking return type of signal handlers" >&5
+echo "configure:1742: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1741 "configure"
+#line 1747 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1754,7 +1760,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:1758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1773,14 +1779,14 @@ EOF
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1777: checking whether byte ordering is bigendian" >&5
+echo "configure:1783: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 1784 "configure"
+#line 1790 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1791,11 +1797,11 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:1795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 1799 "configure"
+#line 1805 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -1806,7 +1812,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:1810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -1826,7 +1832,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1830 "configure"
+#line 1836 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -1839,7 +1845,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@@ -1869,7 +1875,7 @@ fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1873: checking for X" >&5
+echo "configure:1879: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -1931,12 +1937,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 1935 "configure"
+#line 1941 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2006,14 +2012,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2010 "configure"
+#line 2016 "configure"
#include "confdefs.h"
#include <${x_direct_test_include}>
int main() {
${x_direct_test_function}(${x_direct_test_arguments})
; return 0; }
EOF
-if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2119,17 +2125,17 @@ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:2123: checking whether -R must be followed by a space" >&5
+echo "configure:2129: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2126 "configure"
+#line 2132 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -2145,14 +2151,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2149 "configure"
+#line 2155 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -2191,7 +2197,7 @@ rm -f conftest*
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:2195: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2201: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2199,7 +2205,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2203 "configure"
+#line 2209 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2210,7 +2216,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2232,7 +2238,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:2236: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2242: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2240,7 +2246,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2244 "configure"
+#line 2250 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2251,7 +2257,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2280,12 +2286,12 @@ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2284: checking for gethostbyname" >&5
+echo "configure:2290: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2289 "configure"
+#line 2295 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -2308,7 +2314,7 @@ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:2312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -2329,7 +2335,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2333: checking for gethostbyname in -lnsl" >&5
+echo "configure:2339: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2337,7 +2343,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2341 "configure"
+#line 2347 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2348,7 +2354,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2378,12 +2384,12 @@ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:2382: checking for connect" >&5
+echo "configure:2388: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2387 "configure"
+#line 2393 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -2406,7 +2412,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -2427,7 +2433,7 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2431: checking for connect in -lsocket" >&5
+echo "configure:2437: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2435,7 +2441,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2439 "configure"
+#line 2445 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2446,7 +2452,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2470,12 +2476,12 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2474: checking for remove" >&5
+echo "configure:2480: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2479 "configure"
+#line 2485 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -2498,7 +2504,7 @@ remove();
; return 0; }
EOF
-if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -2519,7 +2525,7 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2523: checking for remove in -lposix" >&5
+echo "configure:2529: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2527,7 +2533,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2531 "configure"
+#line 2537 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2538,7 +2544,7 @@ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2562,12 +2568,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2566: checking for shmat" >&5
+echo "configure:2572: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2571 "configure"
+#line 2577 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -2590,7 +2596,7 @@ shmat();
; return 0; }
EOF
-if { (eval echo configure:2594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -2611,7 +2617,7 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2615: checking for shmat in -lipc" >&5
+echo "configure:2621: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2619,7 +2625,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2623 "configure"
+#line 2629 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2630,7 +2636,7 @@ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2663,7 +2669,7 @@ fi
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2667: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2673: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2671,7 +2677,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2675 "configure"
+#line 2681 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2682,7 +2688,7 @@ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:2686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2707,18 +2713,21 @@ fi
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2711: checking for size_t" >&5
+echo "configure:2717: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2716 "configure"
+#line 2722 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
@@ -2742,7 +2751,7 @@ fi
# XDVI checks by Paul Vojta
echo $ac_n "checking for integer type to use in bitmaps""... $ac_c" 1>&6
-echo "configure:2746: checking for integer type to use in bitmaps" >&5
+echo "configure:2755: checking for integer type to use in bitmaps" >&5
if eval "test \"`echo '$''{'xdvi_cv_bitmap_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2750,7 +2759,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2754 "configure"
+#line 2763 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -2768,7 +2777,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
xdvi_cv_bitmap_type="`cat conftestval`"
else
@@ -2793,12 +2802,12 @@ EOF
echo "$ac_t""unsigned $BMTYPE, size = $BMBYTES" 1>&6
echo $ac_n "checking for stropts.h and isastream()""... $ac_c" 1>&6
-echo "configure:2797: checking for stropts.h and isastream()" >&5
+echo "configure:2806: checking for stropts.h and isastream()" >&5
if eval "test \"`echo '$''{'xdvi_cv_sys_streams'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2802 "configure"
+#line 2811 "configure"
#include "confdefs.h"
#include <stropts.h>
@@ -2810,7 +2819,7 @@ isastream(0);
#endif
; return 0; }
EOF
-if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xdvi_cv_sys_streams=yes
else
@@ -2830,7 +2839,7 @@ EOF
fi
echo $ac_n "checking for SunOS 4""... $ac_c" 1>&6
-echo "configure:2834: checking for SunOS 4" >&5
+echo "configure:2843: checking for SunOS 4" >&5
if eval "test \"`echo '$''{'xdvi_cv_sys_sunos_4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2849,12 +2858,12 @@ EOF
fi
echo $ac_n "checking for poll.h and poll()""... $ac_c" 1>&6
-echo "configure:2853: checking for poll.h and poll()" >&5
+echo "configure:2862: checking for poll.h and poll()" >&5
if eval "test \"`echo '$''{'xdvi_cv_func_poll'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2858 "configure"
+#line 2867 "configure"
#include "confdefs.h"
#include <poll.h>
@@ -2862,7 +2871,7 @@ int main() {
poll((struct pollfd *) 0, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xdvi_cv_func_poll=yes
else
@@ -2885,17 +2894,17 @@ else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2889: checking for $ac_hdr" >&5
+echo "configure:2898: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2894 "configure"
+#line 2903 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2932,12 +2941,12 @@ fi
for ac_func in memcpy strerror waitpid sigaction strchr tempnam setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2936: checking for $ac_func" >&5
+echo "configure:2945: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2941 "configure"
+#line 2950 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2960,7 +2969,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2988,17 +2997,17 @@ for ac_hdr in netdb.h sys/bsdtypes.h X11/Xosdefs.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2992: checking for $ac_hdr" >&5
+echo "configure:3001: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2997 "configure"
+#line 3006 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3167,7 +3176,7 @@ else
if test "$with_system_zlib" = yes; then
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:3171: checking for inflate in -lz" >&5
+echo "configure:3180: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3175,7 +3184,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3179 "configure"
+#line 3188 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3186,7 +3195,7 @@ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3222,17 +3231,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3226: checking for $ac_hdr" >&5
+echo "configure:3235: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3231 "configure"
+#line 3240 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3297,7 +3306,7 @@ if test -z "$x_ext_lib"; then # allow envvar override
XLFLAG=
fi
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:3301: checking for XextCreateExtension in -lXext" >&5
+echo "configure:3310: checking for XextCreateExtension in -lXext" >&5
ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3305,7 +3314,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3309 "configure"
+#line 3318 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3316,7 +3325,7 @@ int main() {
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3364,7 +3373,7 @@ if echo "$PS_DEF" | grep PS_DPS >/dev/null; then
echo "$ac_t""adding DPS includes and libraries for Solaris" 1>&6
X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11"
echo $ac_n "checking for isinf in -lsunmath""... $ac_c" 1>&6
-echo "configure:3368: checking for isinf in -lsunmath" >&5
+echo "configure:3377: checking for isinf in -lsunmath" >&5
ac_lib_var=`echo sunmath'_'isinf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3372,7 +3381,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsunmath $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3376 "configure"
+#line 3385 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3383,7 +3392,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3410,12 +3419,12 @@ fi
for ac_func in isinf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3414: checking for $ac_func" >&5
+echo "configure:3423: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3419 "configure"
+#line 3428 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3438,7 +3447,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3466,17 +3475,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3470: checking for $ac_hdr" >&5
+echo "configure:3479: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3475 "configure"
+#line 3484 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 5c14e55ddb5..7cef83cedf8 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -1154,6 +1154,9 @@ fi
echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6
echo "configure:1157: checking where the main texmf tree is located" >&5
+case $prefix in
+ */) prefix=`echo "$prefix" | sed 's@/*$@@'`;;
+esac
texmfmain=
if test "x$datadir" != 'x${prefix}/share'; then
# First case, datadir is defined...
@@ -1213,7 +1216,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1217: checking how to run the C preprocessor" >&5
+echo "configure:1220: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1228,13 +1231,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1232 "configure"
+#line 1235 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1245,13 +1248,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1249 "configure"
+#line 1252 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1262,13 +1265,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1266 "configure"
+#line 1269 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1293,12 +1296,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1297: checking for ANSI C header files" >&5
+echo "configure:1300: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1302 "configure"
+#line 1305 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1306,7 +1309,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1323,7 +1326,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
+#line 1330 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1341,7 +1344,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1345 "configure"
+#line 1348 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1362,7 +1365,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1366 "configure"
+#line 1369 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1373,7 +1376,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1397,12 +1400,12 @@ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1401: checking for pid_t" >&5
+echo "configure:1404: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1406 "configure"
+#line 1409 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1434,17 +1437,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1438: checking for vfork.h" >&5
+echo "configure:1441: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1443 "configure"
+#line 1446 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1469,18 +1472,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1473: checking for working vfork" >&5
+echo "configure:1476: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:1479: checking for vfork" >&5
+echo "configure:1482: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1484 "configure"
+#line 1487 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -1503,7 +1506,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -1525,7 +1528,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 1529 "configure"
+#line 1532 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -1620,7 +1623,7 @@ main() {
}
}
EOF
-if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -1643,12 +1646,12 @@ EOF
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1647: checking for vprintf" >&5
+echo "configure:1650: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1652 "configure"
+#line 1655 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -1671,7 +1674,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1695,12 +1698,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1699: checking for _doprnt" >&5
+echo "configure:1702: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1704 "configure"
+#line 1707 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -1723,7 +1726,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1748,7 +1751,7 @@ fi
fi
echo $ac_n "checking for a working implementation of (v)snprintf()""... $ac_c" 1>&6
-echo "configure:1752: checking for a working implementation of (v)snprintf()" >&5
+echo "configure:1755: checking for a working implementation of (v)snprintf()" >&5
if eval "test \"`echo '$''{'xdvi_cv_func_good_vsnprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1757,7 +1760,7 @@ else
xdvi_cv_func_good_vsnprintf=no
else
cat > conftest.$ac_ext <<EOF
-#line 1761 "configure"
+#line 1764 "configure"
#include "confdefs.h"
#ifdef IRIX
@@ -1773,7 +1776,7 @@ int main()
return 0;
}
EOF
-if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
xdvi_cv_func_good_vsnprintf=yes
else
@@ -1795,12 +1798,12 @@ EOF
fi
echo $ac_n "checking for memicmp""... $ac_c" 1>&6
-echo "configure:1799: checking for memicmp" >&5
+echo "configure:1802: checking for memicmp" >&5
if eval "test \"`echo '$''{'xdvi_cv_memicmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1804 "configure"
+#line 1807 "configure"
#include "confdefs.h"
#include <string.h>
@@ -1808,7 +1811,7 @@ int main() {
(void)memicmp((char *)NULL, (char *)NULL, 0);
; return 0; }
EOF
-if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xdvi_cv_memicmp=yes
else
@@ -1830,19 +1833,19 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1834: checking for working alloca.h" >&5
+echo "configure:1837: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1839 "configure"
+#line 1842 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:1846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1863,12 +1866,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1867: checking for alloca" >&5
+echo "configure:1870: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1872 "configure"
+#line 1875 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1896,7 +1899,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -1928,12 +1931,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1932: checking whether alloca needs Cray hooks" >&5
+echo "configure:1935: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1937 "configure"
+#line 1940 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1958,12 +1961,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1962: checking for $ac_func" >&5
+echo "configure:1965: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1967 "configure"
+#line 1970 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1986,7 +1989,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2013,7 +2016,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2017: checking stack direction for C alloca" >&5
+echo "configure:2020: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2021,7 +2024,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 2025 "configure"
+#line 2028 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -2040,7 +2043,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:2044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -2064,12 +2067,12 @@ fi
echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
-echo "configure:2068: checking for preprocessor stringizing operator" >&5
+echo "configure:2071: checking for preprocessor stringizing operator" >&5
if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2073 "configure"
+#line 2076 "configure"
#include "confdefs.h"
#define x(y) #y
@@ -2099,7 +2102,7 @@ fi
echo "$ac_t""${ac_cv_c_stringize}" 1>&6
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2103: checking for 8-bit clean memcmp" >&5
+echo "configure:2106: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2107,7 +2110,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 2111 "configure"
+#line 2114 "configure"
#include "confdefs.h"
main()
@@ -2117,7 +2120,7 @@ main()
}
EOF
-if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -2135,12 +2138,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2139: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2142: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2144 "configure"
+#line 2147 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2156,7 +2159,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2177,12 +2180,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2181: checking return type of signal handlers" >&5
+echo "configure:2184: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2186 "configure"
+#line 2189 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -2199,7 +2202,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -2218,14 +2221,14 @@ EOF
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2222: checking whether byte ordering is bigendian" >&5
+echo "configure:2225: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 2229 "configure"
+#line 2232 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2236,11 +2239,11 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:2240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 2244 "configure"
+#line 2247 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2251,7 +2254,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:2255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -2271,7 +2274,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2275 "configure"
+#line 2278 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -2284,7 +2287,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@@ -2312,7 +2315,7 @@ fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:2316: checking for X" >&5
+echo "configure:2319: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -2374,12 +2377,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 2378 "configure"
+#line 2381 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2449,14 +2452,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2453 "configure"
+#line 2456 "configure"
#include "confdefs.h"
#include <${x_direct_test_include}>
int main() {
${x_direct_test_function}(${x_direct_test_arguments})
; return 0; }
EOF
-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@@ -2562,17 +2565,17 @@ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:2566: checking whether -R must be followed by a space" >&5
+echo "configure:2569: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2569 "configure"
+#line 2572 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
@@ -2588,14 +2591,14 @@ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 2592 "configure"
+#line 2595 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
@@ -2634,7 +2637,7 @@ rm -f conftest*
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:2638: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:2641: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2642,7 +2645,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2646 "configure"
+#line 2649 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2653,7 +2656,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2675,7 +2678,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:2679: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:2682: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2683,7 +2686,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2687 "configure"
+#line 2690 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2694,7 +2697,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:2698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2723,12 +2726,12 @@ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2727: checking for gethostbyname" >&5
+echo "configure:2730: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2732 "configure"
+#line 2735 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -2751,7 +2754,7 @@ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -2772,7 +2775,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2776: checking for gethostbyname in -lnsl" >&5
+echo "configure:2779: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2780,7 +2783,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2784 "configure"
+#line 2787 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2791,7 +2794,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2821,12 +2824,12 @@ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:2825: checking for connect" >&5
+echo "configure:2828: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2830 "configure"
+#line 2833 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
@@ -2849,7 +2852,7 @@ connect();
; return 0; }
EOF
-if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
@@ -2870,7 +2873,7 @@ fi
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2874: checking for connect in -lsocket" >&5
+echo "configure:2877: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2878,7 +2881,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2882 "configure"
+#line 2885 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2889,7 +2892,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2913,12 +2916,12 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2917: checking for remove" >&5
+echo "configure:2920: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2922 "configure"
+#line 2925 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
@@ -2941,7 +2944,7 @@ remove();
; return 0; }
EOF
-if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
@@ -2962,7 +2965,7 @@ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2966: checking for remove in -lposix" >&5
+echo "configure:2969: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2970,7 +2973,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2974 "configure"
+#line 2977 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2981,7 +2984,7 @@ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3005,12 +3008,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:3009: checking for shmat" >&5
+echo "configure:3012: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3014 "configure"
+#line 3017 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
@@ -3033,7 +3036,7 @@ shmat();
; return 0; }
EOF
-if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
@@ -3054,7 +3057,7 @@ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:3058: checking for shmat in -lipc" >&5
+echo "configure:3061: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3062,7 +3065,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3066 "configure"
+#line 3069 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3073,7 +3076,7 @@ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3106,7 +3109,7 @@ fi
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:3110: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:3113: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3114,7 +3117,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3118 "configure"
+#line 3121 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3125,7 +3128,7 @@ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3150,12 +3153,12 @@ fi
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3154: checking for size_t" >&5
+echo "configure:3157: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3159 "configure"
+#line 3162 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -3188,7 +3191,7 @@ fi
if test $ac_cv_func_vfork_works = yes; then
echo $ac_n "checking for whether setsid() is allowed within vfork()""... $ac_c" 1>&6
-echo "configure:3192: checking for whether setsid() is allowed within vfork()" >&5
+echo "configure:3195: checking for whether setsid() is allowed within vfork()" >&5
if eval "test \"`echo '$''{'xdvi_cv_setsid_in_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3197,7 +3200,7 @@ else
xdvi_cv_setsid_in_vfork=no
else
cat > conftest.$ac_ext <<EOF
-#line 3201 "configure"
+#line 3204 "configure"
#include "confdefs.h"
/* Test adapted from Gnu autoconf */
/* Thanks to Paul Eggert for this test. */
@@ -3236,7 +3239,7 @@ main() {
}
}
EOF
-if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
xdvi_cv_setsid_in_vfork=yes
else
@@ -3259,12 +3262,12 @@ EOF
fi
fi
echo $ac_n "checking whether C compiler supports string concatenation""... $ac_c" 1>&6
-echo "configure:3263: checking whether C compiler supports string concatenation" >&5
+echo "configure:3266: checking whether C compiler supports string concatenation" >&5
if eval "test \"`echo '$''{'xdvi_cc_concat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3268 "configure"
+#line 3271 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -3273,7 +3276,7 @@ puts("Testing" " string" " concatenation");
; return 0; }
EOF
-if { (eval echo configure:3277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xdvi_cc_concat=yes
else
@@ -3293,7 +3296,7 @@ EOF
fi
echo $ac_n "checking for integer type to use in bitmaps""... $ac_c" 1>&6
-echo "configure:3297: checking for integer type to use in bitmaps" >&5
+echo "configure:3300: checking for integer type to use in bitmaps" >&5
if eval "test \"`echo '$''{'xdvi_cv_bitmap_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3301,7 +3304,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3305 "configure"
+#line 3308 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -3319,7 +3322,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
xdvi_cv_bitmap_type="`cat conftestval`"
else
@@ -3344,12 +3347,12 @@ EOF
echo "$ac_t""unsigned $BMTYPE, size = $BMBYTES" 1>&6
echo $ac_n "checking for stropts.h and isastream()""... $ac_c" 1>&6
-echo "configure:3348: checking for stropts.h and isastream()" >&5
+echo "configure:3351: checking for stropts.h and isastream()" >&5
if eval "test \"`echo '$''{'xdvi_cv_sys_streams'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3353 "configure"
+#line 3356 "configure"
#include "confdefs.h"
#include <stropts.h>
@@ -3361,7 +3364,7 @@ isastream(0);
#endif
; return 0; }
EOF
-if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xdvi_cv_sys_streams=yes
else
@@ -3381,7 +3384,7 @@ EOF
fi
echo $ac_n "checking for SunOS 4""... $ac_c" 1>&6
-echo "configure:3385: checking for SunOS 4" >&5
+echo "configure:3388: checking for SunOS 4" >&5
if eval "test \"`echo '$''{'xdvi_cv_sys_sunos_4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3400,7 +3403,7 @@ EOF
fi
echo $ac_n "checking for certain old versions of Linux""... $ac_c" 1>&6
-echo "configure:3404: checking for certain old versions of Linux" >&5
+echo "configure:3407: checking for certain old versions of Linux" >&5
if eval "test \"`echo '$''{'xdvi_cv_sys_old_linux'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3419,12 +3422,12 @@ EOF
fi
echo $ac_n "checking for poll.h and poll()""... $ac_c" 1>&6
-echo "configure:3423: checking for poll.h and poll()" >&5
+echo "configure:3426: checking for poll.h and poll()" >&5
if eval "test \"`echo '$''{'xdvi_cv_func_poll'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3428 "configure"
+#line 3431 "configure"
#include "confdefs.h"
#include <poll.h>
@@ -3432,7 +3435,7 @@ int main() {
poll((struct pollfd *) 0, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xdvi_cv_func_poll=yes
else
@@ -3455,17 +3458,17 @@ else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3459: checking for $ac_hdr" >&5
+echo "configure:3462: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3464 "configure"
+#line 3467 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3504,7 +3507,7 @@ fi
echo $ac_n "checking what warning flags to pass to the C compiler""... $ac_c" 1>&6
-echo "configure:3508: checking what warning flags to pass to the C compiler" >&5
+echo "configure:3511: checking what warning flags to pass to the C compiler" >&5
warnCFLAGS=
if test "x$GCC" != xyes; then
enable_compiler_warnings=no
@@ -3541,7 +3544,7 @@ echo "configure:3508: checking what warning flags to pass to the C compiler" >&5
echo $ac_n "checking whether linker supports the --allow-multiple-definition flag""... $ac_c" 1>&6
-echo "configure:3545: checking whether linker supports the --allow-multiple-definition flag" >&5
+echo "configure:3548: checking whether linker supports the --allow-multiple-definition flag" >&5
if eval "test \"`echo '$''{'xdvi_linker_multiple_defns'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3549,7 +3552,7 @@ else
LDFLAGS="-Xlinker --allow-multiple-definition"
x_linker_options=""
cat > conftest.$ac_ext <<EOF
-#line 3553 "configure"
+#line 3556 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -3558,7 +3561,7 @@ void foo(void);
; return 0; }
EOF
-if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xdvi_linker_multiple_defns=yes
else
@@ -3594,10 +3597,10 @@ else
LDFLAGS="$X_LIBS $LDFLAGS"
echo $ac_n "checking whether linker supports multiple definitions by default""... $ac_c" 1>&6
-echo "configure:3598: checking whether linker supports multiple definitions by default" >&5
+echo "configure:3601: checking whether linker supports multiple definitions by default" >&5
cat > conftest.$ac_ext <<EOF
-#line 3601 "configure"
+#line 3604 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -3617,7 +3620,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xdvi_linker_multiple_defns=yes
else
@@ -3657,17 +3660,17 @@ for ac_hdr in stdint.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3661: checking for $ac_hdr" >&5
+echo "configure:3664: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3666 "configure"
+#line 3669 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3695,12 +3698,12 @@ done
echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:3699: checking for uint32_t" >&5
+echo "configure:3702: checking for uint32_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3704 "configure"
+#line 3707 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -3738,12 +3741,12 @@ for ac_func in mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr
lstat ftruncate snprintf vsnprintf realpath
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3742: checking for $ac_func" >&5
+echo "configure:3745: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3747 "configure"
+#line 3750 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3766,7 +3769,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3795,17 +3798,17 @@ for ac_hdr in netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h ic
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3799: checking for $ac_hdr" >&5
+echo "configure:3802: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3804 "configure"
+#line 3807 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3838,17 +3841,17 @@ for ac_hdr in X11/Xosdefs.h X11/xpm.h Xm/XpmP.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3842: checking for $ac_hdr" >&5
+echo "configure:3845: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3847 "configure"
+#line 3850 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3882,17 +3885,17 @@ for ac_hdr in X11/Intrinsic.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3886: checking for $ac_hdr" >&5
+echo "configure:3889: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3891 "configure"
+#line 3894 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3922,17 +3925,17 @@ for ac_hdr in X11/Xmu/Editres.h X11/Xmu/Xmu.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3926: checking for $ac_hdr" >&5
+echo "configure:3929: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3931 "configure"
+#line 3934 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4213,7 +4216,7 @@ else
if test "$with_system_t1lib" = yes; then
echo $ac_n "checking for T1_AddFont in -lt1""... $ac_c" 1>&6
-echo "configure:4217: checking for T1_AddFont in -lt1" >&5
+echo "configure:4220: checking for T1_AddFont in -lt1" >&5
ac_lib_var=`echo t1'_'T1_AddFont | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4221,7 +4224,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lt1 -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4225 "configure"
+#line 4228 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4232,7 +4235,7 @@ int main() {
T1_AddFont()
; return 0; }
EOF
-if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4259,13 +4262,13 @@ fi
LIBS="-lt1 -lm $LIBS"
if test "$with_system_t1lib" = yes; then
echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6
-echo "configure:4263: checking whether installed T1 lib is >= v 5.0.0 " >&5
+echo "configure:4266: checking whether installed T1 lib is >= v 5.0.0 " >&5
if test "$cross_compiling" = yes; then
ac_compile_t1lib=1
]
else
cat > conftest.$ac_ext <<EOF
-#line 4269 "configure"
+#line 4272 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -4297,7 +4300,7 @@ int main() {
}
EOF
-if { (eval echo configure:4301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_compile_t1lib=0
else
@@ -4343,11 +4346,11 @@ fi
if test "${with_xdvi_x_toolkit}" = xaw; then
echo $ac_n "checking for Xaw library""... $ac_c" 1>&6
-echo "configure:4347: checking for Xaw library" >&5
+echo "configure:4350: checking for Xaw library" >&5
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 4351 "configure"
+#line 4354 "configure"
#include "confdefs.h"
#include <X11/X.h>
@@ -4364,7 +4367,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xdvi_have_xaw=yes
else
@@ -4384,11 +4387,11 @@ rm -f conftest*
fi
echo $ac_n "checking version of Xaw library""... $ac_c" 1>&6
-echo "configure:4388: checking version of Xaw library" >&5
+echo "configure:4391: checking version of Xaw library" >&5
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 4392 "configure"
+#line 4395 "configure"
#include "confdefs.h"
#include <X11/IntrinsicP.h>
@@ -4522,7 +4525,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xdvi_old_xaw=no
else
@@ -4547,16 +4550,16 @@ fi
echo $ac_n "checking if nl_langinfo(CODESET) is working""... $ac_c" 1>&6
-echo "configure:4551: checking if nl_langinfo(CODESET) is working" >&5
+echo "configure:4554: checking if nl_langinfo(CODESET) is working" >&5
cat > conftest.$ac_ext <<EOF
-#line 4553 "configure"
+#line 4556 "configure"
#include "confdefs.h"
#include <langinfo.h>
int main() {
char* cs = nl_langinfo(CODESET);
; return 0; }
EOF
-if { (eval echo configure:4560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_WORKING_NL_LANGINFO_CODESET 1
@@ -4578,7 +4581,7 @@ if test -z "$x_ext_lib"; then # allow envvar override
XLFLAG=
fi
echo $ac_n "checking for XpQueryVersion in -lXp""... $ac_c" 1>&6
-echo "configure:4582: checking for XpQueryVersion in -lXp" >&5
+echo "configure:4585: checking for XpQueryVersion in -lXp" >&5
ac_lib_var=`echo Xp'_'XpQueryVersion | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4586,7 +4589,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXp -lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4590 "configure"
+#line 4593 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4597,7 +4600,7 @@ int main() {
XpQueryVersion()
; return 0; }
EOF
-if { (eval echo configure:4601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4626,7 +4629,7 @@ if test -z "$x_ext_lib"; then # previous test unsuccessful, or envvar override
XLFLAG=
fi
echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4630: checking for XextCreateExtension in -lXext" >&5
+echo "configure:4633: checking for XextCreateExtension in -lXext" >&5
ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4634,7 +4637,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4638 "configure"
+#line 4641 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4645,7 +4648,7 @@ int main() {
XextCreateExtension()
; return 0; }
EOF
-if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4698,7 +4701,7 @@ if test "${with_xpm_libraries+set}" = set; then
fi
echo $ac_n "checking for Xpm""... $ac_c" 1>&6
-echo "configure:4702: checking for Xpm" >&5
+echo "configure:4705: checking for Xpm" >&5
#
#
# Search the include files. XPM can either be in <X11/xpm.h> (as in X11R6),
@@ -4721,7 +4724,7 @@ CPPFLAGS="$X_CFLAGS $CPPFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
#
cat > conftest.$ac_ext <<EOF
-#line 4725 "configure"
+#line 4728 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
@@ -4730,7 +4733,7 @@ int main() {
int a;
; return 0; }
EOF
-if { (eval echo configure:4734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# X11/xpm.h is in the standard search path.
@@ -4823,7 +4826,7 @@ xdvi_cv_xpm_libraries=
# We use XtToolkitInitialize() here since it takes no arguments
# and thus also works with a C++ compiler.
cat > conftest.$ac_ext <<EOF
-#line 4827 "configure"
+#line 4830 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -4833,7 +4836,7 @@ int main() {
XtToolkitInitialize();
; return 0; }
EOF
-if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
# libxpm.a is in the standard search path.
@@ -4966,7 +4969,7 @@ motif_include=""$motif_include""
motif_libdir=""$motif_libdir""
echo $ac_n "checking for Motif""... $ac_c" 1>&6
-echo "configure:4970: checking for Motif" >&5
+echo "configure:4973: checking for Motif" >&5
#
#
# Search the include files.
@@ -4987,14 +4990,14 @@ CPPFLAGS="$X_CFLAGS $CPPFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
#
cat > conftest.$ac_ext <<EOF
-#line 4991 "configure"
+#line 4994 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
int main() {
int a;
; return 0; }
EOF
-if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# Xm/Xm.h is in the standard search path.
@@ -5063,7 +5066,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
# We use XtToolkitInitialize() here since it takes no arguments
# and thus also works with a C++ compiler.
cat > conftest.$ac_ext <<EOF
-#line 5067 "configure"
+#line 5070 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
#include <Xm/Xm.h>
@@ -5072,7 +5075,7 @@ int main() {
XtToolkitInitialize();
; return 0; }
EOF
-if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
# libXm.a is in the standard search path.
@@ -5185,11 +5188,11 @@ fi
#
echo $ac_n "checking whether to compile in panner (requires Xaw)""... $ac_c" 1>&6
-echo "configure:5189: checking whether to compile in panner (requires Xaw)" >&5
+echo "configure:5192: checking whether to compile in panner (requires Xaw)" >&5
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 5193 "configure"
+#line 5196 "configure"
#include "confdefs.h"
#include <X11/X.h>
@@ -5207,7 +5210,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:5211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xdvi_use_xaw_panner=yes
else
@@ -5243,7 +5246,7 @@ motif_include=""$motif_include""
motif_libdir=""$motif_libdir""
echo $ac_n "checking for Motif""... $ac_c" 1>&6
-echo "configure:5247: checking for Motif" >&5
+echo "configure:5250: checking for Motif" >&5
#
#
# Search the include files.
@@ -5264,14 +5267,14 @@ CPPFLAGS="$X_CFLAGS $CPPFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS"
#
cat > conftest.$ac_ext <<EOF
-#line 5268 "configure"
+#line 5271 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
int main() {
int a;
; return 0; }
EOF
-if { (eval echo configure:5275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# Xm/Xm.h is in the standard search path.
@@ -5340,7 +5343,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
# We use XtToolkitInitialize() here since it takes no arguments
# and thus also works with a C++ compiler.
cat > conftest.$ac_ext <<EOF
-#line 5344 "configure"
+#line 5347 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
#include <Xm/Xm.h>
@@ -5349,7 +5352,7 @@ int main() {
XtToolkitInitialize();
; return 0; }
EOF
-if { (eval echo configure:5353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
# libXm.a is in the standard search path.
@@ -5462,11 +5465,11 @@ fi
#
echo $ac_n "checking whether to compile in panner (requires Xaw)""... $ac_c" 1>&6
-echo "configure:5466: checking whether to compile in panner (requires Xaw)" >&5
+echo "configure:5469: checking whether to compile in panner (requires Xaw)" >&5
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 5470 "configure"
+#line 5473 "configure"
#include "confdefs.h"
#include <X11/X.h>
@@ -5484,7 +5487,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:5488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xdvi_use_xaw_panner=yes
else
@@ -5524,7 +5527,7 @@ else
iconv_libpath=
iconv_libs=
echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:5528: checking for iconv_open in -liconv" >&5
+echo "configure:5531: checking for iconv_open in -liconv" >&5
ac_lib_var=`echo iconv'_'iconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5532,7 +5535,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5536 "configure"
+#line 5539 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5543,7 +5546,7 @@ int main() {
iconv_open()
; return 0; }
EOF
-if { (eval echo configure:5547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5562,7 +5565,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:5566: checking for libiconv_open in -liconv" >&5
+echo "configure:5569: checking for libiconv_open in -liconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5570,7 +5573,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liconv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5574 "configure"
+#line 5577 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5581,7 +5584,7 @@ int main() {
libiconv_open()
; return 0; }
EOF
-if { (eval echo configure:5585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5650,7 +5653,7 @@ CXXFLAGS="$CXXFLAGS $iconv_includes"
LDFLAGS="$LDFLAGS $iconv_libpath"
#
echo $ac_n "checking for iconv input type""... $ac_c" 1>&6
-echo "configure:5654: checking for iconv input type" >&5
+echo "configure:5657: checking for iconv input type" >&5
if eval "test \"`echo '$''{'xdvi_iconv_char_pptr_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5659,7 +5662,7 @@ else
xdvi_iconv_char_pptr_type="char_pptr"
else
cat > conftest.$ac_ext <<EOF
-#line 5663 "configure"
+#line 5666 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -5723,7 +5726,7 @@ extern "C" void exit(int);
}
EOF
-if { (eval echo configure:5727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
xdvi_iconv_char_pptr_type="char_pptr"
else
@@ -5782,7 +5785,7 @@ if echo "$PS_DEF" | grep PS_DPS >/dev/null; then
echo "$ac_t""adding DPS includes and libraries for Solaris" 1>&6
X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11"
echo $ac_n "checking for isinf in -lsunmath""... $ac_c" 1>&6
-echo "configure:5786: checking for isinf in -lsunmath" >&5
+echo "configure:5789: checking for isinf in -lsunmath" >&5
ac_lib_var=`echo sunmath'_'isinf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5790,7 +5793,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsunmath $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5794 "configure"
+#line 5797 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5801,7 +5804,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:5805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5826,12 +5829,12 @@ fi
for ac_func in isinf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5830: checking for $ac_func" >&5
+echo "configure:5833: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5835 "configure"
+#line 5838 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5854,7 +5857,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -5882,17 +5885,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5886: checking for $ac_hdr" >&5
+echo "configure:5889: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5891 "configure"
+#line 5894 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5969,7 +5972,7 @@ fi
# needed for web2c later than 7.3.4:
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5973: checking for main in -lm" >&5
+echo "configure:5976: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5977,14 +5980,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5981 "configure"
+#line 5984 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -6012,12 +6015,12 @@ else
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6016: checking for working const" >&5
+echo "configure:6019: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6021 "configure"
+#line 6024 "configure"
#include "confdefs.h"
int main() {
@@ -6066,7 +6069,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:6070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else