dnl Autoconf settings for vlc
-AC_INIT(vlc, 0.9.0-test2)
+AC_INIT(vlc, 0.9.0-test3)
VERSION_MAJOR="0"
VERSION_MINOR="9"
VERSION_REVISION="0"
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
- if test -z $with_live555_tree; then
- with_live555_tree=${topdir}/extras/contrib/src/live
- fi
- if test -z $with_goom_tree; then
- with_goom_tree=${topdir}/extras/contrib/src/goom
- fi
if test -z $with_mozilla_sdk_path; then
with_mozilla_sdk_path=${topdir}/extras/contrib/gecko-sdk
fi
if test -z $with_cyberlink_tree; then
with_cyberlink_tree=${topdir}/extras/contrib/src/clinkcc
fi
- if test -z $with_libmpeg2_tree; then
- with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec
- fi
- if test -z $with_a52_tree; then
- with_a52_tree=${topdir}/extras/contrib/src/a52dec
- fi
if test ".`uname -s`" = ".Darwin"; then
export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
dnl Iconv stuff
dnl
AM_ICONV
-AS_IF([test "$am_cv_func_iconv" != "yes"],
- [AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
VLC_ADD_CFLAGS([libvlc],[${INCICONV}])
VLC_ADD_LIBS([libvlc],[${LTLIBICONV}])
dnl Check for headers
AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h)
-AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
+AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h)
AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[
then
AC_ARG_WITH(libmpeg2-tree,
[ --with-libmpeg2-tree=PATH libmpeg2 tree for static linking])
- if test -n "${with_libmpeg2_tree}"
- then
+ AS_IF([test -n "${with_libmpeg2_tree}"],[
AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_tree})
real_libmpeg2_tree="`cd ${with_libmpeg2_tree} 2>/dev/null && pwd`"
if test -z "${real_libmpeg2_tree}"
then
dnl Use a custom libmpeg2
AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a)
- VLC_ADD_BUILTINS([libmpeg2])
+ VLC_ADD_PLUGIN([libmpeg2])
VLC_ADD_LIBS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2])
VLC_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include])
- eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`"
else
dnl The given libmpeg2 wasn't built
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a, make sure you compiled libmpeg2 in ${with_libmpeg2_tree}])
fi
- else
- AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
- AC_MSG_CHECKING(for libmpeg2 version >= 0.3.2)
- AC_EGREP_CPP(yes,
- [#include <mpeg2dec/mpeg2.h>
- #ifdef MPEG2_RELEASE
- #if MPEG2_RELEASE >= MPEG2_VERSION(0,3,2)
- yes
- #endif
- #endif],
- [AC_MSG_RESULT([yes])
+ ],[
+ PKG_CHECK_MODULES(LIBMPEG2,[libmpeg2 > 0.3.2],[
VLC_ADD_PLUGIN([libmpeg2])
- VLC_ADD_LIBS([libmpeg2],[-lmpeg2])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])],
-
- [AC_MSG_ERROR([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ (you need the cvs version). Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])]
- )
- fi
+ VLC_ADD_LIBS([libmpeg2], $LIBMPEG2_LIBS),
+ VLC_ADD_CFLAGS([libmpeg2], $LIBMPEG2_CFLAGS)
+ ],
+ AC_MSG_WARN([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ . Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.]))
+ ])
fi
dnl
[
VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
+ if test "${SYS}" = "mingw32"; then
+ VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC])
+ fi
VLC_ADD_PLUGIN([asademux])
],[
AC_MSG_WARN([PCRE library not found (required for asademux)])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QuickTime])
VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])