Mercurial > emacs

comparison configure.in @ 13845:e6b5e975dfa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Determine HAVE_X11R6. (HAVE_MENUS): Renamed from HAVE_X_MENU.
author Richard M. Stallman <rms@gnu.org>
date Mon, 25 Dec 1995 01:23:18 +0000
parents 7d48799c80b5
children 0a94cd2c51c4
comparison
equal deleted inserted replaced
13844:142e3db94b69 13845:e6b5e975dfa2
1030 ;; 1030 ;;
1031 esac 1031 esac
1032 X_TOOLKIT_TYPE=$USE_X_TOOLKIT 1032 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
1033 1033
1034 ### If we're using X11, we should use the X menu package. 1034 ### If we're using X11, we should use the X menu package.
1035 HAVE_X_MENU=no 1035 HAVE_MENUS=no
1036 case ${HAVE_X11} in 1036 case ${HAVE_X11} in
1037 yes ) HAVE_X_MENU=yes ;; 1037 yes ) HAVE_MENUS=yes ;;
1038 esac 1038 esac
1039 1039
1040 if test "${opsys}" = "hpux9"; then 1040 if test "${opsys}" = "hpux9"; then
1041 case "${x_libraries}" in 1041 case "${x_libraries}" in
1042 *X11R4* ) 1042 *X11R4* )
1253 AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \ 1253 AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
1254 XScreenNumberOfScreen XSetWMProtocols) 1254 XScreenNumberOfScreen XSetWMProtocols)
1255 AC_CHECK_LIB(Xmu, XmuConvertStandardSelection) 1255 AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
1256 fi 1256 fi
1257 1257
1258 if test "${window_system}" = "x11"; then
1259 AC_MSG_CHECKING(X11 version)
1260 AC_TRY_LINK([#include <X11/Xlib.h>],
1261 [#if XlibSpecificationRelease < 6
1262 fail;
1263 #endif
1264 ], [AC_MSG_RESULT(6)
1265 AC_DEFINE(HAVE_X11R6)],
1266 [AC_MSG_RESULT(not 6)])
1267 fi
1268
1258 if test "${USE_X_TOOLKIT}" != "none"; then 1269 if test "${USE_X_TOOLKIT}" != "none"; then
1259 AC_MSG_CHECKING(X11 toolkit version) 1270 AC_MSG_CHECKING(X11 toolkit version)
1260 AC_TRY_LINK([#include <X11/Intrinsic.h>], 1271 AC_TRY_LINK([#include <X11/Intrinsic.h>],
1261 [#if XtSpecificationRelease < 6 1272 [#if XtSpecificationRelease < 6
1262 fail; 1273 fail;
1417 AC_DEFINE(HAVE_X11) 1428 AC_DEFINE(HAVE_X11)
1418 fi 1429 fi
1419 if test "${HAVE_XFREE386}" = "yes" ; then 1430 if test "${HAVE_XFREE386}" = "yes" ; then
1420 AC_DEFINE(HAVE_XFREE386) 1431 AC_DEFINE(HAVE_XFREE386)
1421 fi 1432 fi
1422 if test "${HAVE_X_MENU}" = "yes" ; then 1433 if test "${HAVE_MENUS}" = "yes" ; then
1423 AC_DEFINE(HAVE_X_MENU) 1434 AC_DEFINE(HAVE_MENUS)
1424 fi 1435 fi
1425 if test "${GNU_MALLOC}" = "yes" ; then 1436 if test "${GNU_MALLOC}" = "yes" ; then
1426 AC_DEFINE(GNU_MALLOC) 1437 AC_DEFINE(GNU_MALLOC)
1427 fi 1438 fi
1428 if test "${REL_ALLOC}" = "yes" ; then 1439 if test "${REL_ALLOC}" = "yes" ; then