From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 29 Apr 1994 21:29:49 +0000 (+0000)
Subject: (window_system): Restore accidentally deleted code that uses AC_FIND_X.
X-Git-Tag: emacs-19.34~8652
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1659e114abc2080ea28a6705135a0fead8de6681;p=emacs.git

(window_system): Restore accidentally deleted code that uses AC_FIND_X.
---

diff --git a/configure1.in b/configure1.in
index ebd646e3378..5a8c1fddd84 100755
--- a/configure1.in
+++ b/configure1.in
@@ -1221,6 +1221,21 @@ case "${window_system}" in
   ;;
 esac
 
+case "${window_system}" in
+  "" | "x11" )
+    ### If the user hasn't specified where we should find X, try
+    ### letting autoconf figure that out.
+    if [ -z "${x_includes}" ] && [ -z "${x_libraries}" ]; then
+      ]
+      AC_FIND_X
+      [
+    fi
+    if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then
+      window_system=x11
+    fi
+  ;;
+esac
+
 [ -z "${window_system}" ] && window_system=none
 
 [ -n "${x_libraries}" ] && LD_SWITCH_X_SITE="-L${x_libraries}"