[gtk-doc] gtkdocize: allow settings gtkdocize options in more ways, Fixes 605564
- From: Stefan Kost <stefkost src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk-doc] gtkdocize: allow settings gtkdocize options in more ways, Fixes 605564
- Date: Sat, 2 Jan 2010 21:34:07 +0000 (UTC)
commit eb334bd4aa0d036ff8a54331178c08c1096ad07f
Author: Stefan Kost <ensonic users sf net>
Date: Sat Jan 2 22:59:21 2010 +0200
gtkdocize: allow settings gtkdocize options in more ways, Fixes 605564
If one wants to e.g. use "--flavour no-tmpl" one needs to add that to
autogen.sh. Gnome projects usualy use autogen.sh from gnome-common and thus
can't do any customization. Now they can do it via envvar or via
GTK_DOC_CHECK macro.
gtkdocize.in | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
---
diff --git a/gtkdocize.in b/gtkdocize.in
index 312fcdb..f425467 100644
--- a/gtkdocize.in
+++ b/gtkdocize.in
@@ -20,7 +20,36 @@ flavour=legacy
usage="\
usage: $progname [ --copy ] [ --docdir DIR ] [ --flavour {legacy|no-tmpl} ]"
+# detect configure script
+no_configure_found=0
+if test -f configure.ac; then
+ configure=configure.ac
+elif test -f configure.in; then
+ configure=configure.in
+else
+ no_configure_found=1
+fi
+
+# check configure script for GTK_DOC_CHECK macro
+no_gtk_doc_check_found=0
+if test $no_configure_found -eq 0; then
+ macro=`grep '^GTK_DOC_CHECK' $configure 2>/dev/null`
+ if test $? -eq 0; then
+ # GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+ extra_options=`echo $macro | sed -e 's/^GTK_DOC_CHECK(\ *\(.*\))/\1/' | sed -e 's/^.*\,\ *\[\{0,1\}\([^]]*\)\]\{0,1\}\ *$/\1/'`
+ if test $? -eq 0; then
+ #echo >&2 "DEBUG: adding extra options [$extra_options] to [$*]"
+ set - $* $GTKDOCIZE_FLAGS $extra_options
+ else
+ set - $* $GTKDOCIZE_FLAGS
+ fi
+ else
+ no_gtk_doc_check_found=1;
+ fi
+fi
+
while test $# -gt 0; do
+ #echo >&2 "DEBUG: parsing args [$1]";
case "$1" in
--help)
echo "$usage"
@@ -68,18 +97,11 @@ case "$flavour" in
exit 1 ;;
esac
-if test -f configure.ac; then
- configure=configure.ac
-elif test -f configure.in; then
- configure=configure.in
-else
+if test $no_configure_found -eq 1; then
echo "$progname: neither configure.ac nor configure.in exist" 1>&2
exit 1
fi
-
-if grep '^GTK_DOC_CHECK' $configure >/dev/null 2>&1; then
- :
-else
+if test $no_gtk_doc_check_found -eq 1; then
echo "$progname: GTK_DOC_CHECK not called in $configure" 1>&2
exit 1
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]