Diff to enable Python 2.2 and 2.3 in configure.in

I have (per your good advice Vadim) found a .m4 macro which is supposed to save
this massive recursive ball af spaghetti and when I figure out how it works, I'll
make another diff.

This should suffice to make the above mentioned Python versions understood to the
make system. 

I thought I better try to make just to be sure and got:

c++ -o mail/VMessage.o -c -I/home/markl/M/build/include -I/home/markl/M/include 
-I/usr/include/python2.2 -DNO_IDEA -DNO_DSA -DOPENSSL_NO_KRB5 
-I/usr/local/lib/wx/include/gtkd-2.5 -D__WXDEBUG__ -D__WXGTK__ -D_FILE_OFFSET_BITS=64 
-D_LARGE_FILES -I/home/markl/M/extra/include -I/home/markl/M/build/extra/src/c-client 
-I/home/markl/M/extra/src/compface -I/home/markl/M/src/wx/vcard -fno-exceptions 
-fno-rtti -fno-operator-names -O2 -MMD -Wall .src/mail/VMessage.cpp
/usr//bin/swig -I.src/Python/ -c++ -python -shadow -c -o Python/MailFolder.cpp 
.src/Python/MailFolder.i
c++ -o Python/MailFolder.o -c -I/home/markl/M/build/include -I/home/markl/M/include 
-I/usr/include/python2.2 -DNO_IDEA -DNO_DSA -DOPENSSL_NO_KRB5 
-I/usr/local/lib/wx/include/gtkd-2.5 -D__WXDEBUG__ -D__WXGTK__ -D_FILE_OFFSET_BITS=64 
-D_LARGE_FILES -I/home/markl/M/extra/include -I/home/markl/M/build/extra/src/c-client 
-I/home/markl/M/extra/src/compface -I/home/markl/M/src/wx/vcard -fno-exceptions 
-fno-rtti -fno-operator-names -O2 -MMD -Wall Python/MailFolder.cpp
Python/MailFolder.cpp: In function `PyObject* _wrap_MailFolder_CreateFolder(PyObject*, 
PyObject*)':
Python/MailFolder.cpp:723: no method `MailFolder::CreateFolder'
Python/MailFolder.cpp: In function `PyObject* 
_wrap_MailFolder_ConvertMessageStatusToString(PyObject*, PyObject*)':
Python/MailFolder.cpp:751: no method `MailFolder::ConvertMessageStatusToString'
Python/MailFolder.cpp: In function `PyObject* 
_wrap_MailFolder_SetSequenceFlag(PyObject*, PyObject*)':
Python/MailFolder.cpp:1013: no matching function for call to 
`MailFolder::SetSequenceFlag(const wxString&, int&, bool&)'
/home/markl/M/include/MailFolder.h:616: candidates are: virtual bool 
MailFolder::SetSequenceFlag(MailFolder::SequenceKind, const Sequence&, int, bool = 
true)
/home/markl/M/include/MailFolder.h:620:                 bool 
MailFolder::SetSequenceFlag(const Sequence&, int, bool = true)
Python/MailFolder.cpp: In function `PyObject* 
_wrap_MailFolder_ApplyFilterRules(PyObject*, PyObject*)':
Python/MailFolder.cpp:1345: aggregate `UIdArray arg2' has incomplete type and cannot 
be defined
Python/MailFolder.cpp: In function `PyObject* 
_wrap_FolderListingEntry_GetName(PyObject*, PyObject*)':
Python/MailFolder.cpp:1566: `FolderListingEntry' undeclared (first use this function)
Python/MailFolder.cpp:1566: (Each undeclared identifier is reported only once for each 
function it appears in.)
Python/MailFolder.cpp:1566: `arg1' undeclared (first use this function)
make[1]: *** [Python/MailFolder.o] Error 1
make[1]: Leaving directory `/home/markl/M/build/src'
make: *** [all] Error 2
[EMAIL PROTECTED] build]#

<sigh>

What went wrong?

Dr. QA
--- configure.in	2003-08-29 13:03:40.000000000 +1000
+++ configure.in	2003-08-29 10:58:41.000000000 +1000
@@ -745,48 +745,78 @@
 dnl linking
 case "$USE_PYTHON" in
 static|Static|STATIC|dynamic|Dynamic|DYNAMIC|1)
-        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,
+
+
+	M_CHECK_MYHEADER_VER(Python.h, 2.3,
+	[ \
+		$prefix/include/python2.3 \
+		/usr/include/python2.3 \
+		/usr/local/include/python2.3 \
+	],
+	[
+		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.0)],
-		    20,
+		],
+		[ (for Python 2.2)],
+		22,
 		)
-	    ],
-	    [ (for Python 2.1)],
-	    21,
+	],
+	[ (for Python 2.3)],
+	23,
 	)
 	;;
 
@@ -876,8 +906,10 @@
 esac
 AC_SUBST(MAKE_USE_PYTHON)

Reply via email to