Move setting of mac.listctrl.always_use_generic to wx.PyApp.__init__

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 48a44781eedee1f2207026e36ff8680990f27726..36630e0b3a5dd767471dbd28194b62ec4fa8b53b 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


@@ -45469,6 +45477,7 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6
         fi
 
         else
         fi
 
         else

+                if test "$wxUSE_MGL" != "1"; then

 
 for ac_header in linux/joystick.h
 do
 
 for ac_header in linux/joystick.h
 do


@@ -45618,6 +45627,7 @@ fi
 
 done
 
 
 done
 

+        fi

     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then


@@ -46704,9 +46714,9 @@ _ACEOF
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then

-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
-        { echo "$as_me:$LINENO: WARNING: Dialup manager not yet supported under Mac OS X... disabled" >&5
-echo "$as_me: WARNING: Dialup manager not yet supported under Mac OS X... disabled" >&2;}
+    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: WARNING: Dialup manager not supported on this platform... disabled" >&2;}

     else
         cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DIALUP_MANAGER 1
     else
         cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DIALUP_MANAGER 1


@@ -49764,10 +49774,10 @@ fi
 
 
 
 
 
 

-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.0"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.1"

 
 
 
 

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

 
 
 
 
 
 


@@ -51073,6 +51083,10 @@ echo "${ECHO_T}no" >&6
 
 
 
 
 
 

+if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
+    DISABLED_CONTRIB="$DISABLED_CONTRIB net"
+fi
+

 for subdir in `echo $SUBDIRS`; do
     if test -d ${srcdir}/${subdir} ; then
         if test "$wxUSE_GUI" = "yes"; then
 for subdir in `echo $SUBDIRS`; do
     if test -d ${srcdir}/${subdir} ; then
         if test "$wxUSE_GUI" = "yes"; then