[librsvgmm] Update to recent mm-common functionality
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [librsvgmm] Update to recent mm-common functionality
- Date: Mon, 17 Aug 2009 00:16:12 +0000 (UTC)
commit aef2a4fc3c6538a31de3a5adbb19c4ee1630cf75
Author: Daniel Elstner <daniel kitta gmail com>
Date: Mon Aug 17 02:09:54 2009 +0200
Update to recent mm-common functionality
* configure.ac: Insert MM_PREREQ([0.4]) macro call.
(MM_INIT_MODULE): Omit now optional second macro argument.
(AC_PROG_LIBTOOL): Use old-style libtool setup macros for now, as the
more recent release which provide LT_INIT() are not available in some
host environments.
* librsvg/librsvgmm-2.0.pc.in (htmlrefpub): Append trailing slash.
* librsvg/librsvgmm-2.0-uninstalled.pc.in (htmlrefpub): ditto.
configure.ac | 9 +++++----
librsvg/librsvgmm-2.0-uninstalled.pc.in | 2 +-
librsvg/librsvgmm-2.0.pc.in | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8bf1d5e..9532dcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,15 +28,16 @@ AM_INIT_AUTOMAKE([1.10 -Wno-portability check-news no-define nostdinc tar-pax])
AM_MAINTAINER_MODE
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
-MM_INIT_MODULE([librsvgmm-2.0], m4_expand([AC_PACKAGE_VERSION]))
+MM_PREREQ([0.4])
+MM_INIT_MODULE([librsvgmm-2.0])
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([LIBRSVGMM_SO_VERSION], [0:0:0])
AC_PROG_CXX
-
-LT_PREREQ([2.2.0])
-LT_INIT([disable-static win32-dll])
+AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
AC_SUBST([LIBRSVGMM_MODULES], ['librsvg-2.0 >= 2.25 cairomm-1.0 >= 1.6 glibmm-2.4 >= 2.16'])
PKG_CHECK_MODULES([LIBRSVGMM], [$LIBRSVGMM_MODULES])
diff --git a/librsvg/librsvgmm-2.0-uninstalled.pc.in b/librsvg/librsvgmm-2.0-uninstalled.pc.in
index 4de7aa4..ec6293d 100644
--- a/librsvg/librsvgmm-2.0-uninstalled.pc.in
+++ b/librsvg/librsvgmm-2.0-uninstalled.pc.in
@@ -1,5 +1,5 @@
doxytagfile=${pc_top_builddir}/doc/reference/@LIBRSVGMM_MODULE_NAME tag
-htmlrefpub=http://www.gtkmm.org/docs/@LIBRSVGMM_MODULE_NAME@/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@LIBRSVGMM_MODULE_NAME@/reference/html/
Name: librsvgmm
Description: C++ binding for librsvg, not installed
diff --git a/librsvg/librsvgmm-2.0.pc.in b/librsvg/librsvgmm-2.0.pc.in
index bb15e40..16e7ddf 100644
--- a/librsvg/librsvgmm-2.0.pc.in
+++ b/librsvg/librsvgmm-2.0.pc.in
@@ -8,7 +8,7 @@ includedir= includedir@
docdir=${datarootdir}/doc/@LIBRSVGMM_MODULE_NAME@
doxytagfile=${docdir}/reference/@LIBRSVGMM_MODULE_NAME tag
htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.gtkmm.org/docs/@LIBRSVGMM_MODULE_NAME@/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@LIBRSVGMM_MODULE_NAME@/reference/html/
Name: librsvgmm
Description: C++ binding for librsvg
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]