AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
-AC_INIT(vlc, 1.1.0-git)
+AC_INIT(vlc, 1.1.0-pre1)
VERSION_MAJOR="1"
VERSION_MINOR="1"
VERSION_REVISION="0"
-VERSION_EXTRA="-git"
+VERSION_EXTRA="-pre1"
PKGDIR="vlc"
AC_SUBST(PKGDIR)
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
- CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
+ CONTRIB_DIR="${topdir}/extras/contrib/hosts/${host}"
if ! test -d "$CONTRIB_DIR"
then
gccmachine=`$CC -dumpmachine`
- CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
+ CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}"
fi
fi
AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
- AS_IF([test -d ${CONTRIB_DIR}/lib],[
+ AS_IF([test -d "${CONTRIB_DIR}/lib"],[
AC_MSG_RESULT([yes])
AC_SUBST(CONTRIB_DIR)
export PATH=${CONTRIB_DIR}/bin:$PATH
CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include"
- if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then
- export PKG_CONFIG_PATH=${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
+ if test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"; then
+ export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
else
- export PKG_CONFIG_LIBDIR=${CONTRIB_DIR}/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
fi
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib"
- if test -z $with_mozilla_sdk_path; then
- with_mozilla_sdk_path=${CONTRIB_DIR}/gecko-sdk
+ if test -z "$with_mozilla_sdk_path"; then
+ with_mozilla_sdk_path="${CONTRIB_DIR}/gecko-sdk"
fi
- if test -z $with_cyberlink_tree; then
- with_cyberlink_tree=${CONTRIB_DIR}/src/clinkcc
+ if test -z "$with_cyberlink_tree"; then
+ with_cyberlink_tree="${CONTRIB_DIR}/src/clinkcc"
fi
if test "${SYS}" = "darwin"; then
- export LD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH
+ export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
+ export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
elif test "${SYS}" = "beos"; then
- export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH
- export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES
+ export LIBRARY_PATH="${CONTRIB_DIR}/lib:$LIBRARY_PATH"
+ export BELIBRARIES="${CONTRIB_DIR}/lib:$BELIBRARIES"
fi
],[
AC_MSG_RESULT([no])
then
AC_CHECK_TOOL(PEFLAGS, peflags, :)
fi
+ AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
dnl Check for usual libc functions
AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
RDC_PROG_CC_FLAGS([-pipe])
-AC_ARG_ENABLE(warnings-as-error,
- AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default disabled)]),, [enable_warnings_as_error="no"])
-AS_IF([test "${enable_warnings_as_error}" = "yes"], [
- RDC_PROG_CC_WERRORFLAGS([unused-function unused-label unused-value unused-parameter unused-variable unused \
- missing-braces nonnull parentheses uninitialized address enum-compare undef comment switch \
- bad-function-cast implicit sequence-point strict-aliasing array-bounds missing-parameter-type \
- overflow int-to-pointer-cast pointer-to-int-cast div-by-zero overflow ignored])
-])
-AC_SUBST(CFLAGS_WERROR)
-
dnl Check for various optimization flags
AC_CACHE_CHECK([if \$CC accepts -Os],
[ac_cv_c_os],
dnl
dnl OpenCV wrapper and example filters
dnl
-AC_ARG_ENABLE(opencv,
- [ --enable-opencv OpenCV (computer vision) filter (default disabled)])
-if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
-then
- AC_ARG_WITH(opencv-tree,
- [ --with-opencv-tree=PATH opencv tree for linking])
- if test "${SYS}" = "mingw32"
- then
- test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
- AC_MSG_CHECKING(for opencv in ${with_opencv_tree})
- if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \
- -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h
- then
- AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([opencv_wrapper])
- VLC_ADD_LIBS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
- VLC_ADD_CFLAGS([opencv_wrapper],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
- AC_LANG_PUSH(C++)
- VLC_ADD_PLUGIN([opencv_example])
- VLC_ADD_LIBS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
- VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
- AC_LANG_POP(C++)
- else
- dnl No opencv could be found, sorry
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}])
- fi
- else
- PKG_CHECK_MODULES(OPENCV, opencv,
- [
- VLC_ADD_PLUGIN([opencv_example opencv_wrapper])
- VLC_ADD_LIBS([opencv_example opencv_wrapper],[${OPENCV_LIBS}])
- VLC_ADD_CFLAGS([opencv_wrapper],[${OPENCV_CFLAGS}])
- VLC_ADD_CXXFLAGS([opencv_example],[${OPENCV_CFLAGS}])
- ],
- [AC_MSG_ERROR([libopencv not found!])]
- )
- fi
-fi
+PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off])
dnl
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
VLC_ADD_PLUGIN([screensaver xcb_x11 xcb_screen xcb_apps])
- VLC_SET_CFLAGS_WERROR([xcb_screen], [-Wno-error=uninitialized]) # some gcc report a warning which doesn't reveal an error
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
dnl
dnl MTP devices services discovery
-PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto])
+PKG_ENABLE_MODULES_VLC([MTP], [mtp access_mtp], [libmtp >= 1.0.0], [MTP devices support], [auto])
dnl
dnl Lirc plugin
])
AC_SUBST(DEFS_BIGENDIAN)
+dnl
+dnl Where to install KDE solid .desktop
+dnl
+AC_ARG_VAR([KDE4_CONFIG], [path to kde4-config utility])
+AS_IF([test "x$KDE4_CONFIG" = "x"], [
+ KDE4_CONFIG="kde4-config"
+])
+
+AC_ARG_WITH(kde-solid,
+ AS_HELP_STRING([--with-kde-solid=PATH],
+ [KDE Solid actions directory (auto)]),, [
+ with_kde_solid="yes"
+])
+soliddatadir=""
+AS_IF([test "${with_kde_solid}" != "no"], [
+ AS_IF([test "${with_kde_solid}" = "yes"], [
+ soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
+ AS_IF([test "x${soliddatadir}" = "x"], [
+ soliddatadir='$(datadir)/kde4/apps/solid/actions'
+ ])
+ ], [
+ soliddatadir="${with_kde_solid}"
+ ])
+])
+AC_SUBST(soliddatadir)
+AM_CONDITIONAL(KDE_SOLID, [test "x${soliddatadir}" != "x"])
+
dnl
dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?)
dnl
AS_IF( [test $found = 1],[
CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}"
MOZILLA_REQUIRED_HEADERS=1
- AC_CHECK_HEADERS([npfunctions.h])
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
[#if HAVE_NPAPI_H
dnl Stuff used by the program
dnl
VERSION_MESSAGE="${VERSION} ${CODENAME}"
-COPYRIGHT_MESSAGE="VLC media player - version ${VERSION_MESSAGE} - (c) ${COPYRIGHT_YEARS} the VideoLAN team"
+COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} the VideoLAN team"
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string])
AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])