summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-03-16 09:23:54 +0100
committerMurray Cumming <murrayc@murrayc.com>2011-03-16 09:23:54 +0100
commitd52ed9362b584f8c07a02916b5a2ace9671f3162 (patch)
tree6a1ddad1e29cab919baacc51ecf3bcfaf5f6225e
parentd067369e6217668afea936bf2a2c20164b64ce76 (diff)
downloadglibmm-d52ed9362b584f8c07a02916b5a2ace9671f3162.tar.gz
Fix missing doc-install.pl problem with the tarball build.
* configure.ac: Remove the call to MM_CONFIG_DOCTOOL_DIR() so we do not copy the mm-common doc utils into glibmm and do not try to use local copies of them. This is what gtkmm and other modules do so it makes sense to do it now for glibmm now that glibmm is not the one that supplies these for pkg-config. This fixes bug #644829 (David Ronis) with the tarball build and Ubuntu launchpad bug https://bugs.launchpad.net/ubuntu/+source/glibmm2.4/+bug/735856 (Krzysztof Klimonda) However, I can see the point of distributing copies in the tarball, which could make the tarball build not need mm-common at all. But if we want that then we should decide to do it for gtkmm and other modules too.
-rw-r--r--ChangeLog17
-rw-r--r--configure.ac1
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e110f9ae..b48ea39c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-03-16 Murray Cumming <murrayc@murrayc.com>
+
+ Fix missing doc-install.pl problem with the tarball build.
+
+ * configure.ac: Remove the call to MM_CONFIG_DOCTOOL_DIR() so we do not copy
+ the mm-common doc utils into glibmm and do not try to use local copies of
+ them. This is what gtkmm and other modules do so it makes sense to do it now
+ for glibmm now that glibmm is not the one that supplies these for pkg-config.
+ This fixes bug #644829 (David Ronis) with the tarball build and
+ Ubuntu launchpad bug
+ https://bugs.launchpad.net/ubuntu/+source/glibmm2.4/+bug/735856
+ (Krzysztof Klimonda)
+
+ However, I can see the point of distributing copies in the tarball, which
+ could make the tarball build not need mm-common at all. But if we want that
+ then we should decide to do it for gtkmm and other modules too.
+
2.27.96:
2011-03-15 Murray Cumming <murrayc@murrayc.com>
diff --git a/configure.ac b/configure.ac
index d77beb50..8f40352b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,6 @@ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
MM_PREREQ([0.7])
MM_INIT_MODULE([glibmm-2.4])
MM_INIT_MODULE([giomm-2.4])
-MM_CONFIG_DOCTOOL_DIR([docs])
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([LIBGLIBMM_SO_VERSION], [4:0:3])