1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00

(window_system): Obey --with-x11=no and --with-x10=no.

(lib-src/Makefile.in): Use src, not lib-src, in -I.
This commit is contained in:
Richard M. Stallman 1994-04-19 00:30:13 +00:00
parent 1ddb69784b
commit a14938298f

View File

@ -1165,15 +1165,28 @@ case "${with_x}" in
;; ;;
no ) no )
window_system=${window_system}none window_system=${window_system}none
esac
case "${with_x11}" in
yes )
window_system=${window_system}x11
;; ;;
esac esac
case "${with_x10}" in case "${window_system}" in
yes ) .* )
window_system=${window_system}x10 ;;
* )
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 esac
@ -1577,7 +1590,7 @@ echo creating lib-src/Makefile
sed -e 's@^# \(Generated.*\)$@/* \1 */@' \ sed -e 's@^# \(Generated.*\)$@/* \1 */@' \
-e 's@/\*\*/#\(.*\)$@/* \1 */@' \ -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
< Makefile.in > junk.c < 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 sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new
rm -f junk.c rm -f junk.c
chmod 444 Makefile.new; chmod 444 Makefile.new;