diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-26 15:28:05 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-26 15:28:05 +0000 |
| commit | ec6edaec1a0e77818f0b440eb5157011b44eda1d (patch) | |
| tree | 7a3ec1c3a4968303890e26f4da2ca75850a201b2 /Build/source/utils | |
| parent | 0f26e1a8f3c5c5bcb5031bec4eccedaf313ca534 (diff) | |
build system: handle --without-x
git-svn-id: svn://tug.org/texlive/trunk@13482 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
| -rwxr-xr-x | Build/source/utils/configure | 34 | ||||
| -rw-r--r-- | Build/source/utils/pdfopen/ac/withenable.ac | 6 |
2 files changed, 40 insertions, 0 deletions
diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 9cc3507c641..ffc38539cec 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -2213,6 +2213,14 @@ fi +case $with_x in + yes | no) : ;; + *) with_x=yes + { $as_echo "$as_me:$LINENO: Assuming \`--with-x'" >&5 +$as_echo "$as_me: Assuming \`--with-x'" >&6;} + ac_configure_args="$ac_configure_args '--with-x'" ;; +esac + ## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/ ## configure options and TL libraries required for dialog # Check whether --enable-dialog was given. @@ -2230,6 +2238,19 @@ esac ## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/ ## configure options and TL libraries required for pdfopen +if test "x$with_x" = xno; then + case $enable_pdfopen in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-pdfopen'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-pdfopen'" >&6;} + enable_pdfopen=no + ac_configure_args="$ac_configure_args '--disable-pdfopen'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-pdfopen'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-pdfopen was given. if test "${enable_pdfopen+set}" = set; then enableval=$enable_pdfopen; @@ -3051,6 +3072,19 @@ test "x$enable_xdv2pdf" = xno || { ## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik +if test "x$with_x" = xno; then + case $enable_xdvik in + "") { $as_echo "$as_me:$LINENO: \`--without-x' -> \`--disable-xdvik'" >&5 +$as_echo "$as_me: \`--without-x' -> \`--disable-xdvik'" >&6;} + enable_xdvik=no + ac_configure_args="$ac_configure_args '--disable-xdvik'" ;; + yes) { { $as_echo "$as_me:$LINENO: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&5 +$as_echo "$as_me: error: Sorry, incompatible options \`--without-x' and \`--enable-xdvik'" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +fi + # Check whether --enable-xdvik was given. if test "${enable_xdvik+set}" = set; then enableval=$enable_xdvik; diff --git a/Build/source/utils/pdfopen/ac/withenable.ac b/Build/source/utils/pdfopen/ac/withenable.ac index af5081f81ca..5aed0888cd2 100644 --- a/Build/source/utils/pdfopen/ac/withenable.ac +++ b/Build/source/utils/pdfopen/ac/withenable.ac @@ -4,4 +4,10 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for pdfopen +AS_IF([test "x$with_x" = xno], + [AS_CASE([$enable_pdfopen], + [""], [AC_MSG_NOTICE([`--without-x' -> `--disable-pdfopen']) + enable_pdfopen=no + ac_configure_args="$ac_configure_args '--disable-pdfopen'"], + [yes], [AC_MSG_ERROR([Sorry, incompatible options `--without-x' and `--enable-pdfopen'])])]) KPSE_ENABLE_PROG([pdfopen]) |