← Back to team overview

zeitgeist team mailing list archive

[Merge] lp:~seif/zeitgeist/fix-gnome-autogen into lp:zeitgeist

 

Seif Lotfy has proposed merging lp:~seif/zeitgeist/fix-gnome-autogen into lp:zeitgeist.

Requested reviews:
  Zeitgeist Framework Team (zeitgeist)
Related bugs:
  #683280 problem building from trunk in KDE
  https://bugs.launchpad.net/bugs/683280


This allows zeitgeist to be built and run on dekstops without gnome-common (gnome-autogen.sh)
Works on KDE (if .cache folder in home is present)
-- 
https://code.launchpad.net/~seif/zeitgeist/fix-gnome-autogen/+merge/42977
Your team Zeitgeist Framework Team is requested to review the proposed merge of lp:~seif/zeitgeist/fix-gnome-autogen into lp:zeitgeist.
=== modified file 'autogen.sh'
--- autogen.sh	2010-03-22 08:22:14 +0000
+++ autogen.sh	2010-12-07 17:37:41 +0000
@@ -12,19 +12,39 @@
 	exit 1
 }
 
-which gnome-autogen.sh || {
-	echo "You need to install gnome-common from the GNOME Git Repository"
-	exit 1
-}
-
 which rapper || {
 	echo "You need to install raptor-utils"
 	exit 1
 }
 
 export PKG_NAME
-REQUIRED_AUTOCONF_VERSION=2.57 \
-REQUIRED_AUTOMAKE_VERSION=1.9 \
-REQUIRED_INTLTOOL_VERSION=0.35.0 \
-REQUIRED_PKG_CONFIG_VERSION=0.16.0 \
-	USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-uninstalled-build "$@"
+
+if which gnome-autogen.sh ; then
+  REQUIRED_AUTOMAKE_VERSION=1.11
+  REQUIRED_AUTOCONF_VERSION=2.57 \
+  REQUIRED_AUTOMAKE_VERSION=1.9 \
+  REQUIRED_INTLTOOL_VERSION=0.35.0 \
+  REQUIRED_PKG_CONFIG_VERSION=0.16.0 \
+	    USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-uninstalled-build "$@"
+else
+  if which intltoolize && which autoreconf ; then
+    intltoolize --copy --force --automake || \
+      (echo "There was an error in running intltoolize." > /dev/stderr;
+       exit 1)
+    autoreconf --force --install || \
+      (echo "There was an error in running autoreconf." > /dev/stderr;
+       exit 1)
+  else
+    echo "No build script available.  You have two choices:"
+    echo "1. You need to install the gnome-common module and make"
+    echo "   sure the gnome-autogen.sh script is in your \$PATH."
+    echo "2. You need to install the following scripts:"
+    echo "   * intltool"
+    echo "   * libtool"
+    echo "   * automake"
+    echo "   * autoconf"
+    echo "   Additionally, you need to make"
+    echo "   sure that they are in your \$PATH."
+    exit 1
+  fi
+fi
\ No newline at end of file