added UnixWare recognition

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

diff --git a/configure.in b/configure.in
index 34d5f8e04f85252d3a73a5732b9c94bd2ed35c59..6c7501c76ac875ba1f95f2a8ffb2414676ebdc1a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -64,32 +64,35 @@ dnl ------------------------------------------------------------------------
 dnl Check platform (host system)
 dnl ------------------------------------------------------------------------
 
 dnl Check platform (host system)
 dnl ------------------------------------------------------------------------
 

-dnl assume Unix
+dnl OS (assume Unix)

 USE_UNIX=1
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 
 USE_UNIX=1
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 

-USE_LINUX=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
+dnl Unix kind

 USE_AIX=
 USE_AIX=

-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=

 USE_BSD=
 USE_DARWIN=
 USE_FREEBSD=
 USE_BSD=
 USE_DARWIN=
 USE_FREEBSD=

-USE_OPENBSD=
+USE_HPUX=
+USE_LINUX=

 USE_NETBSD=
 USE_NETBSD=

+USE_OPENBSD=
+USE_OSF=
+USE_SGI=
+USE_SOLARIS=
+USE_SUN=
+USE_SUNOS=
+USE_SVR4=
+USE_SYSV=

 USE_VMS=
 USE_ULTRIX=
 USE_VMS=
 USE_ULTRIX=

-USE_DATA_GENERAL=
+USE_UNIXWARE=
+
+dnl hardware platform
+USE_ALPHA=

 
 dnl on some platforms xxx_r() functions are declared inside "#ifdef
 dnl _REENTRANT" and it's easier to just define this symbol for these platforms
 
 dnl on some platforms xxx_r() functions are declared inside "#ifdef
 dnl _REENTRANT" and it's easier to just define this symbol for these platforms


@@ -236,6 +239,13 @@ case "${host}" in
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 

+  *-*-*UnixWare*)
+    USE_SYSV=1
+    USE_SVR4=1
+    USE_UNIXWARE=1
+    AC_DEFINE(__UNIXWARE__)
+  ;;
+

   *-*-cygwin* | *-*-mingw32* )
     dnl MBN: some of the defines have been moved after toolkit detection
     dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
   *-*-cygwin* | *-*-mingw32* )
     dnl MBN: some of the defines have been moved after toolkit detection
     dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin

diff --git a/setup.h.in b/setup.h.in
index dafa4a070d74595a2fa0d3fe999e0a4c92b89cc7..38557e40bbf17a7d2eddc81371d6342e3dc4c446 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -70,27 +70,29 @@
 #define wxUSE_UNIX 0
 
 #undef __UNIX__
 #define wxUSE_UNIX 0
 
 #undef __UNIX__

-#undef __LINUX__
-#undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
+

 #undef __AIX__
 #undef __AIX__

-#undef __SUN__
-#undef __SOLARIS__
-#undef __SUNOS__
-#undef __ALPHA__
-#undef __IA64__
-#undef __OSF__

 #undef __BSD__
 #undef __BSD__

-#undef __FREEBSD__

 #undef __DARWIN__
 #undef __DARWIN__

+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__
+#undef __LINUX__

 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __NETBSD__
 #undef __OPENBSD__

-#undef __VMS__
+#undef __OSF__
+#undef __SGI__
+#undef __SOLARIS__
+#undef __SUN__
+#undef __SUNOS__
+#undef __SVR4__
+#undef __SYSV__

 #undef __ULTRIX__
 #undef __ULTRIX__

-#undef __DATA_GENERAL__
-#undef __EMX__
+#undef __UNIXWARE__
+#undef __VMS__
+
+#undef __IA64__
+#undef __ALPHA__

 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0
 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0