[libpeas] Fix build when gdk-2.0 is not installed
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Fix build when gdk-2.0 is not installed
- Date: Tue, 29 Jun 2010 17:04:14 +0000 (UTC)
commit 4c3438d56a5fa4e6eb2ab8311808c16bfe1d1f73
Author: Garrett Regier <alias301 gmail com>
Date: Tue Jun 29 08:58:09 2010 -0700
Fix build when gdk-2.0 is not installed
configure.ac | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f223474..7ca7f98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,29 +51,6 @@ LT_INIT([disable-static])
AC_CHECK_FUNCS(fsync)
AC_CHECK_SIZEOF(time_t, [], [#include <time.h>])
-PKG_PROG_PKG_CONFIG
-
-dnl ================================================================
-dnl Check for native OSX
-dnl ================================================================
-AC_MSG_CHECKING([for native Mac OS X])
-
-gdk_windowing=`$PKG_CONFIG --variable=target gdk-2.0`
-
-if test "$gdk_windowing" = "quartz"; then
- os_osx=yes
-else
- os_osx=no
-fi
-AC_MSG_RESULT([$os_osx])
-AM_CONDITIONAL(OS_OSX, test "$os_osx" = "yes")
-
-if test "$os_osx" = "yes"; then
- AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX])
-
- PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
-fi
-
dnl ================================================================
dnl Gettext stuff.
dnl ================================================================
@@ -90,6 +67,8 @@ dnl ================================================================
dnl Start of pkg-config checks
dnl ================================================================
+PKG_PROG_PKG_CONFIG
+
PKG_CHECK_MODULES(PEAS, [
glib-2.0 >= 2.18.0
gobject-2.0 >= 2.23.6
@@ -107,14 +86,37 @@ AC_ARG_ENABLE(gtk2-test-build,
if test "$use_gtk2" != "yes"; then
GTK_TYPELIB=Gtk-3.0
GTK_PKG_REQUIREMENT="gtk+-3.0 >= 2.90"
+ GDK_REQUIRED=gdk-3.0
else
GTK_TYPELIB=Gtk-2.0
GTK_PKG_REQUIREMENT="gtk+-2.0 >= 2.16"
+ GDK_REQUIRED=gdk-2.0
fi
PKG_CHECK_MODULES(PEASUI, [$GTK_PKG_REQUIREMENT])
AC_SUBST(GTK_TYPELIB)
AC_SUBST(GTK_PKG_REQUIREMENT)
+dnl ================================================================
+dnl Check for native OSX
+dnl ================================================================
+AC_MSG_CHECKING([for native Mac OS X])
+
+
+gdk_windowing=`$PKG_CONFIG --variable=target $GDK_REQUIRED`
+
+if test "$gdk_windowing" = "quartz"; then
+ os_osx=yes
+else
+ os_osx=no
+fi
+AC_MSG_RESULT([$os_osx])
+AM_CONDITIONAL(OS_OSX, test "$os_osx" = "yes")
+
+if test "$os_osx" = "yes"; then
+ AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX])
+
+ PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
+fi
dnl ================================================================
dnl GObject Introspection
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]