Mercurial > emacs
changeset 7522:3049e726a161
[HAVE_X11]: Merge $C_SWITCH_X_SITE into CFLAGS
for the Xlib and Xt checks; then restore old CFLAGS.
(HAVE_X11XTR6): Add newline after #endif.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 17 May 1994 05:14:10 +0000 |
| parents | 2971264ff9aa |
| children | 8994727ff976 |
| files | configure1.in |
| diffstat | 1 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure1.in Tue May 17 04:30:32 1994 +0000 +++ b/configure1.in Tue May 17 05:14:10 1994 +0000 @@ -1417,9 +1417,14 @@ test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include" fi +# We change CFLAGS temporarily so that C_SWITCH_X_SITE gets used +# for the tests that follow. +orig_cflags="$CFLAGS" + if test "${HAVE_X11}" = "yes"; then DEFS="$C_SWITCH_X_SITE $DEFS" LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS" + CFLAGS="$C_SWITCH_X_SITE $CFLAGS" AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString \ XScreenNumberOfScreen XSetWMProtocols) fi @@ -1430,7 +1435,8 @@ [ #if XtSpecificationRelease < 6 fail; -#endif], +#endif +], AC_DEFINE(HAVE_X11XTR6)) fi @@ -1453,6 +1459,10 @@ if test -n "$ok_so_far"; then AC_DEFINE(HAVE_INET_SOCKETS) fi + +# Restore the original CFLAGS value. +CFLAGS="$orig_cflags" + [ #### Find out which version of Emacs this is. version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \