Complain if X seems to be installed but no

development files where found.

diff --git a/ChangeLog b/ChangeLog
index d535c87bd5d853734a046289e2ede4f4bd77ce6b..f793c64244eed785806d72462ceba60dd8bc901e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-20  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * configure.in: Complain if X seems to be installed but no
+       development files where found.
+
 2007-06-20  Glenn Morris  <rgm@gnu.org>
 
        * configure.in: Prefer libgif over libungif.

diff --git a/configure.in b/configure.in
index f4d6aa1a5ab751bf5f62a5929bb05d45c6731360..b5c6c1b0aa24e30ce355f87194503213adae58b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1892,6 +1892,22 @@ dnl use the toolkit if we have gtk, or X11R5 or newer.
   ;;
 esac
 
+if test "$window_system" = none && test "X$with_x" != "Xno"; then
+   AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
+   if test "$HAVE_XSERVER" = true ||
+      test -n "$DISPLAY" || 
+      test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
+        AC_MSG_ERROR([You seem to be running X, but no X development libraries
+where found.  You should install the relevant development files for X
+and the for the toolkit you want, such as Gtk+, Lesstif or Motif.  Also make
+sure you have development files for image handling, i.e.
+tiff, gif, jpeg, png and xpm.
+If you are sure you want Emacs compiled without X window support, pass
+  --without-x
+to configure.])
+   fi
+fi
+
 ### If we're using X11, we should use the X menu package.
 HAVE_MENUS=no
 case ${HAVE_X11} in