[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Thu, 01 Nov 2007 07:38:14 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 07/11/01 07:38:13
Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -b -r1.477 -r1.478
--- configure.in 17 Oct 2007 15:53:01 -0000 1.477
+++ configure.in 1 Nov 2007 07:38:13 -0000 1.478
@@ -2118,24 +2118,6 @@
fi
fi
-if test "${window_system}" = "x11"; then
- AC_MSG_CHECKING(X11 version 5)
- AC_CACHE_VAL(emacs_cv_x11_version_5,
- [AC_TRY_LINK([#include <X11/Xlib.h>],
-[#if XlibSpecificationRelease < 5
-fail;
-#endif
-], emacs_cv_x11_version_5=yes, emacs_cv_x11_version_5=no)])
- if test $emacs_cv_x11_version_5 = yes; then
- AC_MSG_RESULT(5 or newer)
- HAVE_X11R5=yes
- AC_DEFINE(HAVE_X11R5, 1,
- [Define to 1 if you have the X11R5 or newer version of Xlib.])
- else
- HAVE_X11R5=no
- AC_MSG_RESULT(before 5)
- fi
-fi
### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
HAVE_RSVG=no
@@ -2298,9 +2280,6 @@
dnl Older compilers (eg sunos4 cc) choke on it.
HAVE_XAW3D=no
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
- if test x"${HAVE_X11R5}" != xyes; then
- USE_X_TOOLKIT=none
- else
if test "$with_xaw3d" != no; then
AC_MSG_CHECKING(for xaw3d)
AC_CACHE_VAL(emacs_cv_xaw3d,
@@ -2339,7 +2318,6 @@
USE_X_TOOLKIT=none
fi
fi
- fi
fi
X_TOOLKIT_TYPE=$USE_X_TOOLKIT
@@ -3359,7 +3337,7 @@
#ifdef HAVE_X11R6
#define HAVE_X_I18N
-#elif defined HAVE_X11R5 && !defined X11R5_INHIBIT_I18N
+#elif !defined X11R5_INHIBIT_I18N
#define HAVE_X_I18N
#endif
- [Emacs-diffs] Changes to emacs/configure.in,v,
Jan Djärv <=