diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-31 04:36:49 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-31 04:36:49 -0700 |
| commit | 26e32ccc5efa5885227fa9e5e9b7bfb22e32b62d (patch) | |
| tree | 130b93efce9eb96179becad3f8538bbb64958bbf | |
| parent | 70a2cb2aed093e76142c10fff8bf7ccafbded7ce (diff) | |
| parent | 72418e6eea09fbab0f5749c6e730b0fc755d78cb (diff) | |
| download | caja-26e32ccc5efa5885227fa9e5e9b7bfb22e32b62d.tar.bz2 caja-26e32ccc5efa5885227fa9e5e9b7bfb22e32b62d.tar.xz | |
Merge pull request #193 from infirit/master
Fix pkgconfig files and small cleanup of configure.ac
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libcaja-extension/libcaja-extension-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | libcaja-extension/libcaja-extension.pc.in | 2 |
3 files changed, 2 insertions, 5 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)])], 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 |