[pitivi] Allow disable help
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Allow disable help
- Date: Mon, 2 Dec 2013 15:34:55 +0000 (UTC)
commit f0673c8602d74efdaad641ba3eaa6ffd3297ab29
Author: Thibault Saunier <thibault saunier collabora com>
Date: Mon Dec 2 11:58:33 2013 -0300
Allow disable help
Makefile.am | 6 +++++-
autogen.sh | 15 +++++++++++----
configure.ac | 16 +++++++++++++++-
3 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7a1edec..f536cb3 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
AUTOMAKE_OPTIONS = dist-bzip2
-SUBDIRS = bin pitivi common po tests data help
+SUBDIRS = bin pitivi common po tests data
+
+if BUILD_HELP
+SUBDIRS += help
+endif
mimedir = $(datadir)/mime/packages
mime_DATA = pitivi.xml
diff --git a/autogen.sh b/autogen.sh
index 048a2ec..8ab638f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -62,10 +62,17 @@ fi
toplevel_check $srcfile
-GNOMEDOC=`which yelp-build`
-if test -z $GNOMEDOC; then
- echo "Please intall the yelp-tools package"
- exit 1
+build_help=true
+while getopts disable-help x; do
+ build_help=false
+done; OPTIND=0
+
+if $build_help; then
+ GNOMEDOC=`which yelp-build`
+ if test -z $GNOMEDOC; then
+ echo "Please intall the yelp-tools package"
+ exit 1
+ fi
fi
# This is needed to create ltmain.sh for our C bits.
diff --git a/configure.ac b/configure.ac
index 1faa153..00a8c72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,21 @@ AC_CONFIG_FILES([bin/pitivi], [chmod +x bin/pitivi])
PKG_CHECK_MODULES([cairo], [cairo])
PKG_CHECK_MODULES([pycairo], [pycairo])
-YELP_HELP_INIT
+AC_ARG_ENABLE(help,
+ AS_HELP_STRING([--disable-help],[disable help]),
+ [
+ case "${enableval}" in
+ yes) BUILD_HELP=yes ;;
+ no) BUILD_HELP=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-help) ;;
+ esac
+ ],
+[BUILD_HELP=yes]) dnl Default value
+AM_CONDITIONAL(BUILD_HELP, test "x$BUILD_HELP" = "xyes")
+
+if test x$BUILD_HELP = xyes; then
+ YELP_HELP_INIT
+fi
dnl output stuff
AC_OUTPUT(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]