AC_INIT(vlc,0.8.5-svn)
VERSION_MAJOR="0"
VERSION_MINOR="8"
-VERSION_REVISION="4"
-VERSION_EXTRA="test1"
+VERSION_REVISION="5"
+VERSION_EXTRA="svn"
CONFIGURE_LINE="$0 $*"
CODENAME="Janus"
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="ca da de en_GB es fr it ja ko nl pt_BR ro ru tr zh_CN zh_TW"
+ALL_LINGUAS="ca da de en_GB es fr it ja ko nl pt_BR ro ru sv tr zh_CN zh_TW"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
if test "${enable_hal}" != "no" -a "${SYS}" = "linux"
then
- PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
- [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
- VLC_ADD_PLUGINS([hal])
- VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
- VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
- [AC_MSG_WARN(HAL library not found)])
+ PKG_CHECK_MODULES(HAL, hal >= 0.5.0,
+ [ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API])
+ AC_DEFINE( HAVE_HAL, [], [Define if you have the HAL library] )
+ VLC_ADD_PLUGINS([hal])
+ VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
+ VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
+ dnl No hal 0.5 Test for 0.2
+ [ PKG_CHECK_MODULES( HAL, hal >= 0.2.97,
+ [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
+ VLC_ADD_PLUGINS([hal])
+ VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
+ VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
+ [AC_MSG_WARN(HAL library not found)])
+ ]
+ )
fi
dnl Build the gtk_main plugins?
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([screensaver])
elif test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGINS([ntservice access_smb dmo])
+ VLC_ADD_PLUGINS([ntservice access_smb dmo msn])
VLC_ADD_LDFLAGS([dmo],[-lole32])
else
VLC_ADD_PLUGINS([win32text])
dnl The AltiVec C extensions
dnl
dnl There are several possible cases:
-dnl - OS X PPC, gcc 4.x: use -mpim-altivec, don't need <altivec.h>
+dnl - OS X PPC, gcc 4.x: use -mpim-altivec -force_cpusubtype_ALL, don't
+dnl need <altivec.h>
dnl - OS X PPC, gcc 3.x: need -faltivec, don't need <altivec.h>
dnl - Linux PPC, gcc 3.4, 4.x: need <altivec.h> which requires -maltivec
dnl - Linux PPC, gcc 3.3: need <altivec.h> and -maltivec -mabi=altivec
AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
[ac_cv_c_altivec],
[# OS X/PPC test (gcc 4.x)
- CFLAGS="${CFLAGS_save} -mpim-altivec"
+ CFLAGS="${CFLAGS_save} -mpim-altivec -force_cpusubtype_ALL"
AC_TRY_COMPILE([],
[vec_ld(0, (unsigned char *)0);],
- [ac_cv_c_altivec="-mpim-altivec"],
+ [ac_cv_c_altivec="-mpim-altivec -force_cpusubtype_ALL"],
[# OS X/PPC test (gcc 3.x)
CFLAGS="${CFLAGS_save} -faltivec"
AC_TRY_COMPILE([],
fi
fi
+dnl
+dnl dv module: digital video module check for libraw1394
+dnl
+AC_ARG_ENABLE(dv,
+[ --enable-dv dv input module (default disabled)])
+if test "{enable_dv}" = "yes"
+then
+ AC_ARG_WITH(dv-raw1394,
+ [ --with-dv-raw1394=PATH libraw1394 headers and libraries])
+ AC_ARG_WITH(dv-raw1394-tree,
+ [ --with-dv-raw1394=PATH libraw1394 tree for static linking])
+
+ if test -z "${with_dv_raw1394}" -a "${with_dv_raw1394}" != ""
+ then
+ AC_MSG_CHECKING(for raw1394 headers in ${with_dv_raw1394})
+ if test -f ${with_dv_raw1394}/include/libraw1394/raw1394.h
+ then
+ dnl Use ${with_dv_raw1394}/include/libraw1394/raw1394.h
+ AC_MSG_RESULT(yes)
+ VLC_ADD_PLUGINS([access_dv])
+ VLC_ADD_LDFLAGS([access_dv],[-L${with_dv_raw1394}/lib -lraw1394 -lpthread])
+ VLC_ADD_CPPFLAGS([access_dv],[-I${with_dv_raw1394}/include])
+ else
+ dnl No libraw1394 could be found, sorry
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h])
+ fi
+ else
+ AC_CHECK_HEADERS(libraw1394/raw1394.h,
+ [ VLC_ADD_PLUGINS([access_dv])
+ VLC_ADD_LDFLAGS([access_dv],[-lraw1394 -lavc1394])
+ ],[
+ if test -n "${enable_dv}"
+ then
+ AC_MSG_ERROR([cannot find libraw1394 headers])
+ fi
+ ])
+ fi
+
+ dnl Check for static linking of libraw1394
+ if test -z "${with_dv_raw1394_tree}" -a "${with_dv_raw1394_tree}" != ""
+ then
+ AC_MSG_CHECKING(for libraw1394.a in ${with_dv_raw1394_tree})
+ real_dv_raw1394_tree="`cd ${with_dv_raw1394_tree} 2>/dev/null && pwd`"
+ if test -z "${real_dv_raw1394_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${real_dv_raw1394_tree}])
+ fi
+ if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a"
+ then
+ dnl Use a custom libraw1394
+ AC_MSG_RESULT(${real_dv_raw1394_tree}/src/.libs/libraw1394.a)
+ VLC_ADD_BUILTINS([access_dv])
+ VLC_ADD_LDFLAGS([access_dv],[-L${real_dv_raw1394_tree}/src/.libs -lraw1394])
+ VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_raw1394_tree}])
+ else
+ dnl The given libraw1394 wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_dv_raw1394_tree}/src/.libs/libraw1394.a, make sure you compiled libraw1394 in ${with_dv_raw1394_tree}])
+ fi
+ fi
+
+ dnl
+ dnl Check for libavc1394
+ dnl
+
+ AC_ARG_WITH(dv-avc1394,
+ [ --with-dv-avc1394=PATH libavc1394 headers and libraries])
+ AC_ARG_WITH(dv-avc1394-tree,
+ [ --with-dv-avc1394=PATH libavc1394 tree for static linking])
+
+ if test -z "${with_dv_avc1394}" -a "${with_dv_avc1394}" != ""
+ then
+ AC_MSG_CHECKING(for avc1394 headers in ${with_dv_avc1394})
+ if test -f ${with_dv_avc1394}/include/libavc1394/avc1394.h
+ then
+ dnl Use ${with_dv_avc1394}/include/libavc1394/avc1394.h
+ AC_MSG_RESULT(yes)
+ VLC_ADD_LDFLAGS([access_dv],[-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread])
+ VLC_ADD_CPPFLAGS([access_dv],[-I${with_avc1394}/include])
+ else
+ dnl No libavc1394 could be found, sorry
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${with_dv_avc1394}/include/libavc1394/avc1394.h])
+ fi
+ else
+ AC_CHECK_HEADERS(libavc1394/avc1394.h,
+ [ VLC_ADD_LDFLAGS([access_dv],[-lavc1394 -lrom1394 -lpthread])
+ ],[
+ if test -n "${enable_dv}"
+ then
+ AC_MSG_ERROR([cannot find libavc1394 headers])
+ fi
+ ])
+ fi
+
+ dnl Check for static linking of libavc1394
+ if test -z "${with_dv_avc1394_tree}" -a "${with_dv_avc1394_tree}" != ""
+ then
+ AC_MSG_CHECKING(for libavc1394.a in ${with_dv_avc1394_tree})
+ real_dv_avc1394_tree="`cd ${with_dv_avc1394_tree} 2>/dev/null && pwd`"
+ if test -z "${real_dv_avc1394_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${real_dv_avc1394_tree}])
+ fi
+ if test -f "${real_dv_avc1394_tree}/src/.libs/libavc1394.a"
+ then
+ dnl Use a custom libavc1394
+ AC_MSG_RESULT(${real_dv_avc1394_tree}/src/.libs/libavc1394.a)
+ VLC_ADD_LDFLAGS([access_dv],[-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread])
+ VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_avc1394_tree}])
+ else
+ dnl The given libavc1394 wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_dv_avc1394_tree}/src/.libs/libavc1394.a, make sure you compiled libavc1394 in ${with_dv_avc1394_tree}])
+ fi
+ fi
+fi
dnl
dnl dvdread module: check for libdvdread
[
if test "$with_ffmpeg_mp3lame" = "yes"; then
VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame])
- fi
- ])
+ fi])
AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
[ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support],
[
if test "$with_ffmpeg_dts" = "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-ldts])
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
+ AC_CHECK_LIB(dts_pic, dts_free,
+ [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ],
+ [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
+ LDFLAGS="${LDFLAGS_save}"
fi])
AC_ARG_WITH(ffmpeg-zlib,
fi
if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then
if test "${with_ffmpeg_dts}" != "yes"; then
- VLC_ADD_LDFLAGS([ffmpeg],[-ldts])
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
+ AC_CHECK_LIB(dts_pic, dts_free,
+ [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ],
+ [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
+ LDFLAGS="${LDFLAGS_save}"
fi
fi
if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then
AC_MSG_RESULT(yes)
VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}])
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}"
AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_BUILTINS([x264])
VLC_ADD_LDFLAGS([x264],[-lx264])
AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi
else
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}"
AC_CHECK_HEADERS(x264.h, [
AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_PLUGINS([x264])
projects / vlc / blobdiff