[gtk-mac-integration] [Python] Adjust acinclude and bindings/python/Makefile.am for introspection changes.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-mac-integration] [Python] Adjust acinclude and bindings/python/Makefile.am for introspection changes.
- Date: Thu, 29 Dec 2011 23:36:22 +0000 (UTC)
commit 82a77bb3424c8d089ed41b4ea670713ed5e3b914
Author: John Ralls <jralls ceridwen us>
Date: Fri Nov 25 15:19:04 2011 -0800
[Python] Adjust acinclude and bindings/python/Makefile.am for introspection changes.
acinclude.m4 | 1 +
bindings/python/Makefile.am | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index dde44e9..1495653 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -125,5 +125,6 @@ dnl Check that pygobject and gtk-3.0.gir are present
AC_MSG_RESULT($enable_python)
AM_CONDITIONAL([ENABLE_PYTHON], [test x$enable_python = xyes])
+ AM_CONDITIONAL([GTK_VERSION_2], [test "x$GTK_MAJOR" = "xgtk+-2.0" -o x$enable_python = "xall"])
])
dnl -----------------------------------------------------------
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index a597801..29375bd 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,9 +1,7 @@
-if INTROSPECTION
- GTK3_COCOA_DIR = gtk3_osxapplication
-else
+if GTK_VERSION_2
GTK_COCOA_DIR = gtk_osxapplication
if !SIXTY_FOUR_BIT
GTK_CARBON_DIR = gtkmacintegration
endif
endif
-SUBDIRS = $(GTK3_COCOA_DIR) $(GTK_COCOA_DIR) $(GTK_CARBON_DIR)
+SUBDIRS = $(GTK_COCOA_DIR) $(GTK_CARBON_DIR)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]