Qt: sprintf is deprecated

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index b00eed7086957e1cc083606a2cbcf4cfb47dd129..53dab09cebf2b9f81346674f98f5d33de628e972 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT(vlc, 1.1.0-git)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
 VERSION_REVISION="0"
-VERSION_EXTRA="-git"
+VERSION_EXTRA="-test"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 
@@ -343,6 +343,7 @@ case "${host_os}" in
         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
@@ -4424,6 +4425,23 @@ AS_IF([test "${ac_cv_c_bigendian}" = "yes"], [
 ])
 AC_SUBST(DEFS_BIGENDIAN)
 
+dnl
+dnl Where to install KDE solid .desktop
+dnl
+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=''
+])
+AC_SUBST(soliddatadir,[${with_kde_solid}])
+AM_CONDITIONAL(KDE_SOLID, [test -n ${with_kde_solid}])
+
 dnl
 dnl  DLL loader copied from MPlayer copied from somewhere else (WINE ?)
 dnl