Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31208
Modified Files:
CHANGES configure configure.in
Log Message:
updated to build with recent swig (>= 1.3.25)
Index: CHANGES
===================================================================
RCS file: /cvsroot/mahogany/M/CHANGES,v
retrieving revision 1.366
retrieving revision 1.367
diff -b -u -2 -r1.366 -r1.367
--- CHANGES 16 Nov 2005 16:04:05 -0000 1.366
+++ CHANGES 15 Dec 2005 19:40:03 -0000 1.367
@@ -10,4 +10,5 @@
-------------------------------------
+2005-11-28 VZ: updated to build with recent swig (>= 1.3.25)
2005-11-16 XN: added feature that allows user to drop messages from a folder
to the composer window
2005-11-15 XN: added feature that allows user to drop files to the composer
window
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.327
retrieving revision 1.328
diff -b -u -2 -r1.327 -r1.328
--- configure 31 Aug 2005 22:05:42 -0000 1.327
+++ configure 15 Dec 2005 19:40:03 -0000 1.328
@@ -569,5 +569,5 @@
-# From configure.in Id: configure.in,v 1.310 2005/04/09 18:51:08 vadz Exp
+# From configure.in Id: configure.in,v 1.312 2005/08/31 22:05:42 vadz Exp
rm -f conftestdata
@@ -1541,32 +1541,54 @@
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1545: checking for POSIXized ISC" >&5
[...1364 lines suppressed...]
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5162: checking for $ac_word" >&5
+echo "configure:5255: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5256,5 +5347,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5257: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5350: 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
@@ -5279,5 +5370,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c"
1>&6
-echo "configure:5280: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5373: 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.312
retrieving revision 1.313
diff -b -u -2 -r1.312 -r1.313
--- configure.in 31 Aug 2005 22:05:42 -0000 1.312
+++ configure.in 15 Dec 2005 19:40:04 -0000 1.313
@@ -873,12 +873,65 @@
MAKE_USE_PYTHON="USE_PYTHON=yes"
if test "x$USE_SWIG" = "x1"; then
- AC_PATH_PROG(SWIG,swig)
- case "$SWIG" in '')
- AC_MSG_WARN([cannot find SWIG - will use precompiled files for
- Python support. If you want to be able to modify the
- interface files, please install SWIG >= 1.3.9.])
+ dnl if this changes, don't forget to change the tests for swig_ver
+ dnl below as well
+ swig_min_ver=1.3.25
+
+ AC_PATH_PROG(SWIG, swig)
+ if test "x$SWIG" = "x"; then
+ AC_MSG_WARN([
+*** Cannot find SWIG -- will use precompiled files for Python support.
+*** If you want to modify the interface files, please install SWIG >=
$swig_min_ver.])
USE_SWIG=0
+ else
+ AC_MSG_CHECKING([for swig version])
+ swig_ver=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed
's/SWIG Version //'`
+ AC_MSG_RESULT([$swig_ver])
+
+ case "$swig_ver" in
+ 1.1.* | 1.2.* )
+ swig_ver_status="old"
+ ;;
+
+ 1.3.*)
+ swig_ver_micro=`echo $swig_ver | sed 's/1\.3\.//'`
+ if test $swig_ver_micro -lt 25; then
+ swig_ver_status="old"
+ elif test $swig_ver_micro -gt 27; then
+ swig_ver_status="new"
+ fi
+ ;;
+
+ [2-9]*.[0-9]*.[0-9]*)
+ swig_ver_status="new"
+ ;;
+
+ *)
+ AC_MSG_WARN([Unrecognized swig version format
"$swig_ver"])
+ swig_ver_status="bad"
;;
esac
+
+ case "$swig_ver_status" in
+ bad )
+ AC_MSG_WARN([
+*** Version of your swig program ($SWIG) couldn't be determined, please report
+*** this to us. Assuming it does not work and continuing without swig.])
+ USE_SWIG=0
+ ;;
+
+ old )
+ AC_MSG_WARN([
+*** Your swig program ($SWIG) is version $swig_ver but at least $swig_min_ver
is required.])
+ USE_SWIG=0
+ ;;
+
+ new )
+ AC_MSG_WARN([
+*** Your swig program ($SWIG) is version $swig_ver but the last tested
+*** version is 1.3.24 -- still continuing hoping that it is going to work,
+*** but if it doesn't, please rerun configure with --without-swig option.])
+ ;;
+ esac
+ fi
fi
;;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
