mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-22 10:26:20 +00:00
Code Issues Releases Activity

Determine HAVE_X11R6.

Browse Source 
(HAVE_MENUS): Renamed from HAVE_X_MENU.
This commit is contained in:
Richard M. Stallman 1995-12-25 01:23:18 +00:00
parent 0afac48c3f
commit 08741ba9ec
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in
View File

@ -1032,9 +1032,9 @@ esac
X_TOOLKIT_TYPE=$USE_X_TOOLKIT X_TOOLKIT_TYPE=$USE_X_TOOLKIT
### If we're using X11, we should use the X menu package. ### If we're using X11, we should use the X menu package.
HAVE_X_MENU=no HAVE_MENUS=no
case ${HAVE_X11} in case ${HAVE_X11} in
yes ) HAVE_X_MENU=yes ;; yes ) HAVE_MENUS=yes ;;
esac esac
if test "${opsys}" = "hpux9"; then if test "${opsys}" = "hpux9"; then
@ -1255,6 +1255,17 @@ XScreenNumberOfScreen XSetWMProtocols)
AC_CHECK_LIB(Xmu, XmuConvertStandardSelection) AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
fi fi
if test "${window_system}" = "x11"; then
AC_MSG_CHECKING(X11 version)
AC_TRY_LINK([#include <X11/Xlib.h>],
[#if XlibSpecificationRelease < 6
fail;
#endif
], [AC_MSG_RESULT(6)
AC_DEFINE(HAVE_X11R6)],
[AC_MSG_RESULT(not 6)])
fi
if test "${USE_X_TOOLKIT}" != "none"; then if test "${USE_X_TOOLKIT}" != "none"; then
AC_MSG_CHECKING(X11 toolkit version) AC_MSG_CHECKING(X11 toolkit version)
AC_TRY_LINK([#include <X11/Intrinsic.h>], AC_TRY_LINK([#include <X11/Intrinsic.h>],
@ -1419,8 +1430,8 @@ fi
if test "${HAVE_XFREE386}" = "yes" ; then if test "${HAVE_XFREE386}" = "yes" ; then
AC_DEFINE(HAVE_XFREE386) AC_DEFINE(HAVE_XFREE386)
fi fi
if test "${HAVE_X_MENU}" = "yes" ; then if test "${HAVE_MENUS}" = "yes" ; then
AC_DEFINE(HAVE_X_MENU) AC_DEFINE(HAVE_MENUS)
fi fi
if test "${GNU_MALLOC}" = "yes" ; then if test "${GNU_MALLOC}" = "yes" ; then
AC_DEFINE(GNU_MALLOC) AC_DEFINE(GNU_MALLOC)