[Freeciv-Dev] configure --with-xaw3d

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

This is a re-touch of a patch to include xaw3d support via configure.
Previous problems may have been due to missing #include <config.h>'s,
but I don't have Xaw3d, so if people who have could test this... :-)

You'll need to "autoconf ; ./configure --with-xaw3d ; make"

-- David

diff -u -r --exclude-from exclude fc-adv/acconfig.h freeciv-mod/acconfig.h
--- fc-adv/acconfig.h   Sun Nov 15 11:43:52 1998
+++ freeciv-mod/acconfig.h      Sun Nov 15 12:10:43 1998
@@ -21,6 +21,7 @@
 #undef HAVE_LIBSM
 #undef HAVE_LIBX11
 #undef HAVE_LIBXAW
+#undef HAVE_LIBXAW3D
 #undef HAVE_LIBXEXT
 #undef HAVE_LIBXMU
 #undef HAVE_LIBXPM
diff -u -r --exclude-from exclude fc-adv/client/pixcomm.c 
freeciv-mod/client/pixcomm.c
--- fc-adv/client/pixcomm.c     Fri May  1 13:41:26 1998
+++ freeciv-mod/client/pixcomm.c        Sun Nov 15 12:14:19 1998
@@ -37,6 +37,10 @@
  * Pixcomm.c - Source code for PixCommand widget.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
 #include <X11/IntrinsicP.h>
@@ -112,6 +116,11 @@
   {
     XtInheritChangeSensitive           /* change_sensitive       */ 
   },  /* SimpleClass fields initialization */
+#if defined(HAVE_LIBXAW3D)
+  {
+    XtInheritXaw3dShadowDraw,           /* shadowdraw           */
+  },  /* ThreeD Class fields initialization */
+#endif
   {
     0,                                     /* field not used    */
   },  /* LabelClass fields initialization */
diff -u -r --exclude-from exclude fc-adv/client/pixcommp.h 
freeciv-mod/client/pixcommp.h
--- fc-adv/client/pixcommp.h    Fri May  1 13:41:55 1998
+++ freeciv-mod/client/pixcommp.h       Sun Nov 15 12:14:11 1998
@@ -46,7 +46,15 @@
 #ifndef _PixcommP_h
 #define _PixcommP_h
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if defined(HAVE_LIBXAW3D)
+#include <X11/Xaw3d/CommandP.h>
+#else
 #include <X11/Xaw/CommandP.h>
+#endif
 
 #include "pixcomm.h"
 
@@ -67,6 +75,9 @@
 typedef struct _PixcommandClassRec {
   CoreClassPart                    core_class;
   SimpleClassPart          simple_class;
+#if defined(HAVE_LIBXAW3D)
+  ThreeDClassPart          threeD_class;
+#endif
   LabelClassPart           label_class;
   CommandClassPart         command_class;
   PixcommClassPart          pixcomm_class;
@@ -90,6 +101,9 @@
 typedef struct _PixcommRec {
     CorePart         core;
     SimplePart      simple;
+#if defined(HAVE_LIBXAW3D)
+    ThreeDPart      threeD;
+#endif
     LabelPart       label;
     CommandPart             command;
     PixcommPart      pixcomm;
diff -u -r --exclude-from exclude fc-adv/config.h.in freeciv-mod/config.h.in
--- fc-adv/config.h.in  Sun Nov 15 11:43:52 1998
+++ freeciv-mod/config.h.in     Sun Nov 15 12:17:17 1998
@@ -36,6 +36,7 @@
 #undef HAVE_LIBSM
 #undef HAVE_LIBX11
 #undef HAVE_LIBXAW
+#undef HAVE_LIBXAW3D
 #undef HAVE_LIBXEXT
 #undef HAVE_LIBXMU
 #undef HAVE_LIBXPM
diff -u -r --exclude-from exclude fc-adv/configure.in freeciv-mod/configure.in
--- fc-adv/configure.in Sun Nov 15 12:08:11 1998
+++ freeciv-mod/configure.in    Sun Nov 15 12:13:06 1998
@@ -44,6 +44,11 @@
   fi
 fi
 
+AC_ARG_WITH(xaw3d,
+       [  --with-xaw3d            compile with Xaw3d instead of Xaw ],
+       WITH_XAW3D=1
+)
+
 AC_ARG_ENABLE(client,
 [  --disable-client        do not compile the client],
 [case "${enableval}" in
@@ -85,7 +90,11 @@
 FC_CHECK_X_LIB(Xt, main)
 FC_CHECK_X_LIB(Xmu, main)
 FC_CHECK_X_LIB(Xpm, XpmReadFileToPixmap, , AC_MSG_ERROR("Need Xpm library"))
-FC_CHECK_X_LIB(Xaw, main)
+if test -z $WITH_XAW3D; then
+       FC_CHECK_X_LIB(Xaw, main)
+else
+       FC_CHECK_X_LIB(Xaw3d, main)
+fi
 dnl LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS"
 
 AC_CHECK_LIB(socket,main)