Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv15927
Modified Files:
configure configure.in
Log Message:
dynamic loading of Python is not supported under Mac OS X
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.314
retrieving revision 1.315
diff -b -u -2 -r1.314 -r1.315
--- configure 10 Jan 2004 18:46:44 -0000 1.314
+++ configure 10 Jan 2004 21:24:44 -0000 1.315
@@ -567,5 +567,5 @@
-# From configure.in Id: configure.in,v 1.300 2004/01/06 00:24:17 vadz Exp
+# From configure.in Id: configure.in,v 1.301 2004/01/10 18:46:44 vadz Exp
rm -f conftestdata
@@ -892,5 +892,5 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
- m_cv_USE_PYTHON='dynamic'
+ m_cv_USE_PYTHON='1'
[...1372 lines suppressed...]
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5268: checking for $ac_word" >&5
+echo "configure:5279: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5360,5 +5371,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5363: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5374: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_cxx_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5383,5 +5394,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5386: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5397: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.301
retrieving revision 1.302
diff -b -u -2 -r1.301 -r1.302
--- configure.in 10 Jan 2004 18:46:44 -0000 1.301
+++ configure.in 10 Jan 2004 21:24:45 -0000 1.302
@@ -113,7 +113,18 @@
--disable-nls no internationalization support)
-M_OVERRIDES(python,Python scripting,USE_PYTHON,dynamic,
+M_OVERRIDES(python,Python scripting,USE_PYTHON,1,
--with-python=xxx one of none/static/dynamic)
+dnl choose how to use Python: normally, dynamic loading is preferred, but it
+dnl doesn't work under Mac (we need Python.bundle, but all we have is Python
+dnl framework which is a dylib and not a bundle)
+if test "$USE_PYTHON" = 1; then
+ if test "$USE_MAC" = 1; then
+ USE_PYTHON="static"
+ else
+ USE_PYTHON="dynamic"
+ fi
+fi
+
case "$USE_PYTHON" in
static|Static|STATIC|dynamic|Dynamic|DYNAMIC|1)
@@ -825,4 +836,7 @@
case "$USE_PYTHON" in
dynamic|Dynamic|DYNAMIC)
+ if test "$USE_MAC" = 1; then
+ AC_MSG_ERROR([Dynamic Python loading is not supported under Mac OS])
+ fi
AC_DEFINE(USE_PYTHON_DYNAMIC)
;;
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
