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)
This commit is contained in:
Christian Schaller 2005-05-06 10:02:52 +00:00
parent 90c2020e84
commit 90306505e1
2 changed files with 32 additions and 23 deletions

View file

@ -46,6 +46,16 @@ AM_PROG_AS
AS="${CC}" AS="${CC}"
AS_PROG_OBJC 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 dnl decide on error flags
AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no") AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
@ -314,26 +324,26 @@ dnl ============================= sys plug-ins ================================
dnl ========================================================================== dnl ==========================================================================
dnl *** OSS audio *** (Linux, *BSD) dnl *** OSS audio *** (Linux, *BSD)
translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true) dnl translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [ dnl GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
HAVE_OSS="yes" dnl HAVE_OSS="yes"
dnl Linux and newer BSD versions : dnl Linux and newer BSD versions :
AC_CHECK_HEADER(sys/soundcard.h, [ dnl AC_CHECK_HEADER(sys/soundcard.h, [
AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/]) dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_SYS,, [Define if OSS includes are in /sys/])
] , [ dnl ] , [
dnl Some old BSD versions : dnl Some old BSD versions :
AC_CHECK_HEADER(soundcard.h, [ dnl AC_CHECK_HEADER(soundcard.h, [
AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /]) dnl AC_DEFINE(HAVE_OSS_INCLUDE_IN_ROOT,, [Define if OSS includes are in /])
], [ dnl ], [
dnl Some old BSD versions : dnl Some old BSD versions :
AC_CHECK_HEADER(machine/soundcard.h, [ dnl AC_CHECK_HEADER(machine/soundcard.h, [
AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/]) dnln AC_DEFINE(HAVE_OSS_INCLUDE_IN_MACHINE,, [Define if OSS includes are in /machine/])
], [ dnl ], [
HAVE_OSS="no" dnl HAVE_OSS="no"
]) dnl ])
]) dnl ])
]) dnl ])
]) dnl ])
@ -398,7 +408,6 @@ gst-plugins.spec
gst/Makefile gst/Makefile
gst/effectv/Makefile gst/effectv/Makefile
sys/Makefile sys/Makefile
sys/oss/Makefile
common/Makefile common/Makefile
common/m4/Makefile common/m4/Makefile
m4/Makefile m4/Makefile

View file

@ -4,11 +4,11 @@
# DXR3_DIR= # DXR3_DIR=
# endif # endif
if USE_OSS # if USE_OSS
OSS_DIR=oss # OSS_DIR=oss
else # else
OSS_DIR= # OSS_DIR=
endif # endif
# if USE_OSX_AUDIO # if USE_OSX_AUDIO
# OSX_AUDIO_DIR=osxaudio # OSX_AUDIO_DIR=osxaudio