FIX: don't crash on buggy keymap xml

[vuplus_xbmc] / configure.in

diff --git a/configure.in b/configure.in
index badc57d..7e2a891 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1277,6 +1277,7 @@ fi
 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
@@ -2159,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
@@ -2687,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], [