bsod: use simple XML generator

[enigma2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 110c92ad48892350eee7c37b3562fb9458442560..c2d8d915d30236ca4d28c1a4bb1a14eaba9b9cb5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,16 @@ AC_INIT([enigma2],[2.8.0],[enigma2-devel@lists.elitedvb.net])
 AM_INIT_AUTOMAKE([dist-bzip2 no-define tar-pax])
 AC_CONFIG_HEADERS([enigma2_config.h])
 
+# Silent rules are available since 1.11, but older versions
+# are still in use. So don't use them unconditionally.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 
 AC_PROG_CC
 AC_PROG_CXX
-LT_INIT
+m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h])
@@ -30,6 +34,9 @@ AX_PTHREAD
 
 TUXBOX_APPS_DVB
 
+AM_CONDITIONAL(HAVE_GIT_DIR, test -d "$srcdir/.git")
+AM_CONDITIONAL(HAVE_FAKE_GIT_DIR, test -f "$srcdir/.git/last_commit_info")
+
 PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-0.10 gstreamer-pbutils-0.10 libdvbsi++ libpng libxml-2.0 sigc++-1.2])
 PKG_CHECK_MODULES(LIBDDVD, libdreamdvd, HAVE_LIBDDVD="yes", HAVE_LIBDDVD="no")
 AM_CONDITIONAL(HAVE_LIBDDVD, test "$HAVE_LIBDDVD" = "yes")
@@ -51,7 +58,6 @@ AC_ARG_WITH(libsdl,
        [with_libsdl=$withval],[with_libsdl=no])
 if test "$with_libsdl" = "yes"; then
        PKG_CHECK_MODULES(LIBSDL, sdl)
-       AC_DEFINE([WITH_SDL],[1],[Define to 1 if you have libsdl])
 fi
 AM_CONDITIONAL(HAVE_LIBSDL, test "$with_libsdl" = "yes")