comparison configure1.in @ 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.

7521:2971264ff9aa

if test -d /usr/X386/include; then
  HAVE_XFREE386=yes
  test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include"
fi

if test "${HAVE_X11}" = "yes"; then
  DEFS="$C_SWITCH_X_SITE $DEFS"
  LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS"
  AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString \
XScreenNumberOfScreen XSetWMProtocols)
fi

if test "${USE_X_TOOLKIT}" != "none"; then
  AC_COMPILE_CHECK(X11 toolkit version,
		   [#include <X11/Intrinsic.h>],
		   [
#if XtSpecificationRelease < 6
fail;
#endif],
		   AC_DEFINE(HAVE_X11XTR6))
fi

AC_ALLOCA

  AC_HEADER_CHECK(arpa/inet.h, , ok_so_far=)
fi
if test -n "$ok_so_far"; then
  AC_DEFINE(HAVE_INET_SOCKETS)
fi
[
#### Find out which version of Emacs this is.
version=`grep 'defconst[	 ]*emacs-version' ${srcdir}/lisp/version.el \
	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
if [ x"${version}" = x ]; then

7522:3049e726a161

if test -d /usr/X386/include; then
  HAVE_XFREE386=yes
  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

if test "${USE_X_TOOLKIT}" != "none"; then
  AC_COMPILE_CHECK(X11 toolkit version,
		   [#include <X11/Intrinsic.h>],
		   [
#if XtSpecificationRelease < 6
fail;
#endif
],
		   AC_DEFINE(HAVE_X11XTR6))
fi

AC_ALLOCA

  AC_HEADER_CHECK(arpa/inet.h, , ok_so_far=)
fi
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 \
	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
if [ x"${version}" = x ]; then