Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8656
Modified Files:
configure configure.in
Log Message:
added support for Python 2.4 detection (also simplified code for Python
versions)
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.324
retrieving revision 1.325
diff -b -u -2 -r1.324 -r1.325
--- configure 17 Nov 2004 08:57:33 -0000 1.324
+++ configure 9 Apr 2005 18:51:04 -0000 1.325
@@ -3759,7 +3759,8 @@
case "$USE_PYTHON" in
static|Static|STATIC|dynamic|Dynamic|DYNAMIC|1)
- m_safe=`echo "Python.h_2.3" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for Python.h (2.3)""... $ac_c" 1>&6
-echo "configure:3764: checking for Python.h (2.3)" >&5
+ for ver in 2.4 2.3 2.2 2.1 2.0 1.5; do
+ m_safe=`echo "Python.h_$ver" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for Python.h ($ver)""... $ac_c" 1>&6
+echo "configure:3765: checking for Python.h ($ver)" >&5
if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3767,16 +3768,16 @@
m_save_CPPFLAGS="$CPPFLAGS"
for j in "." \
- $prefix/include/python2.3 \
- /usr/include/python2.3 \
- /usr/local/include/python2.3 \
+ $prefix/include/python$ver \
+ /usr/include/python$ver \
+ /usr/local/include/python$ver \
; do
CPPFLAGS="-I$j $CPPFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 3776 "configure"
+#line 3777 "configure"
#include "confdefs.h"
#include <Python.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -3810,249 +3811,17 @@
eval "CPPFLAGS=\"-I$dir $CPPFLAGS\""
- PYTHON_VER=2.3
-
- else
- echo "$ac_t""no" 1>&6
-
- m_safe=`echo "Python.h_2.2" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for Python.h (2.2)""... $ac_c" 1>&6
-echo "configure:3820: checking for Python.h (2.2)" >&5
- if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- m_save_CPPFLAGS="$CPPFLAGS"
- for j in "." \
- $prefix/include/python2.2 \
- /usr/include/python2.2 \
- /usr/local/include/python2.2 \
- ; do
- CPPFLAGS="-I$j $CPPFLAGS"
- cat > conftest.$ac_ext <<EOF
-#line 3832 "configure"
-#include "confdefs.h"
- #include <Python.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
-
- if test "$j" = "."; then
- j="/usr/include"
- fi
- eval "m_cv_header_$m_safe=$j"
- CPPFLAGS="$m_save_CPPFLAGS"
+ PYTHON_VER=$ver
break
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "m_cv_header_$m_safe=no"
-
-fi
-rm -f conftest*
- CPPFLAGS="$m_save_CPPFLAGS"
- done
-
-
-fi
-
- if eval "test \"`echo '$m_cv_header_'$m_safe`\" != no"; then
- dir=`eval echo $\`eval echo m_cv_header_$m_safe\``
- echo "$ac_t""yes (in $dir)" 1>&6
- eval "CPPFLAGS=\"-I$dir $CPPFLAGS\""
-
- PYTHON_VER=2.2
else
echo "$ac_t""no" 1>&6
-
- m_safe=`echo "Python.h_2.1" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for Python.h (2.1)""... $ac_c" 1>&6
-echo "configure:3876: checking for Python.h (2.1)" >&5
- if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- m_save_CPPFLAGS="$CPPFLAGS"
- for j in "." \
- $prefix/include/python2.1 \
- /usr/include/python2.1 \
- /usr/local/include/python2.1 \
- ; do
- CPPFLAGS="-I$j $CPPFLAGS"
- cat > conftest.$ac_ext <<EOF
-#line 3888 "configure"
-#include "confdefs.h"
- #include <Python.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
-
- if test "$j" = "."; then
- j="/usr/include"
fi
- eval "m_cv_header_$m_safe=$j"
- CPPFLAGS="$m_save_CPPFLAGS"
- break
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "m_cv_header_$m_safe=no"
-fi
-rm -f conftest*
- CPPFLAGS="$m_save_CPPFLAGS"
done
-
-
-fi
-
- if eval "test \"`echo '$m_cv_header_'$m_safe`\" != no"; then
- dir=`eval echo $\`eval echo m_cv_header_$m_safe\``
- echo "$ac_t""yes (in $dir)" 1>&6
- eval "CPPFLAGS=\"-I$dir $CPPFLAGS\""
-
- PYTHON_VER=2.1
-
- else
- echo "$ac_t""no" 1>&6
-
- m_safe=`echo "Python.h_2.0" | sed
'y%./+-%__p_%'`
- echo $ac_n "checking for Python.h (2.0)""... $ac_c" 1>&6
-echo "configure:3932: checking for Python.h (2.0)" >&5
- if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- m_save_CPPFLAGS="$CPPFLAGS"
- for j in "." \
- $prefix/include/python2.0 \
- /usr/include/python2.0 \
- /usr/local/include/python2.0 \
- ; do
- CPPFLAGS="-I$j $CPPFLAGS"
- cat > conftest.$ac_ext <<EOF
-#line 3944 "configure"
-#include "confdefs.h"
- #include <Python.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
-
- if test "$j" = "."; then
- j="/usr/include"
- fi
- eval "m_cv_header_$m_safe=$j"
- CPPFLAGS="$m_save_CPPFLAGS"
- break
-
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "m_cv_header_$m_safe=no"
-
-fi
-rm -f conftest*
- CPPFLAGS="$m_save_CPPFLAGS"
- done
-
-
-fi
-
- if eval "test \"`echo '$m_cv_header_'$m_safe`\" != no"; then
- dir=`eval echo $\`eval echo m_cv_header_$m_safe\``
- echo "$ac_t""yes (in $dir)" 1>&6
- eval "CPPFLAGS=\"-I$dir $CPPFLAGS\""
-
- PYTHON_VER=2.0
-
- else
- echo "$ac_t""no" 1>&6
-
- m_safe=`echo "Python.h_1.5" | sed
'y%./+-%__p_%'`
- echo $ac_n "checking for Python.h (1.5)""... $ac_c" 1>&6
-echo "configure:3988: checking for Python.h (1.5)" >&5
- if eval "test \"`echo '$''{'m_cv_header_$m_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- m_save_CPPFLAGS="$CPPFLAGS"
- for j in "." \
- $prefix/include/python1.5 \
- /usr/include/python1.5 \
- /usr/local/include/python1.5 \
- ; do
- CPPFLAGS="-I$j $CPPFLAGS"
- cat > conftest.$ac_ext <<EOF
-#line 4000 "configure"
-#include "confdefs.h"
- #include <Python.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
-
- if test "$j" = "."; then
- j="/usr/include"
- fi
- eval "m_cv_header_$m_safe=$j"
- CPPFLAGS="$m_save_CPPFLAGS"
- break
-
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "m_cv_header_$m_safe=no"
-
-fi
-rm -f conftest*
- CPPFLAGS="$m_save_CPPFLAGS"
- done
-
-
-fi
-
- if eval "test \"`echo '$m_cv_header_'$m_safe`\" != no"; then
- dir=`eval echo $\`eval echo m_cv_header_$m_safe\``
- echo "$ac_t""yes (in $dir)" 1>&6
- eval "CPPFLAGS=\"-I$dir $CPPFLAGS\""
-
- PYTHON_VER=1.5
-
- else
- echo "$ac_t""no" 1>&6
-
+ if test "x$PYTHON_VER" = "x"; then
USE_PYTHON=0
fi
-
-
- fi
-
-
- fi
-
-
- fi
-
-
- fi
-
-
;;
@@ -4082,5 +3851,5 @@
PYTHON_LIBS="-framework Python"
echo $ac_n "checking if we can link with Python framework""...
$ac_c" 1>&6
-echo "configure:4085: checking if we can link with Python framework" >&5
+echo "configure:3854: checking if we can link with Python framework" >&5
if eval "test \"`echo '$''{'m_cv_framework_python'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4090,5 +3859,5 @@
LIBS="$LIBS $PYTHON_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4093 "configure"
+#line 3862 "configure"
#include "confdefs.h"
#include "python.h"
@@ -4097,5 +3866,5 @@
; return 0; }
EOF
-if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:3869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
m_cv_framework_python=yes
@@ -4119,5 +3888,5 @@
if test "x$PYTHON_LIBS" = "x"; then
echo $ac_n "checking for main in -lpython$PYTHON_VER""... $ac_c"
1>&6
-echo "configure:4122: checking for main in -lpython$PYTHON_VER" >&5
+echo "configure:3891: checking for main in -lpython$PYTHON_VER" >&5
m_lib_var=`echo python$PYTHON_VER'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'m_cv_lib_$m_lib_var'+set}'`\" = set"; then
@@ -4138,5 +3907,5 @@
LIBS="-L$j -lpython$PYTHON_VER $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4141 "configure"
+#line 3910 "configure"
#include "confdefs.h"
@@ -4145,5 +3914,5 @@
; return 0; }
EOF
-if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "m_cv_lib_$m_lib_var=\"libpath_$m_lib_var=-L$j\""
@@ -4187,10 +3956,10 @@
if test "$PYTHON_VER" != "1.5";
then
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:4190: checking for openpty" >&5
+echo "configure:3959: checking for openpty" >&5
if eval "test \"`echo '$''{'ac_cv_func_openpty'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4195 "configure"
+#line 3964 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -4215,5 +3984,5 @@
; return 0; }
EOF
-if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_openpty=yes"
@@ -4233,5 +4002,5 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:4236: checking for openpty in -lutil" >&5
+echo "configure:4005: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4241,5 +4010,5 @@
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4244 "configure"
+#line 4013 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4252,5 +4021,5 @@
; return 0; }
EOF
-if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4303,5 +4072,5 @@
set dummy swig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4306: checking for $ac_word" >&5
+echo "configure:4075: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SWIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4351,5 +4120,5 @@
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4354: checking for $ac_word" >&5
+echo "configure:4123: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4386,5 +4155,5 @@
set dummy msgmerge; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4389: checking for $ac_word" >&5
+echo "configure:4158: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4429,5 +4198,5 @@
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4432: checking for $ac_word" >&5
+echo "configure:4201: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4491,5 +4260,5 @@
if test -x "$WX_CONFIG_NAME" ; then
echo $ac_n "checking for wx-config""... $ac_c" 1>&6
-echo "configure:4494: checking for wx-config" >&5
+echo "configure:4263: checking for wx-config" >&5
WX_CONFIG_PATH="$WX_CONFIG_NAME"
echo "$ac_t""$WX_CONFIG_PATH" 1>&6
@@ -4498,5 +4267,5 @@
set dummy $WX_CONFIG_NAME; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4501: checking for $ac_word" >&5
+echo "configure:4270: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_WX_CONFIG_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4539,8 +4308,8 @@
if test -z "" ; then
echo $ac_n "checking for wxWindows version >= $min_wx_version""...
$ac_c" 1>&6
-echo "configure:4542: checking for wxWindows version >= $min_wx_version" >&5
+echo "configure:4311: checking for wxWindows version >= $min_wx_version" >&5
else
echo $ac_n "checking for wxWindows version >= $min_wx_version ()""...
$ac_c" 1>&6
-echo "configure:4545: checking for wxWindows version >= $min_wx_version ()" >&5
+echo "configure:4314: checking for wxWindows version >= $min_wx_version ()" >&5
fi
@@ -4587,5 +4356,5 @@
echo $ac_n "checking for wxWindows static
library""... $ac_c" 1>&6
-echo "configure:4590: checking for wxWindows static library" >&5
+echo "configure:4359: checking for wxWindows static library" >&5
WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
if test "x$WX_LIBS_STATIC" = "x"; then
@@ -4693,5 +4462,5 @@
set dummy SetFile; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4696: checking for $ac_word" >&5
+echo "configure:4465: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SETFILE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4739,5 +4508,5 @@
case "$USE_THREADS" in 1)
echo $ac_n "checking if wxWindows was compiled with threads""... $ac_c"
1>&6
-echo "configure:4742: checking if wxWindows was compiled with threads" >&5
+echo "configure:4511: checking if wxWindows was compiled with threads" >&5
if eval "test \"`echo '$''{'m_cv_wx_threads'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4747,5 +4516,5 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4750 "configure"
+#line 4519 "configure"
#include "confdefs.h"
#include "wx/setup.h"
@@ -4758,5 +4527,5 @@
}
EOF
-if { (eval echo configure:4761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
m_cv_wx_threads=yes
@@ -4794,5 +4563,5 @@
linux* | Linux*)
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:4797: checking for pam_end in -lpam" >&5
+echo "configure:4566: checking for pam_end in -lpam" >&5
ac_lib_var=`echo pam'_'pam_end | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4802,5 +4571,5 @@
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4805 "configure"
+#line 4574 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4813,5 +4582,5 @@
; return 0; }
EOF
-if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4841,5 +4610,5 @@
case "$USE_CCOSTYPE" in
''|0|1) echo $ac_n "checking for c-client library OS type""... $ac_c"
1>&6
-echo "configure:4844: checking for c-client library OS type" >&5
+echo "configure:4613: checking for c-client library OS type" >&5
case "$OSTYPE" in
linux* | Linux*)
@@ -4900,15 +4669,15 @@
ac_safe=`echo "pi-source.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pi-source.h""... $ac_c" 1>&6
-echo "configure:4903: checking for pi-source.h" >&5
+echo "configure:4672: checking for pi-source.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4908 "configure"
+#line 4677 "configure"
#include "confdefs.h"
#include <pi-source.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -4927,5 +4696,5 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lpisock""... $ac_c" 1>&6
-echo "configure:4930: checking for main in -lpisock" >&5
+echo "configure:4699: checking for main in -lpisock" >&5
ac_lib_var=`echo pisock'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4935,5 +4704,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4938 "configure"
+#line 4707 "configure"
#include "confdefs.h"
@@ -4942,5 +4711,5 @@
; return 0; }
EOF
-if { (eval echo configure:4945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4963,5 +4732,5 @@
MAKE_PISOCKLIB="PISOCK_LIB:=-lpisock"
echo $ac_n "checking for pi_setmaxspeed in -lpisock""... $ac_c" 1>&6
-echo "configure:4966: checking for pi_setmaxspeed in -lpisock" >&5
+echo "configure:4735: checking for pi_setmaxspeed in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_setmaxspeed | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4971,5 +4740,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4974 "configure"
+#line 4743 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4982,5 +4751,5 @@
; return 0; }
EOF
-if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -5007,5 +4776,5 @@
echo $ac_n "checking for pi_accept_to in -lpisock""... $ac_c" 1>&6
-echo "configure:5010: checking for pi_accept_to in -lpisock" >&5
+echo "configure:4779: checking for pi_accept_to in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_accept_to | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -5015,5 +4784,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5018 "configure"
+#line 4787 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -5026,5 +4795,5 @@
; return 0; }
EOF
-if { (eval echo configure:5029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -5072,5 +4841,5 @@
*)
echo $ac_n "checking for libmal in lib""... $ac_c" 1>&6
-echo "configure:5075: checking for libmal in lib" >&5
+echo "configure:4844: checking for libmal in lib" >&5
if test ! -d $srcdir/lib/libmal
then echo "$ac_t""not found - no MAL synch for PalmOS" 1>&6
@@ -5091,15 +4860,15 @@
ac_safe=`echo "sqlite.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sqlite.h""... $ac_c" 1>&6
-echo "configure:5094: checking for sqlite.h" >&5
+echo "configure:4863: checking for sqlite.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5099 "configure"
+#line 4868 "configure"
#include "confdefs.h"
#include <sqlite.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
@@ -5118,5 +4887,5 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lsqlite""... $ac_c" 1>&6
-echo "configure:5121: checking for main in -lsqlite" >&5
+echo "configure:4890: checking for main in -lsqlite" >&5
ac_lib_var=`echo sqlite'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -5126,5 +4895,5 @@
LIBS="-lsqlite $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5129 "configure"
+#line 4898 "configure"
#include "confdefs.h"
@@ -5133,5 +4902,5 @@
; return 0; }
EOF
-if { (eval echo configure:5136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
@@ -5201,5 +4970,5 @@
auto|Auto|AUTO|1)
echo $ac_n "checking how to link modules""... $ac_c" 1>&6
-echo "configure:5204: checking how to link modules" >&5
+echo "configure:4973: checking how to link modules" >&5
if test "$USE_MAC" = 0; then
LDD="ldd"
@@ -5253,5 +5022,5 @@
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5256: checking for $ac_word" >&5
+echo "configure:5025: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5288,5 +5057,5 @@
set dummy latex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5291: checking for $ac_word" >&5
+echo "configure:5060: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5323,5 +5092,5 @@
set dummy makeindex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5326: checking for $ac_word" >&5
+echo "configure:5095: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5358,5 +5127,5 @@
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5361: checking for $ac_word" >&5
+echo "configure:5130: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5393,5 +5162,5 @@
set dummy ps2pdf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5396: checking for $ac_word" >&5
+echo "configure:5165: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PSTOPDF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5428,5 +5197,5 @@
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5431: checking for $ac_word" >&5
+echo "configure:5200: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5523,5 +5292,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5526: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5295: 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
@@ -5546,5 +5315,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c"
1>&6
-echo "configure:5549: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5318: 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.309
retrieving revision 1.310
diff -b -u -2 -r1.309 -r1.310
--- configure.in 21 Jul 2004 11:29:20 -0000 1.309
+++ configure.in 9 Apr 2005 18:51:08 -0000 1.310
@@ -758,75 +758,22 @@
case "$USE_PYTHON" in
static|Static|STATIC|dynamic|Dynamic|DYNAMIC|1)
- M_CHECK_MYHEADER_VER(Python.h, 2.3,
+ for ver in 2.4 2.3 2.2 2.1 2.0 1.5; do
+ M_CHECK_MYHEADER_VER(
+ Python.h,
+ $ver,
[ \
- $prefix/include/python2.3 \
- /usr/include/python2.3 \
- /usr/local/include/python2.3 \
+ $prefix/include/python$ver \
+ /usr/include/python$ver \
+ /usr/local/include/python$ver \
],
[
- PYTHON_VER=2.3
- ],
- [
- M_CHECK_MYHEADER_VER(Python.h, 2.2,
- [ \
- $prefix/include/python2.2 \
- /usr/include/python2.2 \
- /usr/local/include/python2.2 \
- ],
- [
- PYTHON_VER=2.2
- ],
- [
- M_CHECK_MYHEADER_VER(Python.h, 2.1,
- [ \
- $prefix/include/python2.1 \
- /usr/include/python2.1 \
- /usr/local/include/python2.1 \
- ],
- [
- PYTHON_VER=2.1
- ],
- [
- M_CHECK_MYHEADER_VER(Python.h, 2.0,
- [ \
- $prefix/include/python2.0 \
- /usr/include/python2.0 \
- /usr/local/include/python2.0 \
- ],
- [
- PYTHON_VER=2.0
- ],
- [
- M_CHECK_MYHEADER_VER(Python.h, 1.5,
- [ \
- $prefix/include/python1.5 \
- /usr/include/python1.5 \
- /usr/local/include/python1.5 \
- ],
- [
- PYTHON_VER=1.5
- ],
- [
- USE_PYTHON=0
- ],
- [ (for Python 1.5)],
- 15,
- )
- ],
- [ (for Python 2.0)],
- 20,
- )
- ],
- [ (for Python 2.1)],
- 21,
- )
- ],
- [ (for Python 2.2)],
- 22,
- )
- ],
- [ (for Python 2.3)],
- 23,
+ PYTHON_VER=$ver
+ break
+ ]
)
+ done
+ if test "x$PYTHON_VER" = "x"; then
+ USE_PYTHON=0
+ fi
;;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
