From 4a666956be62815c5ed2b18bac6dd717ab20d6f8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 24 May 1998 02:02:20 +0000 Subject: [PATCH] Bombo out with a moderately helpful message if detection of X libraries Sat May 23 21:54:05 1998 Owen Taylor * configure.in (LDFLAGS): Bombo out with a moderately helpful message if detection of X libraries fails. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 10 +++++++++- 8 files changed, 44 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 00eefbcaa8..4f50b22c66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + Thu May 21 12:33:15 BST 1998 Tony Gale [1-1-0-Merge] diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 00eefbcaa8..4f50b22c66 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + Thu May 21 12:33:15 BST 1998 Tony Gale [1-1-0-Merge] diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 00eefbcaa8..4f50b22c66 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + Thu May 21 12:33:15 BST 1998 Tony Gale [1-1-0-Merge] diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 00eefbcaa8..4f50b22c66 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + Thu May 21 12:33:15 BST 1998 Tony Gale [1-1-0-Merge] diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 00eefbcaa8..4f50b22c66 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + Thu May 21 12:33:15 BST 1998 Tony Gale [1-1-0-Merge] diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 00eefbcaa8..4f50b22c66 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + Thu May 21 12:33:15 BST 1998 Tony Gale [1-1-0-Merge] diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 00eefbcaa8..4f50b22c66 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat May 23 21:54:05 1998 Owen Taylor + + * configure.in (LDFLAGS): Bombo out with a moderately + helpful message if detection of X libraries fails. + Thu May 21 12:33:15 BST 1998 Tony Gale [1-1-0-Merge] diff --git a/configure.in b/configure.in index 47c7931de5..3927e9e96a 100644 --- a/configure.in +++ b/configure.in @@ -93,6 +93,12 @@ fi AC_PATH_X AC_PATH_XTRA +if test "x$no_x" = "xyes"; then + AC_MSG_ERROR([ +*** X libraries or include files not found. Check 'config.log' for +*** more details.]) +fi + if test "x$x_includes" = "x"; then x_includes="/usr/include" fi @@ -105,7 +111,9 @@ LDFLAGS="$X_LDFLAGS $X_LIBS" # Checks for libraries. # Check for the X11 library -AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", no_x11_lib=yes, $X_EXTRA_LIBS) +AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", + AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]), + $X_EXTRA_LIBS) if test "x$enable_shm" = "xyes"; then # Check for the Xext library (needed for XShm extention)