disable wxSound for wxMGL DOS build (it's not implemented there)

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

diff --git a/configure b/configure
index 4eb68b8eb3c7b81e8b0493ef985f6a2291cb606d..53ad4cf065c661cb36c9d7c1e4d883289b7e2bee 100755 (executable)
--- a/configure
+++ b/configure
@@ -43337,8 +43337,16 @@ rm -f conftest.err conftest.$ac_objext \
         WITH_PLUGIN_SDL=1
       fi
     fi
         WITH_PLUGIN_SDL=1
       fi
     fi

+  else
+        if test "$wxUSE_MGL" = 1; then
+        { echo "$as_me:$LINENO: WARNING: wxSound not supported in MGL under DOS... disabled" >&5
+echo "$as_me: WARNING: wxSound not supported in MGL under DOS... disabled" >&2;}
+        wxUSE_SOUND="no"
+    fi

   fi
   fi

+fi

 
 

+if test "$wxUSE_SOUND" = "yes"; then

   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SOUND 1
 _ACEOF
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SOUND 1
 _ACEOF


@@ -46705,7 +46713,7 @@ fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then

-        { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform ... disabled" >&5
+        { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5

 echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
     else
         cat >>confdefs.h <<\_ACEOF
 echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
     else
         cat >>confdefs.h <<\_ACEOF


@@ -49767,7 +49775,7 @@ fi
     BAKEFILE_BAKEFILE_M4_VERSION="0.2.0"
 
 
     BAKEFILE_BAKEFILE_M4_VERSION="0.2.0"
 
 

-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.1"

 
 
 
 
 
 

diff --git a/configure.in b/configure.in
index ffa0a76e1e0571fa1c8c4d75f601c743ebf47802..9d56c30974c90b2412c284240b0b2334378cfcd9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5662,8 +5662,16 @@ if test "$wxUSE_SOUND" = "yes"; then
         WITH_PLUGIN_SDL=1
       fi
     fi
         WITH_PLUGIN_SDL=1
       fi
     fi

+  else
+    dnl wxMGL doesn't support sound under DOS, only under Unix
+    if test "$wxUSE_MGL" = 1; then
+        AC_MSG_WARN([wxSound not supported in MGL under DOS... disabled])
+        wxUSE_SOUND="no"
+    fi

   fi
   fi

+fi

 
 

+if test "$wxUSE_SOUND" = "yes"; then

   AC_DEFINE(wxUSE_SOUND)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
 fi
   AC_DEFINE(wxUSE_SOUND)
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
 fi


@@ -6897,7 +6905,7 @@ fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then

-        AC_MSG_WARN([Dialup manager not supported on this platform ... disabled])
+        AC_MSG_WARN([Dialup manager not supported on this platform... disabled])

     else
         AC_DEFINE(wxUSE_DIALUP_MANAGER)
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
     else
         AC_DEFINE(wxUSE_DIALUP_MANAGER)
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"