Attempted to add configury for NanoX compatibility

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 0626ea8661d228d6429ffe536ed4a1010600c5c8..c7bf5bf5e47216d49463681391ec55b836980d72 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -330,6 +330,8 @@ DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNIVERSAL=no
 
 if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNIVERSAL=no
 

+  DEFAULT_wxUSE_NANOX=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes


@@ -502,6 +504,8 @@ if test $DEBUG_CONFIGURE = 1; then
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 

+  DEFAULT_wxUSE_NANOX=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes


@@ -713,6 +717,7 @@ AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Mana
 AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" CACHE_X11=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" CACHE_X11=1 TOOLKIT_GIVEN=1])

+WX_ARG_ENABLE(nanox    ,   [  --enable-nanox          use NanoX], wxUSE_NANOX)

 
 AC_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
 
 
 AC_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
 


@@ -1849,6 +1854,16 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 

+        if test "$wxUSE_NANOX" = 1; then
+            AC_MSG_CHECKING(for MicroWindows/NanoX distribution)
+            if test "x$MICROWIN" = x ; then
+                AC_MSG_RESULT(not found)
+                AC_MSG_ERROR([Cannot find MicroWindows library. Make sure MICROWIN is set.])
+            else
+                AC_MSG_RESULT($MICROWIN)
+            fi
+        fi
+

         xpm_link=
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
         xpm_link=
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)


@@ -1880,11 +1895,18 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             )
         fi
 
             )
         fi
 

-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
+        if test "$wxUSE_NANOX" = 1; then
+            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox $TOOLKIT_INCLUDE"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__NANOX__"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $MICROWIN/src/lib/libnano-X.a $MICROWIN/src/lib/libmwengine.a $MICROWIN/src/lib/libmwfonts.a $MICROWIN/src/lib/libmwdrivers.a $MICROWIN/src/lib/libmwobjects.a"
+        else
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
+        fi
+

         TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ \${top_srcdir}/src/univ/themes"
         TOOLKIT=X11
         GUIDIST=X11_DIST
         TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ \${top_srcdir}/src/univ/themes"
         TOOLKIT=X11
         GUIDIST=X11_DIST

-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"

     fi
 
     if test "$wxUSE_WINE" = 1; then
     fi
 
     if test "$wxUSE_WINE" = 1; then

diff --git a/include/wx/x11/nanox/X11/Xatom.h b/include/wx/x11/nanox/X11/Xatom.h
new file mode 100644 (file)
index 0000000..adf6bea
--- /dev/null
+++ b/include/wx/x11/nanox/X11/Xatom.h
@@ -0,0 +1,5 @@
+/*
+ * Xlib compatibility
+ */
+
+/* Nothing yet */

diff --git a/include/wx/x11/nanox/X11/Xlib.h b/include/wx/x11/nanox/X11/Xlib.h
new file mode 100644 (file)
index 0000000..a43c74f
--- /dev/null
+++ b/include/wx/x11/nanox/X11/Xlib.h
@@ -0,0 +1,5 @@
+/*
+ * Xlib compatibility
+ */
+
+#include "XtoNX.h"

diff --git a/include/wx/x11/nanox/X11/Xutil.h b/include/wx/x11/nanox/X11/Xutil.h
new file mode 100644 (file)
index 0000000..adf6bea
--- /dev/null
+++ b/include/wx/x11/nanox/X11/Xutil.h
@@ -0,0 +1,5 @@
+/*
+ * Xlib compatibility
+ */
+
+/* Nothing yet */