[geany/geany] 5f0963: List package dependencies only in configure.ac - Commits

12 Apr 2012


      Branch:      refs/heads/master
Author:      Colomban Wendling ban@herbesfolles.org
Committer:   Colomban Wendling ban@herbesfolles.org
Date:        Thu, 12 Apr 2012 16:41:53
Commit:      5f0963d4706d40d6beefd844d2c7e7b25847a191
             https://github.com/geany/geany/commit/5f0963d4706d40d6beefd844d2c7e7b25847a1...
Log Message:
-----------
List package dependencies only in configure.ac
This prevents from having to update both configure.ac and geany.pc.in
every time our dependencies (e.g. GTK version) change.
Modified Paths:
--------------
    configure.ac
    geany.pc.in
    wscript
Modified: configure.ac
6 files changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -57,8 +57,10 @@ GEANY_CHECK_REVISION([dnl force debug mode for a SVN working copy
# GTK/GLib/GIO checks
-gtk_modules="gtk+-2.0 >= 2.16 glib-2.0 >= 2.20 gio-2.0 >= 2.20 gmodule-2.0"
-PKG_CHECK_MODULES([GTK], [$gtk_modules])
+gtk_modules="gtk+-2.0 >= 2.16 glib-2.0 >= 2.20"
+gtk_modules_private="gio-2.0 >= 2.20 gmodule-2.0"
+PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private])
+AC_SUBST([DEPENDENCIES], [$gtk_modules])
 AC_SUBST([GTK_CFLAGS])
 AC_SUBST([GTK_LIBS])
 GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
Modified: geany.pc.in
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -8,7 +8,7 @@ localedir=@localedir@
Name: Geany
 Description: A fast and lightweight IDE using GTK2
-Requires: gtk+-2.0 >= 2.16.0
+Requires: @DEPENDENCIES@
 Version: @VERSION@
 Libs: -L${libdir}
 Cflags: -DGTK -I${includedir}/geany -I${includedir}/geany/tagmanager -I${includedir}/geany/scintilla
Modified: wscript
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -346,6 +346,7 @@ def build(bld):
     bld.new_task_gen(
         source          = 'geany.pc.in',
         dct             = {'VERSION' : VERSION,
+                           'DEPENDENCIES': 'gtk+-2.0 >= 2.16 glib-2.0 >= 2.20',
                            'prefix': bld.env['PREFIX'],
                            'exec_prefix': '${prefix}',
                            'libdir': '${exec_prefix}/lib',
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

    