Applied the FreeBSD patch from Orion with some minor modifications to the configure.in patch.

Original commit message from CVS:
Applied the FreeBSD patch from Orion with some minor modifications to the
configure.in patch.
This commit is contained in:
Wim Taymans 2001-03-30 20:08:25 +00:00
parent c7d631ff34
commit 4b633d90e8
2 changed files with 25 additions and 4 deletions

View file

@ -25,12 +25,15 @@
#undef HAVE_LIBGHTTP #undef HAVE_LIBGHTTP
#undef HAVE_LIBMMX #undef HAVE_LIBMMX
#undef HAVE_LIBXV #undef HAVE_LIBXV
#undef HAVE_OSS
#undef HAVE_XAUDIO #undef HAVE_XAUDIO
#undef HAVE_CSSAUTH #undef HAVE_CSSAUTH
#undef HAVE_VORBIS #undef HAVE_VORBIS
#undef HAVE_LIBJPEG #undef HAVE_LIBJPEG
#undef HAVE_NASM #undef HAVE_NASM
#undef HAVE_MPEG2DEC #undef HAVE_MPEG2DEC
#undef HAVE_LINUX_CDROM
#undef HAVE_LINUX_VIDEODEV
#undef HAVE_ATOMIC_H #undef HAVE_ATOMIC_H

View file

@ -344,13 +344,17 @@ AC_DEFINE(HAVE_LIBXV),
HAVE_LIBXV=no, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS) HAVE_LIBXV=no, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
LIBS=${xvsave_LIBS} LIBS=${xvsave_LIBS}
dnl Check for OSS audio
AC_CHECK_HEADER(sys/soundcard.h,
AC_DEFINE(HAVE_OSS)
HAVE_OSS=yes, []
)
dnl Check for xaudio dnl Check for xaudio
AC_CHECK_HEADER(xaudio/decoder.h,[ AC_CHECK_HEADER(xaudio/decoder.h,
AC_DEFINE(HAVE_XAUDIO) AC_DEFINE(HAVE_XAUDIO)
HAVE_XAUDIO="yes", [] HAVE_XAUDIO=yes, []
]) )
dnl Check for libvorbis dnl Check for libvorbis
AC_MSG_CHECKING(Vorbis library) AC_MSG_CHECKING(Vorbis library)
@ -407,6 +411,17 @@ else
HAVE_CSSAUTH="no" HAVE_CSSAUTH="no"
fi fi
dnl Check for linux/cdrom.h
AC_CHECK_HEADER(linux/cdrom.h,
AC_DEFINE(HAVE_LINUX_CDROM)
HAVE_LINUX_CDROM=yes, []
)
dnl Check for linux/videodev.h
AC_CHECK_HEADER(linux/videodev.h,
AC_DEFINE(HAVE_LINUX_VIDEODEV)
HAVE_LINUX_VIDEODEV=yes, []
)
dnl ###################################################################### dnl ######################################################################
@ -616,7 +631,10 @@ AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$USE_GDK_PIXBUF" = "xyes")
AM_CONDITIONAL(HAVE_LIBGHTTP, test "x$USE_LIBGHTTP" = "xyes") AM_CONDITIONAL(HAVE_LIBGHTTP, test "x$USE_LIBGHTTP" = "xyes")
AM_CONDITIONAL(HAVE_LIBMMX, test "x$USE_LIBMMX" = "xyes") AM_CONDITIONAL(HAVE_LIBMMX, test "x$USE_LIBMMX" = "xyes")
AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes") AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes")
AM_CONDITIONAL(HAVE_OSS, test "x$HAVE_OSS" = "xyes")
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes") AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
AM_CONDITIONAL(HAVE_LINUX_CDROM, test "x$HAVE_LINUX_CDROM" = "xyes")
AM_CONDITIONAL(HAVE_LINUX_VIDEODEV, test "x$HAVE_LINUX_VIDEODEV" = "xyes")
AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes") AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes")
AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBIS" = "xyes") AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBIS" = "xyes")
AM_CONDITIONAL(HAVE_LIBJPEG, test "x$HAVE_LIBJPEG" = "xyes") AM_CONDITIONAL(HAVE_LIBJPEG, test "x$HAVE_LIBJPEG" = "xyes")