From 85b62da5c5a371f76b8be57fe795936487b5c106 Mon Sep 17 00:00:00 2001 From: infirit Date: Thu, 31 Oct 2013 12:19:02 +0100 Subject: Use GTK_API_VERSION in pkgconfig files --- libcaja-extension/libcaja-extension-uninstalled.pc.in | 2 +- libcaja-extension/libcaja-extension.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libcaja-extension/libcaja-extension-uninstalled.pc.in b/libcaja-extension/libcaja-extension-uninstalled.pc.in index 0a6eb259..1b156530 100644 --- a/libcaja-extension/libcaja-extension-uninstalled.pc.in +++ b/libcaja-extension/libcaja-extension-uninstalled.pc.in @@ -7,6 +7,6 @@ extensiondir=@libdir@/caja/extensions-2.0 Name: libcaja-extension Description: A library to create Caja view extensions Version: @VERSION@ -Requires: glib-2.0 gtk+-2.0 +Requires: glib-2.0 gtk+-@GTK_API_VERSION@ Libs: ${pc_top_builddir}/${pcfiledir}/libcaja-extension.la Cflags: -I${pc_top_builddir}/${pcfiledir}/.. diff --git a/libcaja-extension/libcaja-extension.pc.in b/libcaja-extension/libcaja-extension.pc.in index c043c397..a5ccae7e 100644 --- a/libcaja-extension/libcaja-extension.pc.in +++ b/libcaja-extension/libcaja-extension.pc.in @@ -7,6 +7,6 @@ extensiondir=@libdir@/caja/extensions-2.0 Name: libcaja-extension Description: A library to create Caja view extensions Version: @VERSION@ -Requires: glib-2.0 gio-2.0 gtk+-2.0 +Requires: glib-2.0 gio-2.0 gtk+-@GTK_API_VERSION@ Libs: -L${libdir} -lcaja-extension Cflags: -I${includedir}/caja -- cgit v1.2.1 From 72418e6eea09fbab0f5749c6e730b0fc755d78cb Mon Sep 17 00:00:00 2001 From: infirit Date: Thu, 31 Oct 2013 12:19:58 +0100 Subject: Remove forgotten GTK_API_VERSION and GTK_REQUIRED (now in case) --- configure.ac | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure.ac b/configure.ac index 31da6d6b..60eac112 100644 --- a/configure.ac +++ b/configure.ac @@ -25,9 +25,6 @@ AC_INIT([caja], [1.7.0], [http://www.mate-desktop.org]) dnl --------------------------------------------------------------------------- dnl GTK library version dnl --------------------------------------------------------------------------- -GTK_API_VERSION=2.0 -GTK_REQUIRED=2.24.0 - AC_MSG_CHECKING([which gtk+ version to compile against]) AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], -- cgit v1.2.1