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="-test"
+VERSION_EXTRA="-pre1"
PKGDIR="vlc"
AC_SUBST(PKGDIR)
])
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