[Emacs-diffs] Changes to emacs/configure.in,v

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        07/08/29 06:36:32

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -b -r1.465 -r1.466
--- configure.in        29 Aug 2007 05:28:08 -0000      1.465
+++ configure.in        29 Aug 2007 06:36:32 -0000      1.466
@@ -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,6 +2302,7 @@
   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,
     [AC_TRY_LINK([
@@ -2308,6 +2311,9 @@
       [],
       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