The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

platforms that do not have it.

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

diff --git a/configure b/configure
index 9314c5078412a0d60d75e9d0c3173bdec494cebf..6651812fa065713405d151900456cdba7908a876 100755 (executable)
--- a/configure
+++ b/configure
@@ -36061,9 +36061,7 @@ _ACEOF
 
 fi
 
 
 fi
 

-WITH_PLUGIN_SDL=0
-if test "$wxUSE_SOUND" = "yes"; then
-      if test "$USE_UNIX" = "1" ; then
+if test "$USE_UNIX" = "1" ; then

 
 for ac_header in sys/soundcard.h
 do
 
 for ac_header in sys/soundcard.h
 do


@@ -36209,11 +36207,16 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 

+else
+  DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"

 fi
 
 done
 
 fi
 
 done
 

-
+fi
+WITH_PLUGIN_SDL=0
+if test "$wxUSE_SOUND" = "yes"; then
+  if test "$USE_UNIX" = "1" ; then

     if test "$wxUSE_LIBSDL" != "no"; then
 
 # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
     if test "$wxUSE_LIBSDL" != "no"; then
 
 # Check whether --with-sdl-prefix or --without-sdl-prefix was given.


@@ -43792,7 +43795,11 @@ for subdir in `echo $SUBDIRS`; do
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done

-            else                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+            else
+                                                                disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`;
+                eval "disabled=\$$disabled_var"
+                disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`

             fi
         else                                     if test ${subdir} = "samples"; then
                 makefiles="samples/Makefile.in samples/console/Makefile.in"
             fi
         else                                     if test ${subdir} = "samples"; then
                 makefiles="samples/Makefile.in samples/console/Makefile.in"

diff --git a/configure.in b/configure.in
index f81ee68d0031d939ba594702a79cfd7ee2184fbc..029b1d0d13957046de42d7d24f83ccb51052b9ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4870,13 +4870,15 @@ if test "$wxUSE_TIMER" = "yes"; then
   AC_DEFINE(wxUSE_TIMER)
 fi
 
   AC_DEFINE(wxUSE_TIMER)
 fi
 

+dnl Unix implementation needs additional checks because audio support
+dnl comes in many favours:
+if test "$USE_UNIX" = "1" ; then
+    AC_CHECK_HEADERS([sys/soundcard.h],,
+                     [DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"])
+fi

 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then

-  dnl Unix implementation needs additional checks because audio support
-  dnl comes in many favours:

   if test "$USE_UNIX" = "1" ; then
   if test "$USE_UNIX" = "1" ; then

-    AC_CHECK_HEADERS([sys/soundcard.h])
-

     if test "$wxUSE_LIBSDL" != "no"; then
       AM_PATH_SDL([1.2.0],
                   [
     if test "$wxUSE_LIBSDL" != "no"; then
       AM_PATH_SDL([1.2.0],
                   [


@@ -6869,8 +6871,14 @@ for subdir in `echo $SUBDIRS`; do
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done

-            else dnl assume that everything compiles for utils &c
-                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+            else
+                dnl assume that everything compiles for utils &c
+                dnl any that shouldn't be built can be added to
+                dnl DISABLED_UTILS, DISABLED_CONTRIB or DISABLED_DEMOS
+                disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
+                eval "disabled=\$$disabled_var"
+                disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`

             fi
         else dnl we build wxBase only
             dnl don't take all samples/utils, just those which build with
             fi
         else dnl we build wxBase only
             dnl don't take all samples/utils, just those which build with