summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Herzberg <herzi@gnome-de.org>2005-03-21 22:10:41 +0000
committerSven Herzberg <herzi@src.gnome.org>2005-03-21 22:10:41 +0000
commit82bb4ac04136f4462a5096ee33849e10e7004006 (patch)
treec06617c661972e36627045ce199da53d6330fc26
parent762703487dcab4d0e8fbb46d90204301eb4c932c (diff)
downloadgnome-common-82bb4ac04136f4462a5096ee33849e10e7004006.tar.gz
added support for the gnome-doc-utils
2005-03-21 Sven Herzberg <herzi@gnome-de.org> * macros2/gnome-autogen.sh: added support for the gnome-doc-utils svn path=/trunk/; revision=3596
-rw-r--r--ChangeLog4
-rw-r--r--macros2/gnome-autogen.sh10
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0283436..e1cb410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-21 Sven Herzberg <herzi@gnome-de.org>
+
+ * macros2/gnome-autogen.sh: added support for the gnome-doc-utils
+
2005-03-15 Stepan Kasal <kasal@ucw.cz>
* macros2/ChangeLog: Removed; the contents merged into the main one.
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index f43f4a9..9180e42 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -15,6 +15,7 @@ REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25}
REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0}
REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0}
REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0}
+REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.1.3}
# a list of required m4 macros. Package can set an initial value
REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-}
@@ -210,6 +211,7 @@ want_glib_gettext=false
want_intltool=false
want_pkg_config=false
want_gtk_doc=false
+want_gnome_doc_utils=false
configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -o -name configure.in -print`"
for configure_ac in $configure_files; do
@@ -232,6 +234,9 @@ for configure_ac in $configure_files; do
if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then
want_gtk_doc=true
fi
+ if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then
+ want_gnome_doc_utils=true
+ fi
done
DIE=0
@@ -291,6 +296,11 @@ if $want_gtk_doc; then
require_m4macro gtk-doc.m4
fi
+if $want_gnome_doc_utils; then
+ version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \
+ "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" || DIE=1
+fi
+
if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
version_check gnome-common DOC_COMMON gnome-doc-common \
$REQUIRED_DOC_COMMON_VERSION " " || DIE=1