added support for building non-Unicode packages which can be installed in parallel...

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 1cb41c1bac674bea6f641f6c4d5d13e5e5f5a2dd..e466a53ec194d6fc8dc6db8b79aee75f8034a2c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -191,7 +191,7 @@ case "${host}" in
     AC_DEFINE(__BSD__)
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
-  *-*-openbsd*)
+  *-*-openbsd*|*-*-mirbsd*)
     USE_BSD=1
     USE_OPENBSD=1
     AC_DEFINE(__OPENBSD__)
@@ -338,7 +338,8 @@ case "${host}" in
   ;;
 
   *)
-    AC_MSG_ERROR(unknown system type ${host}.)
+    AC_MSG_WARN([*** System type ${host} is unknown, assuming generic Unix and continuing nevertheless.])
+    AC_MSG_WARN([*** Please report the build results to wx-dev@lists.wxwidgets.org.])
 esac
 
 dnl ---------------------------------------------------------------------------
@@ -784,7 +785,7 @@ else
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
-  dnl Appliable only when --with-gtk was used:
+  dnl Applicable only when --with-gtk was used:
   DEFAULT_wxUSE_GTK2=yes
 fi
 
@@ -6919,7 +6920,7 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
     dnl GStreamer
     dnl -----------------------------------------------------------------------
     if test "$wxUSE_GTK" = 1; then
-        wxUSE_GSTREAMER="yes"
+        wxUSE_GSTREAMER="no"
 
         dnl -------------------------------------------------------------------
         dnl Test for at least 0.8 gstreamer module from pkg-config
@@ -6939,8 +6940,8 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
                                gstreamer-plugins-base-$GST_MAJORMINOR
                                gconf-2.0,
         [
-                    CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
-                    LIBS="$LIBS $GST_LIBS -lgstinterfaces-$GST_MAJORMINOR"
+            wxUSE_GSTREAMER="yes"
+            GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_MAJORMINOR"
         ],
         [
                     GST_VERSION_MINOR=8
@@ -6957,17 +6958,28 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
                 gstreamer-interfaces-$GST_MAJORMINOR
                 gstreamer-gconf-$GST_MAJORMINOR,
                         [
-                    CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
-                    LIBS="$LIBS $GST_LIBS"
+                wxUSE_GSTREAMER="yes"
                         ],
                 [
                     AC_MSG_WARN([Proper GStreamer .8/.10 installation not found])
-            wxUSE_GSTREAMER="no"
                 ])
         fi
 
 
         if test "$wxUSE_GSTREAMER" = "yes"; then
+            dnl system gstreamer package is compiled with Sun CC and outputs
+            dnl CC-specific "-mt" in its flags, remove it for gcc compilation
+            case "${host}" in
+                *-*-solaris2* )
+                    if "$GCC" = yes; then
+                        GST_CFLAGS=`echo $GST_CFLAGS | sed 's/-mt//'`
+                        GST_LIBS=`echo $GST_LIBS | sed 's/-mt//'`
+                    fi
+            esac
+
+            CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
+            LIBS="$GST_LIBS $LIBS"
+
             AC_DEFINE(wxUSE_GSTREAMER)
             AC_MSG_RESULT([GStreamer detection successful])
         fi