dnl Autoconf settings for vlc
dnl $Id$
-AC_INIT(vlc,0.8.5-xtophe)
+AC_INIT(vlc,0.8.5-svn)
VERSION_MAJOR="0"
VERSION_MINOR="8"
VERSION_REVISION="5"
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.8.5-xtophe)
+AM_INIT_AUTOMAKE(vlc,0.8.5-svn)
AM_CONFIG_HEADER(config.h)
+dnl Too many people are not aware of maintainer mode:
+dnl If you want to use it, you definitely know what you are doing, so
+dnl you can specify "--disable-maintainer-mode". But if you want the default
+dnl automake behavior, you've likely never heard of maintainer mode, so we
+dnl can't expect you to enable it manually.
+
+AS_IF([test "x${enable_maintainer_mode}" != "xno"],
+ [enable_maintainer_mode="yes"])
+
dnl HA! HA!
AM_MAINTAINER_MODE
if test -d ${topdir}/extras/contrib/lib; then
export PATH=${topdir}/extras/contrib/bin:$PATH
-dnl kludge because only the debian package provides a ffmpeg-config
- with_ffmpeg_config_path=${topdir}/extras/contrib/bin
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include"
CXXFLAGS_save="${CXXFLAGS_save} -I${topdir}/extras/contrib/include"
OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include"
- if test $build = $host; then
+ if test $build = $host -o $PKG_CONFIG_LIBDIR; then
export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH
else
export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig
fi
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
- with_livedotcom_tree=${topdir}/extras/contrib/src/live
- with_goom_tree=${topdir}/extras/contrib/src/goom
+
+dnl kludge because only the debian package provides a ffmpeg-config
+ if test -z $with_ffmpeg_config_path; then
+ with_ffmpeg_config_path=${topdir}/extras/contrib/bin;
+ fi
+ if test -z $with_livedotcom_tree; then
+ with_livedotcom_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 ".`uname -s`" = ".Darwin"; then
export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
VLC_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
- VLC_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
+ VLC_ADD_LDFLAGS([cdda vcdx cddax],[-lwinmm])
VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp telnet netsync],[-lws2_32])
fi
if test "${SYS}" = "mingwce"; then
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="ca da de en_GB es fr it ja ka ko nl pt_BR ro ru sv tr zh_CN zh_TW"
+ALL_LINGUAS="ca da de en_GB es fr it ja ka ko nl oc 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
dnl Check for system libs needed
need_libc=false
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch assert)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof)
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
- VLC_ADD_LDFLAGS([vlc ipv4 cddax],-lsocket)
+ VLC_ADD_LDFLAGS([vlc ipv4 cdda cddax],-lsocket)
])
])
AC_CHECK_FUNCS(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,[
- VLC_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl])
+ VLC_ADD_LDFLAGS([cdda cddax ipv4 vlc],[-lnsl])
],[
AC_CHECK_LIB(bind,gethostbyname,[
VLC_ADD_LDFLAGS([ipv4 access_mms],[-lbind])
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Find where are the X headers and libraries
-AC_PATH_X()
+AC_PATH_XTRA()
dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal.
[# OS X/PPC test (gcc 3.x)
CFLAGS="${CFLAGS_save} -faltivec"
AC_TRY_COMPILE([],
- [vec_ld(0, (unsigned char *)0);],
+ [vec_ld(1 * sizeof(vector float), (unsigned char *)0);],
[ac_cv_c_altivec="-faltivec"],
dnl Below this are the Linux tests
[# Linux/PPC test (gcc 4.x)
AC_ARG_ENABLE(debug,
[ --enable-debug debug mode (default disabled)])
test "${enable_debug}" != "yes" && enable_debug="no"
+AH_TEMPLATE(NDEBUG,
+ [Define to 1 if debug code should NOT be compiled])
+AS_IF([test "x${enable_debug}" == "xno"], [AC_DEFINE(NDEBUG)])
dnl
dnl Enable release-specific flags
then
VLC_ADD_PLUGINS([vcd cdda])
VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-framework IOKit -framework CoreFoundation])
- VLC_ADD_LDFLAGS([vcdx cddax],[-liconv])
+ VLC_ADD_LDFLAGS([vcdx cddax cdda],[-liconv])
+ fi
+
+ if test "$enable_libcddb" != "no"; then
+ PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [
+ HAVE_LIBCDDB=yes
+ AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
+ VLC_ADD_LDFLAGS([cdda],[$LIBCDDB_LIBS])
+ VLC_ADD_CFLAGS([cdda],[$LIBCDDB_CFLAGS])
+ ],:
+ [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled)
+ HAVE_LIBCDDB=no])
fi
fi
VLC_ADD_CXXFLAGS([screen],[])
VLC_ADD_LDFLAGS([screen],[-lbe])
else
- CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
+ CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
AC_CHECK_HEADERS(X11/Xlib.h, [
VLC_ADD_PLUGINS([screen])
- VLC_ADD_LDFLAGS([screen],[-L${x_libraries} -lX11 -lXext])
- VLC_ADD_CPPFLAGS([screen],[-I${x_includes}])
+ VLC_ADD_LDFLAGS([screen],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext])
+ VLC_ADD_CPPFLAGS([screen],[${X_CFLAGS}])
])
CPPFLAGS="${CPPFLAGS_save}"
fi
])
fi
+dnl libvc1 decoder plugin
+dnl
+AC_ARG_ENABLE(libvc1,
+[ --enable-libvc1 VC-1 codec (default disabled)])
+if test "${enable_libvc1}" = "yes"
+then
+ AC_ARG_WITH(libvc1-tree,
+ [ --with-libvc1-tree=PATH libvc1 tree for static linking])
+ if test -n "${with_libvc1_tree}"
+ then
+ AC_MSG_CHECKING(for vc1dec.o in ${with_libvc1_tree})
+ real_libvc1_tree="`cd ${with_libvc1_tree} 2>/dev/null && pwd`"
+ if test -f "${real_libvc1_tree}/src/.libs/vc1dec.o"
+ then
+ VLC_ADD_BUILTINS([libvc1])
+ VLC_ADD_CPPFLAGS([libvc1],[-I${real_libvc1_tree}/src])
+ VLC_ADD_LDFLAGS([libvc1],[${real_libvc1_tree}/src/.libs/libvc1.a])
+ AC_MSG_RESULT(yes)
+ else
+ dnl The given libvc1 tree wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_libvc1_tree}/src/.libs/vc1dec.o,
+ make sure you compiled libvc1 in ${with_libvc1_tree}])
+ fi
+ fi
+fi
+
dnl
dnl PNG decoder module
dnl
dnl Check for DPMS
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
+ CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
AC_CHECK_HEADERS(X11/extensions/dpms.h, [
AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h)
AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[
if test "${enable_x11}" != "no" &&
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
test "${enable_x11}" = "yes"); then
- CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
+ CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}"
AC_CHECK_HEADERS(X11/Xlib.h, [
VLC_ADD_PLUGINS([x11])
- VLC_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext])
- VLC_ADD_CPPFLAGS([x11],[-I${x_includes}])
+ VLC_ADD_LDFLAGS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext])
+ VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}])
])
CPPFLAGS="${CPPFLAGS_save}"
fi
if test "${enable_xvideo}" != "no" &&
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
test "${enable_xvideo}" = "yes"); then
- CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
+ CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
- CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
+ CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"
AC_CHECK_LIB(Xv,XvPutImage,[
# If libXv.so is available, xvideo can be a plugin. Otherwise, we
# test for libXv_pic.
if test -f /usr/X11R6/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then
VLC_ADD_PLUGINS([xvideo])
- VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
- VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
+ VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
+ VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv])
else
AC_CHECK_LIB(Xv_pic,XvPutImage,[
VLC_ADD_PLUGINS([xvideo])
- VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
- VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic])
+ VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
+ VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic])
],[
VLC_ADD_BUILTINS([xvideo])
- VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv])
- VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}])
+ VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv])
+ VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
])
fi
])
if test "${enable_glx}" != "no" &&
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
test "${enable_glx}" = "yes"); then
- CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
+ CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
AC_CHECK_HEADERS(X11/Xlib.h, [
AC_CHECK_HEADERS(GL/glx.h, [
VLC_ADD_PLUGINS([glx])
- VLC_ADD_LDFLAGS([glx],[-L${x_libraries} -lX11 -lXext -lGL -lGLU])
- VLC_ADD_CPPFLAGS([glx],[-I${x_includes}])
+ VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU])
+ VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}])
]) ])
CPPFLAGS="${CPPFLAGS_save}"
fi
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
test "${enable_xvideo}" = "yes"); then
ac_cv_have_xinerama="no"
- CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
- CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext"
+ CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
+ CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"
AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[
AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[
VLC_ADD_LDFLAGS([xvideo],[-lXinerama_pic])
AC_CHECK_HEADERS(GL/gl.h, [
VLC_ADD_PLUGINS([opengl])
if test "${SYS}" != "mingw32"; then
- VLC_ADD_LDFLAGS([opengl],[-L${x_libraries} -lGL -lGLU])
+ VLC_ADD_LDFLAGS([opengl],[${X_LIBS} -lGL -lGLU])
else
VLC_ADD_LDFLAGS([opengl],[-lopengl32])
fi
CPPFLAGS_cyberlink="-I${real_cyberlink_tree}/include"
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}"
AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h],
- [ VLC_ADD_CXXFLAGS([upnp], [${CPPFLAGS_cyberlink}])
- VLC_ADD_PLUGINS([upnp])
+ [ VLC_ADD_CXXFLAGS([upnp_cc], [${CPPFLAGS_cyberlink}])
+ VLC_ADD_PLUGINS([upnp_cc])
],[
AC_MSG_ERROR([cannot find CyberLink for C++ headers])
])
AS_IF([test "${LIBS_cclink}" == "no"],
[AC_MSG_FAILURE([cannot find XML parser for CyberLink])])
AC_MSG_RESULT([${LIBS_cclink}])
- VLC_ADD_LDFLAGS([upnp], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}])
+ VLC_ADD_LDFLAGS([upnp_cc], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}])
], [
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}])
])
])
+dnl
+dnl UPnP Plugin (Intel SDK)
+dnl
+AC_ARG_ENABLE(upnp,
+ [ --enable-upnp Intel UPnP SDK (default auto)])
+
+VLC_ADD_CXXFLAGS([upnp_intel], [ ])
+AS_IF([test "x${enable_upnp}" != "xno"], [
+ AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lpthread])
+ AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" == "no"], [
+ AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)])
+ ])
+ AS_IF([test "${has_upnp}" == "yes"], [
+ VLC_ADD_LDFLAGS([upnp_intel], [-lupnp])
+ ])
+], [
+ has_upnp="no"
+])
+
+AS_IF([test "${has_upnp}" == "yes"], [
+ VLC_ADD_PLUGINS([upnp_intel])
+])
+
+
dnl
dnl Interface plugins
dnl
else if test "${skins2_missing_lib}" = "no"; then
VLC_ADD_PLUGINS([skins2])
ALIASES="${ALIASES} svlc"
- VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -I${x_includes} -DX11_SKINS])
+ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
- VLC_ADD_LDFLAGS([skins2],[-L${x_libraries} -lXext -lX11])
+ VLC_ADD_LDFLAGS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11])
fi fi
fi
AC_CHECK_HEADERS(GL/gl.h, [
VLC_ADD_PLUGINS([galaktos])
if test "${SYS}" != "mingw32"; then
- VLC_ADD_LDFLAGS([galaktos],[-L${x_libraries} -lGL -lGLU])
+ VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU])
else
VLC_ADD_LDFLAGS([galaktos],[-lopengl32])
fi
AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
else
if test "${SYS}" != "mingw32"; then
- LDFLAGS="${LDFLAGS_save} -L${x_libraries}"
+ LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
AC_CHECK_LIB(Xt,XtStrings,
- [VLC_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt -lX11 -lSM -lICE])],
+ [VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])],
[],
- [[-L${x_libraries} -lX11 -lSM -lICE]
+ [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
])
LDFLAGS="${LDFLAGS_save}"
fi
VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
VLC_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
if test "${SYS}" = "mingw32"; then
- LDFLAGS="${LDFLAGS_save} -L${x_libraries}"
+ LDFLAGS="${LDFLAGS_save}"
dnl latest gecko sdk does not have embedstring
if test -d "${real_mozilla_sdk}/embedstring/bin"
then
AC_ARG_ENABLE(python-bindings,
[ --enable-python-bindings Enable Python bindings (default disabled)])
dnl TODO: look for python dev headers
-AM_CONDITIONAL( BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"] )
+AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
if test "${enable_python_bindings}" = "yes"
then
build_pic=yes
dnl
AC_ARG_ENABLE(java-bindings,
[ --enable-java-bindings Enable Java bindings (default disabled)])
-AM_CONDITIONAL( BUILD_JAVA, [test "${enable_java_bindings}" = "yes"] )
+AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"])
if test "${enable_java_bindings}" = "yes"
then
build_pic=yes
dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2005 the VideoLAN team", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2006 the VideoLAN team", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number])
projects / vlc / blobdiff