X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=e574430b3b3f5c74090da7f0262d4bb15d137eea;hb=7baf1ff43df54f768a61ffbc95da1c247c9e352e;hp=53dab09cebf2b9f81346674f98f5d33de628e972;hpb=b51afca9348a2c1ebca0237e5e91f9b0b6562d91;p=vlc

diff --git a/configure.ac b/configure.ac
index 53dab09ceb..e574430b3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ dnl Autoconf settings for vlc
 
 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)
 
@@ -4428,19 +4428,29 @@ 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 action directory (auto)]))
-AS_IF([test "${with_kde_solid}" != "no"],[
-     AS_IF([test -z "${with_kde_solid}"],[
-          AS_IF([which kde4-config],[
-               with_kde_solid="`kde4-config --install data`/solid/actions/"
-          ])
-     ])
-],[
-     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,[${with_kde_solid}])
-AM_CONDITIONAL(KDE_SOLID, [test -n ${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 ?)
@@ -4564,7 +4574,6 @@ then
     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