summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-02-29 15:40:00 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2008-02-29 15:40:00 +0000
commit2b049d253dc2dfcbddc656ee3bffedf9f65a67b2 (patch)
tree11d05560a28146f8bb03fe436ae00e5e5ffd2712 /Build/source/configure
parentb18fbbf19bcc21a491e8c0145b1d7b2d3507ef21 (diff)
next step in autotools update
add autoheader in reautoconf script and maintainer rules (maintainer mode still has some problems) remove need for acconfig.h (templates via AC_DEFINE) svn:ignore atom4te.cache directories reautoconf of the whole tree git-svn-id: svn://tug.org/texlive/trunk@6773 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-xBuild/source/configure98
1 files changed, 63 insertions, 35 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 1286a3a717e..ef81b2059b2 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -5235,8 +5235,14 @@ fi
export enable_install_warnings
# e.g. for lcdf-typetools
-: ${enable_tetex_build=yes}
-export enable_tetex_build
+# With --enable-maintainer-mode, just exporting enable_tetex_build=yes
+# isn't enough: e.g., `make' => `configure --recheck'.
+# FIXME: the same should also be done for other options
+if test "x$enable_tetex_build" = x; then
+ enable_tetex_build=yes
+ export enable_tetex_build
+ ac_configure_args="$ac_configure_args '--enable-tetex-build'"
+fi
# for lcdf-typetools
: ${with_kpathsea=yes}
@@ -5797,19 +5803,23 @@ fi
# Check whether --with-editor was given.
if test "${with_editor+set}" = set; then
- withval=$with_editor; cat >>confdefs.h <<_ACEOF
-#define EDITOR "$with_editor"
-_ACEOF
+ withval=$with_editor;
+else
+ with_editor="vi +%d %s"
+fi
-fi
+cat >>confdefs.h <<_ACEOF
+#define EDITOR "$with_editor"
+_ACEOF
# Check whether --enable-ipc was given.
if test "${enable_ipc+set}" = set; then
enableval=$enable_ipc; if test "x$enableval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define IPC 1
+
+cat >>confdefs.h <<\_ACEOF
+#define IPC
_ACEOF
# -lsocket is needed on Solaris, at least. Maybe -lnsl on SCO, too?
@@ -5971,18 +5981,21 @@ fi
# Check whether --enable-auto-core was given.
if test "${enable_auto_core+set}" = set; then
- enableval=$enable_auto_core; cat >>confdefs.h <<\_ACEOF
-#define FUNNY_CORE_DUMP 1
+ enableval=$enable_auto_core;
+cat >>confdefs.h <<\_ACEOF
+#define FUNNY_CORE_DUMP
_ACEOF
+
fi
# Check whether --enable-dump-share was given.
if test "${enable_dump_share+set}" = set; then
enableval=$enable_dump_share; if test "x$enableval" = xno; then
- cat >>confdefs.h <<\_ACEOF
-#define NO_DUMP_SHARE 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_DUMP_SHARE
_ACEOF
fi
@@ -6008,8 +6021,9 @@ fi
# Check whether --with-epsfwin was given.
if test "${with_epsfwin+set}" = set; then
withval=$with_epsfwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define EPSFWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define EPSFWIN
_ACEOF
fi
@@ -6020,8 +6034,9 @@ fi
# Check whether --with-hp2627win was given.
if test "${with_hp2627win+set}" = set; then
withval=$with_hp2627win; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define HP2627WIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define HP2627WIN
_ACEOF
fi
@@ -6032,8 +6047,9 @@ fi
# Check whether --with-mftalkwin was given.
if test "${with_mftalkwin+set}" = set; then
withval=$with_mftalkwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define MFTALKWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define MFTALKWIN
_ACEOF
fi
@@ -6044,8 +6060,9 @@ fi
# Check whether --with-nextwin was given.
if test "${with_nextwin+set}" = set; then
withval=$with_nextwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define NEXTWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NEXTWIN
_ACEOF
fi
@@ -6056,8 +6073,9 @@ fi
# Check whether --with-regiswin was given.
if test "${with_regiswin+set}" = set; then
withval=$with_regiswin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define REGISWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define REGISWIN
_ACEOF
fi
@@ -6069,8 +6087,9 @@ fi
if test "${with_suntoolswin+set}" = set; then
withval=$with_suntoolswin; if test "x$withval" = xyes; then
wlibs="-lsuntool -lsunwindow -lpixrect $wlibs"
- cat >>confdefs.h <<\_ACEOF
-#define SUNWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define SUNWIN
_ACEOF
fi
@@ -6081,8 +6100,9 @@ fi
# Check whether --with-tektronixwin was given.
if test "${with_tektronixwin+set}" = set; then
withval=$with_tektronixwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define TEKTRONIXWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define TEKTRONIXWIN
_ACEOF
fi
@@ -6093,8 +6113,9 @@ fi
# Check whether --with-unitermwin was given.
if test "${with_unitermwin+set}" = set; then
withval=$with_unitermwin; if test "x$withval" = xyes; then
- cat >>confdefs.h <<\_ACEOF
-#define UNITERMWIN 1
+
+cat >>confdefs.h <<\_ACEOF
+#define UNITERMWIN
_ACEOF
fi
@@ -6162,7 +6183,8 @@ fi
# Check whether --enable-grey was given.
if test "${enable_grey+set}" = set; then
enableval=$enable_grey; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define GREY 1
_ACEOF
@@ -6180,7 +6202,8 @@ fi
# Check whether --enable-color was given.
if test "${enable_color+set}" = set; then
enableval=$enable_color; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define COLOR 1
_ACEOF
@@ -6202,11 +6225,13 @@ if test "${enable_t1lib+set}" = set; then
enableval=$enable_t1lib; if test "$enableval" = yes; then
T1LIB=1
LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define LDT1LIB 1
_ACEOF
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define T1LIB 1
_ACEOF
@@ -6232,7 +6257,8 @@ fi
# Check whether --enable-gf was given.
if test "${enable_gf+set}" = set; then
enableval=$enable_gf; if test "$enableval" != no; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define USE_GF 1
_ACEOF
@@ -6245,7 +6271,8 @@ fi
# Check whether --enable-a4 was given.
if test "${enable_a4+set}" = set; then
enableval=$enable_a4; if test "$enableval" = yes; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define A4 1
_ACEOF
@@ -6289,7 +6316,8 @@ if test "${enable_magick+set}" = set; then
X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD"
X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP"
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define MAGICK 1
_ACEOF