AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
-AC_INIT(vlc, 1.2.0-git)
+AC_INIT(vlc, 1.2.0-pre1)
VERSION_MAJOR=1
VERSION_MINOR=2
VERSION_REVISION=0
VERSION_EXTRA=0
-VERSION_DEV=git
+VERSION_DEV=pre1
PKGDIR="vlc"
AC_SUBST(PKGDIR)
AC_CHECK_HEADERS([search.h])
AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h)
-AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
+AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[
#include <sys/types.h>
fi
dnl
-dnl QTCapture
-AC_ARG_ENABLE(macosx-qtcapture,
- [ --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)])
-if test "x${enable_macosx_qtcapture}" != "xno" &&
- (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes")
+dnl QTKit
+AC_ARG_ENABLE(macosx-qtkit,
+ [ --enable-macosx-qtkit Mac OS X qtcapture (video) and qtsound (audio) module (default enabled on Mac OS X)])
+if test "x${enable_macosx_qtkit}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_qtkit}" = "yes")
then
- VLC_ADD_LIBS([qtcapture], [-Wl,-framework,Cocoa])
- VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QTKit])
- VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreAudio])
- VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QuartzCore])
- VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreVideo])
VLC_ADD_PLUGIN([qtcapture])
+ VLC_ADD_PLUGIN([qtsound])
fi
+AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" && "x${enable_macosx_qtkit}" != "xno"])
dnl
AC_ARG_ENABLE(libva,
[ --enable-libva VAAPI GPU decoding support (libVA) (default auto)])
+AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [
+ AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.])
+])
AS_IF([test "${enable_libva}" != "no"], [
- AS_IF([test "${have_avcodec}" != "yes"], [
- AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
- ])
-
PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"