Mercurial > emacs
changeset 6955:b44a0c16d7ad
(window_system): Obey --with-x11=no and --with-x10=no.
(lib-src/Makefile.in): Use src, not lib-src, in -I.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 19 Apr 1994 00:30:13 +0000 |
| parents | 774fdc20d115 |
| children | d62ea6bf83dc |
| files | configure1.in |
| diffstat | 1 files changed, 21 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure1.in Tue Apr 19 00:17:46 1994 +0000 +++ b/configure1.in Tue Apr 19 00:30:13 1994 +0000 @@ -1165,15 +1165,28 @@ ;; no ) window_system=${window_system}none -esac -case "${with_x11}" in - yes ) - window_system=${window_system}x11 ;; esac -case "${with_x10}" in - yes ) - window_system=${window_system}x10 +case "${window_system}" in + .* ) + ;; + * ) + case "${with_x11}" in + yes ) + window_system=x11 + ;; + no ) + window_system=none + ;; + esac + case "${with_x10}" in + yes ) + window_system=x10 + ;; + no ) + window_system=none + ;; + esac ;; esac @@ -1577,7 +1590,7 @@ sed -e 's@^# \(Generated.*\)$@/* \1 */@' \ -e 's@/\*\*/#\(.*\)$@/* \1 */@' \ < Makefile.in > junk.c - $CPP $undefs -I. -I$top_srcdir/lib-src $CPPFLAGS junk.c | + $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new rm -f junk.c chmod 444 Makefile.new;