From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 13 Jun 2007 17:34:30 +0000 (+0000)
Subject: Link to xaw3d if available.
X-Git-Tag: emacs-pretest-23.0.90~12311
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5262c5c746474b2b375652d0225c4bf2dc3ede8f;p=emacs.git

Link to xaw3d if available.
---

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index be1990ed6fe..4ef2d3fcb67 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -35,12 +35,21 @@ Boston, MA 02110-1301, USA.  */
 #include <X11/CoreP.h>
 #include <X11/Shell.h>
 
+#ifdef HAVE_XAW3D
+#include <X11/Xaw3d/Scrollbar.h>
+#include <X11/Xaw3d/Paned.h>
+#include <X11/Xaw3d/Dialog.h>
+#include <X11/Xaw3d/Form.h>
+#include <X11/Xaw3d/Command.h>
+#include <X11/Xaw3d/Label.h>
+#else /* !HAVE_XAW3D */
 #include <X11/Xaw/Scrollbar.h>
 #include <X11/Xaw/Paned.h>
 #include <X11/Xaw/Dialog.h>
 #include <X11/Xaw/Form.h>
 #include <X11/Xaw/Command.h>
 #include <X11/Xaw/Label.h>
+#endif /* HAVE_XAW3D */
 
 #include <X11/Xatom.h>
 
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index bd5d9adbf9d..542b3ba5a60 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -48,7 +48,11 @@ Boston, MA 02110-1301, USA.  */
 #endif /* not USE_MOTIF && USE_LUCID */
 #endif
 #if defined (USE_XAW)
+#ifdef HAVE_XAW3D
+#include <X11/Xaw3d/Paned.h>
+#else /* !HAVE_XAW3D */
 #include <X11/Xaw/Paned.h>
+#endif /* HAVE_XAW3D */
 #include "lwlib-Xaw.h"
 #endif
 
diff --git a/src/xmenu.c b/src/xmenu.c
index da897396d75..6d9278e3c54 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -82,7 +82,11 @@ Boston, MA 02110-1301, USA.  */
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
 #ifdef USE_LUCID
+#ifdef HAVE_XAW3D
+#include <X11/Xaw3d/Paned.h>
+#else /* !HAVE_XAW3D */
 #include <X11/Xaw/Paned.h>
+#endif /* HAVE_XAW3D */
 #endif /* USE_LUCID */
 #include "../lwlib/lwlib.h"
 #else /* not USE_X_TOOLKIT */