Mercurial > emacs

changeset 83722:48c53011093e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New option: --without-xaw3d.
author Jan Djärv <jan.h.d@swipnet.se>
date Wed, 29 Aug 2007 06:36:32 +0000
parents 151b1afb6378
children 1ea781b6ce97
files configure.in
diffstat 1 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Wed Aug 29 06:06:51 2007 +0000
+++ b/configure.in	Wed Aug 29 06:36:32 2007 +0000
@@ -119,6 +119,8 @@
 AC_ARG_WITH(toolkit-scroll-bars,
 [  --without-toolkit-scroll-bars
                           don't use Motif or Xaw3d scroll bars])
+AC_ARG_WITH(xpm,
+[  --without-xaw3d         don't use Xaw3d])
 AC_ARG_WITH(xim,
 [  --without-xim           don't use X11 XIM])
 AC_ARG_WITH(carbon,
@@ -2300,14 +2302,18 @@
   if test x"${HAVE_X11R5}" != xyes; then
     USE_X_TOOLKIT=none
   else
-    AC_MSG_CHECKING(for xaw3d)
-    AC_CACHE_VAL(emacs_cv_xaw3d,
-    [AC_TRY_LINK([
+    if test "$with_xaw3d" != no; then
+      AC_MSG_CHECKING(for xaw3d)
+      AC_CACHE_VAL(emacs_cv_xaw3d,
+      [AC_TRY_LINK([
 #include <X11/Intrinsic.h>
 #include <X11/Xaw3d/Simple.h>],
-      [],
-      emacs_cv_xaw3d=yes,
-      emacs_cv_xaw3d=no)])
+        [],
+        emacs_cv_xaw3d=yes,
+        emacs_cv_xaw3d=no)])
+    else
+      emacs_cv_xaw3d=no
+    fi
     if test $emacs_cv_xaw3d = yes; then
       AC_MSG_RESULT([yes; using Lucid toolkit])
       USE_X_TOOLKIT=LUCID