FIX: don't crash on buggy keymap xml

[vuplus_xbmc] / configure.in

diff --git a/configure.in b/configure.in
index fb0a4c5..7e2a891 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -105,6 +105,8 @@ goom_disabled="== GOOM disabled. =="
 alsa_disabled="== ALSA support disabled. =="
 rsxs_enabled="== RSXS enabled. =="
 rsxs_disabled="== RSXS disabled. =="
+fishbmc_enabled="== FishBMC enabled. =="
+fishbmc_disabled="== FishBMC disabled. =="
 projectm_enabled="== ProjectM enabled. =="
 projectm_disabled="== ProjectM disabled. =="
 x11_enabled="== X11 enabled. =="
@@ -302,6 +304,12 @@ AC_ARG_ENABLE([rsxs],
   [use_rsxs=$enableval],
   [use_rsxs=yes])
 
+AC_ARG_ENABLE([fishbmc],
+  [AS_HELP_STRING([--enable-fishbmc],
+  [enable FishBMC visualisation (default is yes)])],
+  [use_fishbmc=$enableval],
+  [use_fishbmc=yes])
+
 AC_ARG_ENABLE([projectm],
   [AS_HELP_STRING([--enable-projectm],
   [enable ProjectM visualisation (default is yes)])],
@@ -1255,10 +1263,21 @@ else
   fi
 fi
 
+# FISHBMC
+if test "$use_fishbmc" = "no" || test "$use_gl" = "no"; then
+  AC_MSG_NOTICE($fishbmc_disabled)   
+  DISABLE_FISHBMC=1
+  use_fishbmc="no"
+else
+  AC_MSG_NOTICE($fishbmc_enabled)
+  DISABLE_FISHBMC=0
+fi
+
 # PROJECTM
 if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
   AC_MSG_NOTICE($projectm_disabled)
   DISABLE_PROJECTM=1
+  use_projectm="no"
 else
   AC_MSG_NOTICE($projectm_enabled)
   DISABLE_PROJECTM=0
@@ -2007,6 +2026,12 @@ else
   final_message="$final_message\n  RSXS:\t\tNo"
 fi
 
+if test "$use_fishbmc" = "yes"; then
+  final_message="$final_message\n  FishBMC:\tYes"
+else
+  final_message="$final_message\n  FishBMC:\tNo"
+fi
+
 if test "$use_projectm" = "yes"; then
   final_message="$final_message\n  ProjectM:\tYes"
 else
@@ -2135,7 +2160,12 @@ if test "$HAVE_GIT" = "yes"; then
   GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
 fi
 if test "$GIT_REV" = ""; then
-  GIT_REV="Unknown"
+  if test -f VERSION ; then
+    GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION)
+    if test -z $GIT_REV ; then GIT_REV="Unknown" ; fi
+  else
+    GIT_REV="Unknown"
+  fi
 fi
 if test "$host_vendor" = "apple"; then
   echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
@@ -2413,6 +2443,7 @@ AC_SUBST(SDL_DEFINES)
 AC_SUBST(BUILD_DVDCSS)
 AC_SUBST(DISABLE_GOOM)
 AC_SUBST(DISABLE_RSXS)
+AC_SUBST(DISABLE_FISHBMC)
 AC_SUBST(DISABLE_PROJECTM)
 AC_SUBST(USE_SKIN_TOUCHED)
 AC_SUBST(USE_EXTERNAL_FFMPEG)
@@ -2662,6 +2693,7 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
   $MAKE dvdread-config &&
   mkdir -p `pwd`/../includes/dvdread
   cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
+  cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
 ], [0])
 
 XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [