[pygobject] configure.ac: Fix darwin builds
- From: Simon Feltman <sfeltman src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] configure.ac: Fix darwin builds
- Date: Thu, 21 Aug 2014 21:35:49 +0000 (UTC)
commit 9ce261f27742ba200f70003f162291a375d244d3
Author: Simon Feltman <sfeltman src gnome org>
Date: Tue Aug 19 14:57:31 2014 -0700
configure.ac: Fix darwin builds
Merge platform_win32 and os_win32 variables/case statements and
define "link_python_libs" for win32 as well as darwin.
https://bugzilla.gnome.org/show_bug.cgi?id=735068
configure.ac | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ece639c..90413b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,38 +51,30 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
-AC_MSG_CHECKING([for some Win32 platform])
+AC_MSG_CHECKING([for build time linking with Python (Darwin and Win32)])
case "$host" in
*-*-mingw*|*-*-cygwin*)
- platform_win32=yes
+ os_win32=yes
+ link_python_libs=yes
OS_EXT=dll
;;
*-*-darwin*)
+ os_win32=no
+ link_python_libs=yes
OS_EXT=dylib
;;
*)
- platform_win32=no
+ os_win32=no
+ link_python_libs=no
OS_EXT=so
;;
esac
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_MSG_RESULT([$link_python_libs])
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
AC_SUBST(OS_EXT)
AC_DEFINE_UNQUOTED(OS_EXT, "$OS_EXT", [Define shared library extension])
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
- *-*-mingw*)
- os_win32=yes
- ;;
- *)
- os_win32=no
- ;;
-esac
-AC_MSG_RESULT([$os_win32])
-AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-
LT_PREREQ([2.2.6])
LT_INIT([dlopen win32-dll disable-static])
@@ -126,8 +118,8 @@ PYTHON_SO=`$PYTHON -c "import distutils.sysconfig, sys; get = distutils.sysconfi
AC_SUBST(PYTHON_SO)
AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
-if test "x$os_win32" = "xyes"; then
- AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be
explicitly linked to libpython.]))
+if test "x$link_python_libs" = "xyes"; then
+ AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows and Darwin require Python modules to
be explicitly linked to libpython.]))
fi
AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]