diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-07-27 18:55:31 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-07-27 18:55:31 +0000 |
| commit | a46057bae600c5c75949db33637a72ed84ae8f2d (patch) | |
| tree | aff9ba25ddaa68b3e1cd315ffdd9596ecf51c4d4 | |
| parent | 37914293e01da5c690c5e146971163495d185064 (diff) | |
| download | gnome-doc-utils-a46057bae600c5c75949db33637a72ed84ae8f2d.tar.gz | |
- Only apply the version check when we're not configuring g-d-u
2005-07-27 Christian Persch <chpe@cvs.gnome.org>
* gnome-doc-utils.m4:
- Only apply the version check when we're not configuring g-d-u
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-doc-utils.m4 | 12 |
2 files changed, 13 insertions, 5 deletions
@@ -1,6 +1,12 @@ 2005-07-27 Christian Persch <chpe@cvs.gnome.org> * gnome-doc-utils.m4: + - Only apply the version check when we're not configuring g-d-u + itself. + +2005-07-27 Christian Persch <chpe@cvs.gnome.org> + + * gnome-doc-utils.m4: - Add minimum-version argument to GNOME_DOC_INIT, and check for the required gdu version. Minimum is 0.3.2 if not specified. Fixes bug #311661. diff --git a/gnome-doc-utils.m4 b/gnome-doc-utils.m4 index 4a072a4..5a06fa0 100644 --- a/gnome-doc-utils.m4 +++ b/gnome-doc-utils.m4 @@ -2,14 +2,16 @@ dnl GNOME_DOC_INIT([MINIMUM-VERSION]) AC_DEFUN([GNOME_DOC_INIT], [ +dnl Only apply the version check if we're not configuring ourselves! +if test "x$AC_PACKAGE_TARNAME" != "xgnome-doc-utils"; then + GDU_REQUIRED_VERSION=0.3.2 + if test -n "$1"; then + GDU_REQUIRED_VERSION=$1 + fi -GDU_REQUIRED_VERSION=0.3.2 -if test -n "$1"; then - GDU_REQUIRED_VERSION=$1 + PKG_CHECK_MODULES([GDU_MODULE_VERSION_CHECK],[gnome-doc-utils >= $GDU_REQUIRED_VERSION]) fi -PKG_CHECK_MODULES([GDU_MODULE_VERSION_CHECK],[gnome-doc-utils >= $GDU_REQUIRED_VERSION]) - AC_ARG_WITH([help-dir], AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, [with_help_dir='${datadir}/gnome/help']) |