diff options
| author | David J. MacKenzie | 1994-09-01 04:47:05 +0000 |
|---|---|---|
| committer | David J. MacKenzie | 1994-09-01 04:47:05 +0000 |
| commit | ea50c238783960179e52e45fba322e3fe0c37803 (patch) | |
| tree | 8abeb0c061029422a0bd114406a5e17da3301ac3 | |
| parent | 99b11016b7a6f61eb4717f48e2763cbe2f0349fd (diff) | |
| download | emacs-ea50c238783960179e52e45fba322e3fe0c37803.tar.gz emacs-ea50c238783960179e52e45fba322e3fe0c37803.zip | |
*** empty log message ***
| -rw-r--r-- | configure.in | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/configure.in b/configure.in index ea4d9adf6ea..057da09528c 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -24,8 +24,6 @@ AC_ARG_WITH(x10, | |||
| 24 | [ --with-x10 Support the X Window System version 10]) | 24 | [ --with-x10 Support the X Window System version 10]) |
| 25 | AC_ARG_WITH(x, | 25 | AC_ARG_WITH(x, |
| 26 | [ --with-x Support the X Window System version 11]) | 26 | [ --with-x Support the X Window System version 11]) |
| 27 | AC_ARG_WITH(x11, | ||
| 28 | [ --with-x11 Support the X Window System version 11]) | ||
| 29 | AC_ARG_WITH(x-toolkit, | 27 | AC_ARG_WITH(x-toolkit, |
| 30 | [ --with-x-toolkit=KIT Use an X toolkit (KIT = lucid or athena)], | 28 | [ --with-x-toolkit=KIT Use an X toolkit (KIT = lucid or athena)], |
| 31 | [ case "${withval}" in | 29 | [ case "${withval}" in |
| @@ -841,7 +839,7 @@ dnl other checks for UNIX variants | |||
| 841 | case "${with_x10}" in | 839 | case "${with_x10}" in |
| 842 | yes ) window_system=x10 ;; | 840 | yes ) window_system=x10 ;; |
| 843 | no ) window_system=none ;; | 841 | no ) window_system=none ;; |
| 844 | *) test -n "$with_x11" && with_x="$with_x11" | 842 | *) |
| 845 | AC_FIND_X | 843 | AC_FIND_X |
| 846 | if test "$no_x" = yes; then | 844 | if test "$no_x" = yes; then |
| 847 | window_system=none | 845 | window_system=none |
| @@ -1217,17 +1215,8 @@ test "${exec_prefix}" != NONE && | |||
| 1217 | exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` | 1215 | exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` |
| 1218 | changequote([, ])dnl | 1216 | changequote([, ])dnl |
| 1219 | 1217 | ||
| 1220 | save_no_create="$no_create" | 1218 | AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile \ |
| 1221 | no_create=yes | 1219 | lwlib/Makefile src/Makefile.in, [ |
| 1222 | |||
| 1223 | AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile lwlib/Makefile src/Makefile.in) | ||
| 1224 | |||
| 1225 | cat >> ${CONFIG_STATUS} <<EOF | ||
| 1226 | CPP="$CPP" CPPFLAGS="$CPPFLAGS" | ||
| 1227 | EOF | ||
| 1228 | |||
| 1229 | cat >> ${CONFIG_STATUS} <<\EOF | ||
| 1230 | |||
| 1231 | ### Make the necessary directories, if they don't exist. | 1220 | ### Make the necessary directories, if they don't exist. |
| 1232 | for dir in ./src ./lib-src ./cpp ./oldXMenu ./lwlib ./etc ; do | 1221 | for dir in ./src ./lib-src ./cpp ./oldXMenu ./lwlib ./etc ; do |
| 1233 | if test ! -d ${dir}; then | 1222 | if test ! -d ${dir}; then |
| @@ -1282,6 +1271,4 @@ echo creating src/Makefile | |||
| 1282 | chmod 444 Makefile.new | 1271 | chmod 444 Makefile.new |
| 1283 | mv -f Makefile.new Makefile | 1272 | mv -f Makefile.new Makefile |
| 1284 | ) | 1273 | ) |
| 1285 | EOF | 1274 | ], [CPP="$CPP" CPPFLAGS="$CPPFLAGS"]) |
| 1286 | |||
| 1287 | test "$save_no_create" = yes || ${CONFIG_SHELL-/bin/sh} ${CONFIG_STATUS} | ||