summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-26 15:28:05 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-26 15:28:05 +0000
commitec6edaec1a0e77818f0b440eb5157011b44eda1d (patch)
tree7a3ec1c3a4968303890e26f4da2ca75850a201b2 /Build/source/texk/xdvik
parent0f26e1a8f3c5c5bcb5031bec4eccedaf313ca534 (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/texk/xdvik')
-rw-r--r--Build/source/texk/xdvik/ac/withenable.ac6
-rwxr-xr-xBuild/source/texk/xdvik/configure18
-rw-r--r--Build/source/texk/xdvik/m4/xdvi-check-xaw.m43
-rw-r--r--Build/source/texk/xdvik/m4/xdvi-find-motif.m42
4 files changed, 27 insertions, 2 deletions
diff --git a/Build/source/texk/xdvik/ac/withenable.ac b/Build/source/texk/xdvik/ac/withenable.ac
index 842b417bdaa..2cd92509fe0 100644
--- a/Build/source/texk/xdvik/ac/withenable.ac
+++ b/Build/source/texk/xdvik/ac/withenable.ac
@@ -6,5 +6,11 @@ dnl
dnl extra_dirs = texk/xdvik/squeeze
dnl
## configure options and TL libraries required for xdvik
+AS_IF([test "x$with_x" = xno],
+ [AS_CASE([$enable_xdvik],
+ [""], [AC_MSG_NOTICE([`--without-x' -> `--disable-xdvik'])
+ enable_xdvik=no
+ ac_configure_args="$ac_configure_args '--disable-xdvik'"],
+ [yes], [AC_MSG_ERROR([Sorry, incompatible options `--without-x' and `--enable-xdvik'])])])
KPSE_ENABLE_PROG([xdvik], [kpathsea t1lib])
m4_include(kpse_TL[texk/xdvik/ac/xdvik.ac])
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 7f1b4d79109..0ad6f54f414 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -21396,9 +21396,18 @@ _ACEOF
fi
elif test "x$default_toolkit" = xnone; then
+ if test "x$enable_build" = xno; then
+ { $as_echo "$as_me:$LINENO: WARNING: building xdvik has been disabled and would fail because
+No Motif." >&5
+$as_echo "$as_me: WARNING: building xdvik has been disabled and would fail because
+No Motif." >&2;}
+else
{ { $as_echo "$as_me:$LINENO: error: No Motif." >&5
$as_echo "$as_me: error: No Motif." >&2;}
{ (exit 1); exit 1; }; }
+fi
+
+
else
# Restore previous X_CFLAGS
X_CFLAGS=$xdvi_motif_save_X_CFLAGS
@@ -21570,11 +21579,20 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
else
+ if test "x$enable_build" = xno; then
+ { $as_echo "$as_me:$LINENO: WARNING: building xdvik has been disabled and would fail because
+Sorry, you will need at least the Xaw header/library files to compile xdvik." >&5
+$as_echo "$as_me: WARNING: building xdvik has been disabled and would fail because
+Sorry, you will need at least the Xaw header/library files to compile xdvik." >&2;}
+else
{ { $as_echo "$as_me:$LINENO: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&5
$as_echo "$as_me: error: Sorry, you will need at least the Xaw header/library files to compile xdvik." >&2;}
{ (exit 1); exit 1; }; }
fi
+
+fi
+
fi
fi
diff --git a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4
index 6f7301c6340..ff398530435 100644
--- a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4
@@ -75,6 +75,7 @@ if test "x$xdvi_have_xaw" = xyes; then
prog_extension="xaw"
AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.])
else
- AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.])
+ KPSE_MSG_ERROR([xdvik],
+ [Sorry, you will need at least the Xaw header/library files to compile xdvik.])
fi
]) # XDVI_CHECK_XAW_LIBRARY
diff --git a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4
index 09f8091ce4b..dcdcf8d4971 100644
--- a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4
@@ -94,7 +94,7 @@ if test "x$xdvi_have_motif" = xyes; then
# Check whether to compile for Motif with Xaw Panner.
_XDVI_CHECK_PANNER
elif test "x$default_toolkit" = xnone; then
- AC_MSG_ERROR([No Motif.])
+ KPSE_MSG_ERROR([xdvik], [No Motif.])
else
# Restore previous X_CFLAGS
X_CFLAGS=$xdvi_motif_save_X_CFLAGS