diff options
| author | Richard M. Stallman | 1994-04-29 21:29:49 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-04-29 21:29:49 +0000 |
| commit | 1659e114abc2080ea28a6705135a0fead8de6681 (patch) | |
| tree | 1d95c12e3c784f87aff36948ae7d82329fe93096 | |
| parent | b4929f755ecdc6778604c428842fc39f31b259b1 (diff) | |
| download | emacs-1659e114abc2080ea28a6705135a0fead8de6681.tar.gz emacs-1659e114abc2080ea28a6705135a0fead8de6681.zip | |
(window_system): Restore accidentally deleted code that uses AC_FIND_X.
| -rwxr-xr-x | configure1.in | 15 |
1 files changed, 15 insertions, 0 deletions
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 | |||
| 1221 | ;; | 1221 | ;; |
| 1222 | esac | 1222 | esac |
| 1223 | 1223 | ||
| 1224 | case "${window_system}" in | ||
| 1225 | "" | "x11" ) | ||
| 1226 | ### If the user hasn't specified where we should find X, try | ||
| 1227 | ### letting autoconf figure that out. | ||
| 1228 | if [ -z "${x_includes}" ] && [ -z "${x_libraries}" ]; then | ||
| 1229 | ] | ||
| 1230 | AC_FIND_X | ||
| 1231 | [ | ||
| 1232 | fi | ||
| 1233 | if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then | ||
| 1234 | window_system=x11 | ||
| 1235 | fi | ||
| 1236 | ;; | ||
| 1237 | esac | ||
| 1238 | |||
| 1224 | [ -z "${window_system}" ] && window_system=none | 1239 | [ -z "${window_system}" ] && window_system=none |
| 1225 | 1240 | ||
| 1226 | [ -n "${x_libraries}" ] && LD_SWITCH_X_SITE="-L${x_libraries}" | 1241 | [ -n "${x_libraries}" ] && LD_SWITCH_X_SITE="-L${x_libraries}" |