summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/configure64
-rw-r--r--Build/source/configure.ac8
-rw-r--r--Build/source/texk/web2c/Makefile.in7
-rw-r--r--Build/source/texk/web2c/am/bootstrap.am7
4 files changed, 58 insertions, 28 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 60741de11b4..6e38be412d4 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1045,6 +1045,7 @@ with_gnu_ld
enable_libtool_lock
enable_largefile
with_x
+with_ln_s
'
ac_precious_vars='build_alias
host_alias
@@ -1855,6 +1856,7 @@ Optional Packages:
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-x use the X Window System
+ --without-ln-s do build even if `ln -s' does not work
Some influential environment variables:
CC C compiler command
@@ -6156,13 +6158,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6159: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6161: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6162: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6164: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6165: output\"" >&5)
+ (eval echo "\"\$as_me:6167: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7368,7 +7370,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7371 "configure"' > conftest.$ac_ext
+ echo '#line 7373 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9314,11 +9316,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9317: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9319: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9321: \$? = $ac_status" >&5
+ echo "$as_me:9323: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9653,11 +9655,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9656: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9658: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9660: \$? = $ac_status" >&5
+ echo "$as_me:9662: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9758,11 +9760,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9761: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9763: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9765: \$? = $ac_status" >&5
+ echo "$as_me:9767: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9813,11 +9815,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9816: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9818: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9820: \$? = $ac_status" >&5
+ echo "$as_me:9822: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12613,7 +12615,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12616 "configure"
+#line 12618 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12709,7 +12711,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12712 "configure"
+#line 12714 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19143,11 +19145,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19146: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19148: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19150: \$? = $ac_status" >&5
+ echo "$as_me:19152: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19242,11 +19244,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19245: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19249: \$? = $ac_status" >&5
+ echo "$as_me:19251: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19294,11 +19296,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19297: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19299: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19301: \$? = $ac_status" >&5
+ echo "$as_me:19303: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20260,6 +20262,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+
+# Check whether --with-ln-s was given.
+if test "${with_ln_s+set}" = set; then
+ withval=$with_ln_s;
+fi
+if test "x$LN_S" != "xln -s" && test "x$with_ln_s" != xno; then
+ { { $as_echo "$as_me:$LINENO: error: You could use \`--without-ln-s' to build without working \`ln -s'" >&5
+$as_echo "$as_me: error: You could use \`--without-ln-s' to build without working \`ln -s'" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
## FIXME
if test "x$with_fontconfig" != x; then
{ { $as_echo "$as_me:$LINENO: error: Sorry, the configure option \`--with-fontconfig' is no longer supported.
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index 5d418dae2c5..6f72b9ef507 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -50,6 +50,14 @@ AC_PATH_XTRA
AC_PROG_CXX
+AC_PROG_LN_S
+AC_ARG_WITH([ln-s],
+ AS_HELP_STRING([--without-ln-s],
+ [do build even if `ln -s' does not work]))[]dnl
+if test "x$LN_S" != "xln -s" && test "x$with_ln_s" != xno; then
+ AC_MSG_ERROR([You could use `--without-ln-s' to build without working `ln -s'])
+fi
+
## FIXME
if test "x$with_fontconfig" != x; then
AC_MSG_ERROR([Sorry, the configure option `--with-fontconfig' is no longer supported.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index c302087cc8d..4e8b8309790 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -7831,6 +7831,7 @@ ctangle.c: ctangleboot$(EXEEXT) cwebdir/ctangle.w cwebdir/ctang-w2c.ch
cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch
CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c
# ctangleboot.c and cwebboot.c are in the distribution
+$(ctangleboot_OBJECTS): stamp-ctangle
stamp-ctangle: ctangleboot.c cwebboot.c
date >stamp-ctangle
# This is not run unless one of the cwebdir/* files is changed.
@@ -7839,8 +7840,7 @@ stamp-ctangle: ctangleboot.c cwebboot.c
# We must serialize this.
ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
- CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \
- mv ctangle.c ctangleboot.c; \
+ CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c ctangleboot.c; \
elif [ -r ctangleboot.c ]; then \
touch ctangleboot.c; \
else \
@@ -7850,8 +7850,7 @@ ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
- CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) common comm-w2c cweb.c; \
- mv cweb.c cwebboot.c; \
+ CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) common comm-w2c cwebboot.c; \
elif [ -r cwebboot.c ]; then \
touch cwebboot.c; \
else \
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index 2ffcac6eb5b..e7191ae311a 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -73,6 +73,7 @@ DISTCLEANFILES += ctangle.c cweb.c
noinst_PROGRAMS += ctangleboot
nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
# ctangleboot.c and cwebboot.c are in the distribution
+$(ctangleboot_OBJECTS): stamp-ctangle
stamp-ctangle: ctangleboot.c cwebboot.c
date >stamp-ctangle
EXTRA_DIST += ctangleboot.c cwebboot.c
@@ -82,8 +83,7 @@ EXTRA_DIST += ctangleboot.c cwebboot.c
# We must serialize this.
ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
- CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \
- mv ctangle.c ctangleboot.c; \
+ CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c ctangleboot.c; \
elif [ -r ctangleboot.c ]; then \
touch ctangleboot.c; \
else \
@@ -93,8 +93,7 @@ ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch
$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
- CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) common comm-w2c cweb.c; \
- mv cweb.c cwebboot.c; \
+ CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) common comm-w2c cwebboot.c; \
elif [ -r cwebboot.c ]; then \
touch cwebboot.c; \
else \