gst-plugins 0.9 cvs head now compiles (only effectv left compiling)

Original commit message from CVS:
gst-plugins 0.9 cvs head now compiles (only effectv left compiling)

diff --git a/configure.ac b/configure.ac
index dd9e4f0..7518511 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,16 @@ AM_PROG_AS
 AS="${CC}"
 AS_PROG_OBJC
 
+dnl the gettext stuff needed
+dnl AM_GNU_GETTEXT_VERSION(0.11.5)
+dnl AM_GNU_GETTEXT([external])
+                                                                                
+dnl GETTEXT_PACKAGE=gst-plugins-$GST_MAJORMINOR
+dnl AC_SUBST(GETTEXT_PACKAGE)
+dnl AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
+dnl                   [gettext package name])
+
+
 dnl decide on error flags
 AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
 
@@ -314,26 +324,26 @@ dnl ============================= sys plug-ins ================================
 dnl ==========================================================================
 
 dnl *** OSS audio *** (Linux, *BSD)
-translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
-GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
-  HAVE_OSS="yes"
+dnl translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
+dnl GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
+dnl  HAVE_OSS="yes"
   dnl Linux and newer BSD versions :
-  AC_CHECK_HEADER(sys/soundcard.h, [
-    AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
-    ] , [
+dnl  AC_CHECK_HEADER(sys/soundcard.h, [
+dnl    AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
+dnl    ] , [
     dnl Some old BSD versions :
-    AC_CHECK_HEADER(soundcard.h, [
-      AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
-      ], [
+dnl    AC_CHECK_HEADER(soundcard.h, [
+dnl      AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
+dnl      ], [
       dnl Some old BSD versions :
-      AC_CHECK_HEADER(machine/soundcard.h, [
-        AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/])
-        ], [
-        HAVE_OSS="no"
-      ])
-    ])
-  ])
-])
+dnl      AC_CHECK_HEADER(machine/soundcard.h, [
+dnln        AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/])
+dnl        ], [
+dnl        HAVE_OSS="no"
+dnl      ])
+dnl    ])
+dnl  ])
+dnl ])
 
 
 
@@ -398,7 +408,6 @@ gst-plugins.spec
 gst/Makefile
 gst/effectv/Makefile
 sys/Makefile
-sys/oss/Makefile
 common/Makefile
 common/m4/Makefile
 m4/Makefile

diff --git a/sys/Makefile.am b/sys/Makefile.am
index 679df36..47c0c21 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -4,11 +4,11 @@
 # DXR3_DIR=
 # endif
 
-if USE_OSS
-OSS_DIR=oss
-else
-OSS_DIR=
-endif
+# if USE_OSS
+# OSS_DIR=oss
+# else
+# OSS_DIR=
+# endif
 
 # if USE_OSX_AUDIO
 # OSX_AUDIO_DIR=osxaudio