diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | libgnomekbd.pc.in | 3 | ||||
| -rw-r--r-- | libgnomekbdui.pc.in | 3 |
4 files changed, 22 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2007-06-21 svu + + * configure.in, libgnomekbdui.pc.in, libgnomekbd.pc.in: improving + pkgconfig handling, thanks to Christian. Closing + http://bugzilla.gnome.org/show_bug.cgi?id=449850 + 2007-05-30 Priit Laes <plaes@svn.gnome.org> * configure.in: Added Estonian (et) to ALL_LINGUAS. diff --git a/configure.in b/configure.in index 02ea3a4..fbb14a7 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl *************************************************************************** dnl *** configure.in for libgnomekbd *** dnl *************************************************************************** -AC_INIT(libgnomekbd, 2.18.2) +AC_INIT(libgnomekbd, 2.18.2, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd]) AC_PREREQ(2.59) VERSION_INFO=1:0:0 @@ -23,6 +23,17 @@ LIBGLADE_REQUIRED=2.6.0 LIBGNOME_REQUIRED=2.16.0 LIBGNOMEUI_REQUIRED=2.16.0 LIBXKLAVIER_REQUIRED=2.91 + +AC_SUBST([DBUS_REQUIRED]) +AC_SUBST([DBUS_GLIB_REQUIRED]) +AC_SUBST([GCONF_REQUIRED]) +AC_SUBST([LIBGLADE_REQUIRED]) +AC_SUBST([GDK_REQUIRED]) +AC_SUBST([GTK_REQUIRED]) +AC_SUBST([LIBGNOME_REQUIRED]) +AC_SUBST([LIBGNOMEUI_REQUIRED]) +AC_SUBST([LIBXKLAVIER_REQUIRED]) + dnl *************************************************************************** AM_MAINTAINER_MODE diff --git a/libgnomekbd.pc.in b/libgnomekbd.pc.in index cc9b6fc..4d10568 100644 --- a/libgnomekbd.pc.in +++ b/libgnomekbd.pc.in @@ -6,5 +6,6 @@ includedir=@includedir@ Name: libgnomekbd Description: GNOME keyboard shared library Version: @VERSION@ -Libs: -L${libdir} -lgnomekbd @GDK_LIBS@ @GCONF_LIBS@ @LIBGNOME_LIBS@ @LIBXKLAVIER_LIBS@ @DBUS_LIBS@ +Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libgnome-2.0 >= @LIBGNOME_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@ +Libs: -L${libdir} -lgnomekbd Cflags: -I${includedir} diff --git a/libgnomekbdui.pc.in b/libgnomekbdui.pc.in index 9d9ab0a..bca80cc 100644 --- a/libgnomekbdui.pc.in +++ b/libgnomekbdui.pc.in @@ -6,5 +6,6 @@ includedir=@includedir@ Name: libgnomekbd Description: GNOME keyboard shared library Version: @VERSION@ -Libs: -L${libdir} -lgnomekbd -lgnomekbdui @GDK_LIBS@ @GCONF_LIBS@ @LIBGNOME_LIBS@ @LIBXKLAVIER_LIBS@ @DBUS_LIBS@ @LIBGNOMEUI_LIBS@ +Requires: libgnomekbd = @VERSION@ libgnomeui-2.0 >= @LIBGNOMEUI_REQUIRED@ +Libs: -L${libdir} -lgnomekbdui Cflags: -I${includedir} |