sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

List package dependencies only in configure.ac

Browse Source 
This prevents from having to update both configure.ac and geany.pc.in
every time our dependencies (e.g. GTK version) change.
This commit is contained in:
Colomban Wendling 2012-04-12 17:39:10 +02:00
parent 890667db5a
commit 5f0963d470
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -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`

2
geany.pc.in
View File

@ -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

1
wscript
View File

@ -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',