[gtksourceview/wip/ax-pkg-check: 1/2] build: use AX_PKG_CHECK_MODULES
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/ax-pkg-check: 1/2] build: use AX_PKG_CHECK_MODULES
- Date: Sun, 30 Aug 2015 12:23:45 +0000 (UTC)
commit 68aafd722cfe0ea992e99f869c6619af475b3ff8
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Aug 30 14:07:05 2015 +0200
build: use AX_PKG_CHECK_MODULES
It simplifies the pkg-config file.
https://tecnocode.co.uk/2014/12/09/a-checklist-for-writing-pkg-config-files/
https://wiki.gnome.org/Initiatives/GnomeGoals/ModernAutotools
configure.ac | 14 +++++---------
gtksourceview-3.0.pc.in | 4 ++--
2 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7f14bf0..1a8613e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,9 +42,6 @@ GTK_REQUIRED_VERSION=3.16
LIBXML_REQUIRED_VERSION=2.6.0
GLADE_UI_REQUIRED=3.9
-AC_SUBST(GTK_REQUIRED_VERSION)
-AC_SUBST(LIBXML_REQUIRED_VERSION)
-
AC_CONFIG_SRCDIR([gtksourceview/gtksourcebuffer.h])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -88,12 +85,11 @@ if test "$enable_deprecations" = "no"; then
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi
-PKG_CHECK_MODULES(DEP, [
- glib-2.0 >= $GLIB_REQUIRED_VERSION
- gio-2.0 >= $GLIB_REQUIRED_VERSION
- gtk+-3.0 >= $GTK_REQUIRED_VERSION
- libxml-2.0 >= $LIBXML_REQUIRED_VERSION
-])
+AX_PKG_CHECK_MODULES(DEP,
+ [glib-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ gtk+-3.0 >= $GTK_REQUIRED_VERSION],
+ [libxml-2.0 >= $LIBXML_REQUIRED_VERSION]);
dnl Check to enable completion providers
AC_ARG_ENABLE(providers,
diff --git a/gtksourceview-3.0.pc.in b/gtksourceview-3.0.pc.in
index 7e19a99..8cc0d6a 100644
--- a/gtksourceview-3.0.pc.in
+++ b/gtksourceview-3.0.pc.in
@@ -6,7 +6,7 @@ includedir= includedir@
Name: @PACKAGE_NAME@
Description: GTK+ 3.0 Source Editing Widget
Version: @PACKAGE_VERSION@
-Requires: gtk+-3.0 >= @GTK_REQUIRED_VERSION@
-Requires.private: libxml-2.0 >= @LIBXML_REQUIRED_VERSION@
+Requires: @AX_PACKAGE_REQUIRES@
+Requires.private: @AX_PACKAGE_REQUIRES_PRIVATE@
Libs: -L${libdir} -lgtksourceview-3.0
Cflags: -I${includedir}/gtksourceview-3.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]