diff options
| author | Malcolm Tredinnick <malcolm@src.gnome.org> | 2003-05-24 15:16:26 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm@src.gnome.org> | 2003-05-24 15:16:26 +0000 |
| commit | e16ea58db92e05b9720acdc6992175ec346dfc91 (patch) | |
| tree | dafb19409513ae55790e962f0cada60d82606237 /macros2 | |
| parent | 59c9ab024e8a72ca8393b02a4162ad5f2d3c5cdb (diff) | |
| download | shared-mime-info-e16ea58db92e05b9720acdc6992175ec346dfc91.tar.gz | |
Bump the version number to 2.3.0
* configure.in: Bump the version number to 2.3.0
* configure.in, Makefile.am, macros2/autogen.sh, doc-build/*:
Add in the infrastructure to allow user documentatin to be built
from some common files. This will not affect existing packages.
The changes required to use this are given in doc-build/README.
svn path=/trunk/; revision=2905
Diffstat (limited to 'macros2')
| -rw-r--r-- | macros2/autogen.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/macros2/autogen.sh b/macros2/autogen.sh index cf95289a..560f374d 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -14,6 +14,7 @@ REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0} 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} # a list of required m4 macros. Package can set an initial value REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} @@ -29,8 +30,8 @@ if [ -n "$GNOME2_DIR" ]; then fi -# Not all echo versions allow -n, so let's be portable. This test is based on -# the one in autoconf. +# Not all echo versions allow -n, so we check what is possible. This test is +# based on the one in autoconf. case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in *c*,-n*) ECHO_N= ;; *c*,* ) ECHO_N=-n ;; @@ -292,6 +293,11 @@ if $want_gtk_doc; then require_m4macro gtk-doc.m4 fi +if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then + version_check gnome-common DOC_COMMON gnome-doc-common" \ + $REQUIRED_DOC_COMMON_VERSION "" || DIE=1 +fi + check_m4macros || DIE=1 if [ "$DIE" -eq 1 ]; then @@ -350,6 +356,10 @@ for configure_ac in $configure_files; do printbold "Running $AUTOHEADER..." $AUTOHEADER || exit 1 fi + if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then + printbold "Running gnome-doc-common..." + gnome-doc-common --copy || exit 1 + fi printbold "Running $AUTOMAKE..." $AUTOMAKE --gnu --add-missing || exit 1 |