[tracker] build: Make life easier with autogen by adding args if none are provided
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] build: Make life easier with autogen by adding args if none are provided
- Date: Fri, 12 Dec 2014 13:01:13 +0000 (UTC)
commit 30f23cb63deacea9d868c73435b0491b9d36f321
Author: Martyn Russell <martyn lanedo com>
Date: Fri Dec 12 12:55:55 2014 +0000
build: Make life easier with autogen by adding args if none are provided
This patch does 3 things:
1. Fix the --with-enca (which should have been --enable-enca and was failing)
2. If JHBUILD_PREFIX is set, use that when no args are given
3. If no args are given, use the make distcheck default args in place
This will ensure documentation and unit tests are build most of the time and
things don't break so often :)
Makefile.am | 2 +-
autogen.sh | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5791a08..d297672 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,6 +117,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-libgsf \
--enable-playlist \
--enable-tracker-preferences \
- --with-enca
+ --enable-enca
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/autogen.sh b/autogen.sh
index e5de9f6..d1aaf36 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,4 +21,40 @@ if ! which gnome-autogen.sh ; then
exit 1
fi
+# If no arguments are given, use those used with distcheck
+# equally, use the JHBuild prefix if it is available otherwise fall
+# back to the default (/usr/local)
+if [ $# -eq 0 ] ; then
+ echo "Using distcheck arguments, none were supplied..."
+
+ if test -n "$JHBUILD_PREFIX" ; then
+ echo "Using JHBuild prefix ('$JHBUILD_PREFIX')"
+ NEW_PREFIX="--prefix $JHBUILD_PREFIX"
+ fi
+
+ NEW_ARGS="\
+ --disable-nautilus-extension \
+ --enable-unit-tests \
+ --enable-functional-tests \
+ --enable-gtk-doc \
+ --enable-introspection \
+ --disable-miner-rss \
+ --disable-miner-evolution \
+ --disable-miner-thunderbird \
+ --disable-miner-firefox \
+ --enable-poppler \
+ --enable-exempi \
+ --enable-libiptcdata \
+ --enable-libjpeg \
+ --enable-libtiff \
+ --enable-libvorbis \
+ --enable-libflac \
+ --enable-libgsf \
+ --enable-playlist \
+ --enable-tracker-preferences \
+ --enable-enca"
+
+ set -- $NEW_PREFIX $NEW_ARGS
+fi
+
. gnome-autogen.sh
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]