diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 5 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/configure | 10 | ||||
| -rw-r--r-- | Build/source/texk/web2c/configure.ac | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index a293d1b9c4e..fad27534113 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2009-06-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: when Metafont is not built, use + '--without-mf-x-toolkit' and '--without-x' as default. + 2009-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> * cpascal.h: #include "lib/lib.h" and move declarations for diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 3f49a0adf28..74f45748d6f 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -19004,9 +19004,11 @@ fi # Handle --with-mf-x-toolkit and --with-x +test "x$enable_mf" = xno || enable_mf=yes case $with_mf_x_toolkit in yes|no) : ;; - ''|y|ye) with_mf_x_toolkit=yes ;; + '') with_mf_x_toolkit=$enable_mf ;; + y|ye) with_mf_x_toolkit=yes ;; n) with_mf_x_toolkit=no ;; *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&5 $as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&2;} @@ -19015,7 +19017,7 @@ esac test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no -: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified. +: ${with_x=$enable_mf} # tell PATH_XTRA to use X for Metafont, if not specified. # Distinguish no X at all, no toolkit, or toolkit. { $as_echo "$as_me:$LINENO: checking for X" >&5 @@ -20399,8 +20401,8 @@ fi if test "x$with_x" = xyes; then if test "x$no_x" = xyes; then - { { $as_echo "$as_me:$LINENO: error: Sorry, could not find required X include and library files." >&5 -$as_echo "$as_me: error: Sorry, could not find required X include and library files." >&2;} + { { $as_echo "$as_me:$LINENO: error: Sorry, could not find X include and library files required for Metafont." >&5 +$as_echo "$as_me: error: Sorry, could not find X include and library files required for Metafont." >&2;} { (exit 1); exit 1; }; } fi test -n "$x_libraries" && XLFLAG="-L$x_libraries" diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 2617229d7bc..88bfce0136b 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -149,21 +149,23 @@ AM_CONDITIONAL([MF], [test "x$enable_mf" != xno]) AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" != xno]) # Handle --with-mf-x-toolkit and --with-x +test "x$enable_mf" = xno || enable_mf=yes AS_CASE([$with_mf_x_toolkit], [yes|no], [], - [''|y|ye], [with_mf_x_toolkit=yes], + [''], [with_mf_x_toolkit=$enable_mf], + [y|ye], [with_mf_x_toolkit=yes], [n], [with_mf_x_toolkit=no], [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.]) with_mf_x_toolkit=yes]) test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no -: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified. +: ${with_x=$enable_mf} # tell PATH_XTRA to use X for Metafont, if not specified. # Distinguish no X at all, no toolkit, or toolkit. AC_PATH_XTRA if test "x$with_x" = xyes; then if test "x$no_x" = xyes; then - AC_MSG_ERROR([Sorry, could not find required X include and library files.]) + AC_MSG_ERROR([Sorry, could not find X include and library files required for Metafont.]) fi test -n "$x_libraries" && XLFLAG="-L$x_libraries" wlibs="$XLFLAG -lX11" |