From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 21 Jul 2006 10:10:31 +0000
Subject: Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
.../packages/libid3tag/libid3tag_0.15.0b.bb | 19 +
meta-extras/packages/libmad/libmad_0.15.0b.bb | 26 +
meta-extras/packages/madplay/madplay_0.15.2b.bb | 13 +
meta-extras/packages/mc/mc_4.6.0.bb | 32 +
meta-extras/packages/meta/oh-image-extras.bb | 27 +
meta-extras/packages/meta/task-oh-extras.bb | 10 +
.../packages/python/python-2.4.3-manifest.inc | 259 +++++
.../packages/python/python-2.4.3/autohell.patch | 1209 ++++++++++++++++++++
.../python/python-2.4.3/bindir-libdir.patch | 18 +
.../python/python-2.4.3/crosscompile.patch | 108 ++
.../python-2.4.3/fix-tkinter-detection.patch | 39 +
.../python/python-2.4.3/sitebranding.patch | 19 +
.../python/python-native-2.4.0/bindir-libdir.patch | 18 +
.../python-native-2.4.0/cross-distutils.patch | 38 +
meta-extras/packages/python/python-native_2.4.0.bb | 31 +
.../packages/python/python-pygtk2/acinclude.m4 | 84 ++
meta-extras/packages/python/python-pygtk2_2.8.6.bb | 24 +
meta-extras/packages/python/python_2.4.3.bb | 70 ++
18 files changed, 2044 insertions(+)
create mode 100644 meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
create mode 100644 meta-extras/packages/libmad/libmad_0.15.0b.bb
create mode 100644 meta-extras/packages/madplay/madplay_0.15.2b.bb
create mode 100644 meta-extras/packages/mc/mc_4.6.0.bb
create mode 100644 meta-extras/packages/meta/oh-image-extras.bb
create mode 100644 meta-extras/packages/meta/task-oh-extras.bb
create mode 100644 meta-extras/packages/python/python-2.4.3-manifest.inc
create mode 100644 meta-extras/packages/python/python-2.4.3/autohell.patch
create mode 100644 meta-extras/packages/python/python-2.4.3/bindir-libdir.patch
create mode 100644 meta-extras/packages/python/python-2.4.3/crosscompile.patch
create mode 100644 meta-extras/packages/python/python-2.4.3/fix-tkinter-detection.patch
create mode 100644 meta-extras/packages/python/python-2.4.3/sitebranding.patch
create mode 100644 meta-extras/packages/python/python-native-2.4.0/bindir-libdir.patch
create mode 100644 meta-extras/packages/python/python-native-2.4.0/cross-distutils.patch
create mode 100644 meta-extras/packages/python/python-native_2.4.0.bb
create mode 100644 meta-extras/packages/python/python-pygtk2/acinclude.m4
create mode 100644 meta-extras/packages/python/python-pygtk2_2.8.6.bb
create mode 100644 meta-extras/packages/python/python_2.4.3.bb
(limited to 'meta-extras')
diff --git a/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb b/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
new file mode 100644
index 000000000..e47c00e76
--- /dev/null
+++ b/meta-extras/packages/libid3tag/libid3tag_0.15.0b.bb
@@ -0,0 +1,19 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "zlib"
+DESCRIPTION = "Library for interacting with ID3 tags."
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz "
+S = "${WORKDIR}/libid3tag-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "-enable-speed"
+
+do_stage() {
+ oe_libinstall -so libid3tag ${STAGING_LIBDIR}
+ install -m 0644 id3tag.h ${STAGING_INCDIR}
+}
diff --git a/meta-extras/packages/libmad/libmad_0.15.0b.bb b/meta-extras/packages/libmad/libmad_0.15.0b.bb
new file mode 100644
index 000000000..b3614db05
--- /dev/null
+++ b/meta-extras/packages/libmad/libmad_0.15.0b.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "MPEG Audio Decoder Library"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "libid3tag"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz"
+S = "${WORKDIR}/libmad-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "-enable-speed --enable-shared"
+# The ASO's don't take any account of thumb...
+EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
+
+do_configure_prepend () {
+# damn picky automake...
+ touch NEWS AUTHORS ChangeLog
+}
+
+do_stage() {
+ oe_libinstall -so libmad ${STAGING_LIBDIR}
+ install -m 0644 mad.h ${STAGING_INCDIR}
+}
diff --git a/meta-extras/packages/madplay/madplay_0.15.2b.bb b/meta-extras/packages/madplay/madplay_0.15.2b.bb
new file mode 100644
index 000000000..ba2d184a2
--- /dev/null
+++ b/meta-extras/packages/madplay/madplay_0.15.2b.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player"
+MAINTAINER = "Maciej Swiniarski <luzik@gda.pl>"
+SECTION = "console/multimedia"
+DEPENDS = "libmad"
+LICENSE = "GPL"
+AUTHOR = "Robert Leslie <rob@mars.org>"
+HOMEPAGE = "http://www.mars.org/home/rob/proj/mpeg/"
+
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+FILES_${PN} = "${bindir}/madplay"
diff --git a/meta-extras/packages/mc/mc_4.6.0.bb b/meta-extras/packages/mc/mc_4.6.0.bb
new file mode 100644
index 000000000..6636c6747
--- /dev/null
+++ b/meta-extras/packages/mc/mc_4.6.0.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "GNU Midnight Commander is a file \
+manager for free operating systems."
+HOMEPAGE = "http://www.ibiblio.org/mc/"
+LICENSE = "GPLv2"
+SECTION = "console/utils"
+PRIORITY = "optional"
+DEPENDS = "ncurses glib-2.0"
+RDEPENDS = "ncurses-terminfo"
+
+SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \
+--without-nfs --without-gpm-mouse"
+
+do_configure() {
+ gnu-configize
+ oe_runconf
+}
+
+do_install() {
+ cd src
+ oe_runmake 'DESTDIR=${D}' install
+ cd ../syntax
+ oe_runmake 'DESTDIR=${D}' install
+ cd ../po
+ oe_runmake 'DESTDIR=${D}' install
+ cd ../vfs
+ oe_runmake 'DESTDIR=${D}' install
+ cd ..
+}
diff --git a/meta-extras/packages/meta/oh-image-extras.bb b/meta-extras/packages/meta/oh-image-extras.bb
new file mode 100644
index 000000000..0b2ac430e
--- /dev/null
+++ b/meta-extras/packages/meta/oh-image-extras.bb
@@ -0,0 +1,27 @@
+PR = "r9"
+
+export IMAGE_BASENAME = "oh-extras"
+
+GUI_MACHINE_CLASS ?= "none"
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+DEPENDS = "\
+ task-oh \
+ task-oh-extras"
+
+RDEPENDS = "\
+ task-oh-boot \
+ task-oh-boot-extras \
+ task-oh-base \
+ task-oh-standard \
+ task-oh-testapps \
+ task-oh-devtools \
+ task-oh-extraapps \
+ ${XSERVER} "
+
+export IPKG_INSTALL = "${RDEPENDS}"
+#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+
+inherit image_ipk
+LICENSE = MIT
diff --git a/meta-extras/packages/meta/task-oh-extras.bb b/meta-extras/packages/meta/task-oh-extras.bb
new file mode 100644
index 000000000..6c5b9a974
--- /dev/null
+++ b/meta-extras/packages/meta/task-oh-extras.bb
@@ -0,0 +1,10 @@
+PACKAGES = "task-oh-extraapps"
+DESCRIPTION = "Extras Tasks for OpenedHand Poky"
+MAINTAINER = "Richard Purdie <richard@openedhand.com>"
+PR = "r0"
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-oh-extraapps = "\
+ madplay \
+ mc"
diff --git a/meta-extras/packages/python/python-2.4.3-manifest.inc b/meta-extras/packages/python/python-2.4.3-manifest.inc
new file mode 100644
index 000000000..0178d4e18
--- /dev/null
+++ b/meta-extras/packages/python/python-2.4.3-manifest.inc
@@ -0,0 +1,259 @@
+########################################################################################################################
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Mar 30 17:39:30 2006
+###
+### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
+###
+### Warning: Manual edits will be lost!
+###
+########################################################################################################################
+
+
+PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+
+DESCRIPTION_python-threading="Python Threading & Synchronization Support"
+PR_python-threading="ml0"
+RDEPENDS_python-threading="python-core python-lang"
+FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
+
+DESCRIPTION_python-distutils="Python Distribution Utilities"
+PR_python-distutils="ml0"
+RDEPENDS_python-distutils="python-core"
+FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/distutils "
+
+DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
+PR_python-textutils="ml0"
+RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
+FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* "
+
+DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
+PR_python-codecs="ml0"
+RDEPENDS_python-codecs="python-core"
+FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* "
+
+DESCRIPTION_python-pickle="Python Persistence Support"
+PR_python-pickle="ml0"
+RDEPENDS_python-pickle="python-core python-codecs python-re"
+FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so "
+
+DESCRIPTION_python-datetime="Python Calendar and Time support"
+PR_python-datetime="ml0"
+RDEPENDS_python-datetime="python-core python-codecs"
+FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so "
+
+DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
+PR_python-core="ml0"
+RDEPENDS_python-core=""
+FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+
+DESCRIPTION_python-io="Python Low-Level I/O"
+PR_python-io="ml0"
+RDEPENDS_python-io="python-core python-math"
+FILES_python-io="${libdir}/python2.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/_ssl.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* "
+
+DESCRIPTION_python-compiler="Python Compiler Support"
+PR_python-compiler="ml0"
+RDEPENDS_python-compiler="python-core"
+FILES_python-compiler="${libdir}/python2.4/compiler "
+
+DESCRIPTION_python-compression="Python High Level Compression Support"
+PR_python-compression="ml0"
+RDEPENDS_python-compression="python-core python-zlib"
+FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* "
+
+DESCRIPTION_python-re="Python Regular Expression APIs"
+PR_python-re="ml0"
+RDEPENDS_python-re="python-core"
+FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* "
+
+DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
+PR_python-xmlrpc="ml0"
+RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
+FILES_python-xmlrpc="${libdir}/python2.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* "
+
+DESCRIPTION_python-terminal="Python Terminal Controlling Support"
+PR_python-terminal="ml0"
+RDEPENDS_python-terminal="python-core python-io"
+FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* "
+
+DESCRIPTION_python-email="Python Email Support"
+PR_python-email="ml0"
+RDEPENDS_python-email="python-core python-io python-re"
+FILES_python-email="${libdir}/python2.4/email "
+
+DESCRIPTION_python-image="Python Graphical Image Handling"
+PR_python-image="ml0"
+RDEPENDS_python-image="python-core"
+FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so "
+
+DESCRIPTION_python-resource="Python Resource Control Interface"
+PR_python-resource="ml0"
+RDEPENDS_python-resource="python-core"
+FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so "
+
+DESCRIPTION_python-devel="Python Development Package"
+PR_python-devel="ml0"
+RDEPENDS_python-devel="python-core"
+FILES_python-devel="/usr/include /usr/lib/python2.4/config "
+
+DESCRIPTION_python-math="Python Math Support"
+PR_python-math="ml0"
+RDEPENDS_python-math="python-core"
+FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* ${libdir}/python2.4/sets.* "
+
+DESCRIPTION_python-hotshot="Python Hotshot Profiler"
+PR_python-hotshot="ml0"
+RDEPENDS_python-hotshot="python-core"
+FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/lib-dynload/_hotshot.so "
+
+DESCRIPTION_python-unixadmin="Python Unix Administration Support"
+PR_python-unixadmin="ml0"
+RDEPENDS_python-unixadmin="python-core"
+FILES_python-unixadmin="${libdir}/python2.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* "
+
+DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
+PR_python-tkinter="ml0"
+RDEPENDS_python-tkinter="python-core"
+FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/python2.4/lib-tk "
+
+DESCRIPTION_python-gdbm="Python GNU Database Support"
+PR_python-gdbm="ml0"
+RDEPENDS_python-gdbm="python-core libgdbm3"
+FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so "
+
+DESCRIPTION_python-fcntl="Python's fcntl Interface"
+PR_python-fcntl="ml0"
+RDEPENDS_python-fcntl="python-core"
+FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
+
+DESCRIPTION_python-netclient="Python Internet Protocol Clients"
+PR_python-netclient="ml0"
+RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
+FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
+
+DESCRIPTION_python-pprint="Python Pretty-Print Support"
+PR_python-pprint="ml0"
+RDEPENDS_python-pprint="python-core"
+FILES_python-pprint="${libdir}/python2.4/pprint.* "
+
+DESCRIPTION_python-netserver="Python Internet Protocol Servers"
+PR_python-netserver="ml0"
+RDEPENDS_python-netserver="python-core python-netclient"
+FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* "
+
+DESCRIPTION_python-curses="Python Curses Support"
+PR_python-curses="ml0"
+RDEPENDS_python-curses="python-core libncurses5"
+FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
+
+DESCRIPTION_python-syslog="Python's syslog Interface"
+PR_python-syslog="ml0"
+RDEPENDS_python-syslog="python-core"
+FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so "
+
+DESCRIPTION_python-html="Python HTML Processing"
+PR_python-html="ml0"
+RDEPENDS_python-html="python-core"
+FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* "
+
+DESCRIPTION_python-readline="Python Readline Support"
+PR_python-readline="ml0"
+RDEPENDS_python-readline="python-core libreadline4"
+FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* "
+
+DESCRIPTION_python-pydoc="Python Interactive Help Support"
+PR_python-pydoc="ml0"
+RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
+FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* "
+
+DESCRIPTION_python-logging="Python Logging Support"
+PR_python-logging="ml0"
+RDEPENDS_python-logging="python-core"
+FILES_python-logging="${libdir}/python2.4/logging "
+
+DESCRIPTION_python-mailbox="Python Mailbox Format Support"
+PR_python-mailbox="ml0"
+RDEPENDS_python-mailbox="python-core python-mime"
+FILES_python-mailbox="${libdir}/python2.4/mailbox.* "
+
+DESCRIPTION_python-xml="Python basic XML support."
+PR_python-xml="ml0"
+RDEPENDS_python-xml="python-core python-re"
+FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* "
+
+DESCRIPTION_python-mime="Python MIME Handling APIs"
+PR_python-mime="ml0"
+RDEPENDS_python-mime="python-core python-io"
+FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/quopri.* ${libdir}/python2.4/rfc822.* "
+
+DESCRIPTION_python-tests="Python Tests"
+PR_python-tests="ml0"
+RDEPENDS_python-tests="python-core"
+FILES_python-tests="${libdir}/python2.4/test "
+
+DESCRIPTION_python-unittest="Python Unit Testing Framework"
+PR_python-unittest="ml0"
+RDEPENDS_python-unittest="python-core python-stringold python-lang"
+FILES_python-unittest="${libdir}/python2.4/unittest.* "
+
+DESCRIPTION_python-stringold="Python Deprecated String APIs"
+PR_python-stringold="ml0"
+RDEPENDS_python-stringold="python-core python-re"
+FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* "
+
+DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries"
+PR_python-lib-old-and-deprecated="ml0"
+RDEPENDS_python-lib-old-and-deprecated="python-core"
+FILES_python-lib-old-and-deprecated="${libdir}/python2.4/lib-old "
+
+DESCRIPTION_python-compile="Python Bytecode Compilation Support"
+PR_python-compile="ml0"
+RDEPENDS_python-compile="python-core"
+FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* "
+
+DESCRIPTION_python-shell="Python Shell-Like Functionality"
+PR_python-shell="ml0"
+RDEPENDS_python-shell="python-core python-re"
+FILES_python-shell="${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* "
+
+DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
+PR_python-bsddb="ml0"
+RDEPENDS_python-bsddb="python-core"
+FILES_python-bsddb="${libdir}/python2.4/bsddb "
+
+DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
+PR_python-mmap="ml0"
+RDEPENDS_python-mmap="python-core python-io"
+FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so "
+
+DESCRIPTION_python-zlib="Python zlib Support."
+PR_python-zlib="ml0"
+RDEPENDS_python-zlib="python-core libz1"
+FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so "
+
+DESCRIPTION_python-db="Python File-Based Database Support"
+PR_python-db="ml0"
+RDEPENDS_python-db="python-core"
+FILES_python-db="${libdir}/python2.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* "
+
+DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
+PR_python-crypt="ml0"
+RDEPENDS_python-crypt="python-core"
+FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so "
+
+DESCRIPTION_python-idle="Python Integrated Development Environment"
+PR_python-idle="ml0"
+RDEPENDS_python-idle="python-core python-tkinter"
+FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib "
+
+DESCRIPTION_python-lang="Python Low-Level Language Support"
+PR_python-lang="ml0"
+RDEPENDS_python-lang="python-core"
+FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
+
+DESCRIPTION_python-audio="Python Audio Handling"
+PR_python-audio="ml0"
+RDEPENDS_python-audio="python-core"
+FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so "
+
+
+
diff --git a/meta-extras/packages/python/python-2.4.3/autohell.patch b/meta-extras/packages/python/python-2.4.3/autohell.patch
new file mode 100644
index 000000000..b0eebb9ce
--- /dev/null
+++ b/meta-extras/packages/python/python-2.4.3/autohell.patch
@@ -0,0 +1,1209 @@
+--- Python-2.3.3/acinclude.m4 1969-12-31 19:00:00.000000000 -0500
++++ Python-2.3.3/acinclude.m4 2004-02-17 12:22:29.000000000 -0500
+@@ -0,0 +1,10 @@
++dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore
++dnl If this macro is not defined by Autoconf, define it here.
++
++m4_ifdef([AC_PROG_CXX_WORKS],
++ [],
++ [m4_define([AC_PROG_CXX_WORKS],
++ [AC_LANG_PUSH(C++)dnl
++ _AC_COMPILER_EXEEXT
++ AC_LANG_POP()]
++ )])
+--- Python-2.3.3/configure.in 2003-11-18 14:59:39.000000000 -0500
++++ Python-2.3.3/configure.in 2004-02-17 12:22:27.000000000 -0500
+@@ -4,8 +4,8 @@
+ m4_define(PYTHON_VERSION, 2.3)
+
+ AC_REVISION($Revision: 1.427.4.10 $)
+-AC_PREREQ(2.53)
+-AC_INIT(python, PYTHON_VERSION)
++AC_PREREQ(2.59)
++AC_INIT([python],[PYTHON_VERSION])
+ AC_CONFIG_SRCDIR([Include/object.h])
+ AC_CONFIG_HEADER(pyconfig.h)
+
+@@ -58,7 +58,7 @@
+
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_ENABLE(framework,
+- AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework),
++ AS_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@,Build (MacOSX|Darwin) framework),
+ [
+ case $enableval in
+ yes)
+@@ -92,8 +92,7 @@
+ AC_SUBST(PYTHONFRAMEWORKINSTALLDIR)
+
+ ##AC_ARG_WITH(dyld,
+-## AC_HELP_STRING(--with-dyld,
+-## Use (OpenStep|Rhapsody) dynamic linker))
++## AS_HELP_STRING(--with-dyld,## Use (OpenStep|Rhapsody) dynamic linker))
+ ##
+ # Set name for machine-dependent library files
+ AC_SUBST(MACHDEP)
+@@ -227,7 +226,7 @@
+ # on that fiddles with OPT and BASECFLAGS?
+ AC_MSG_CHECKING(for --without-gcc)
+ AC_ARG_WITH(gcc,
+- AC_HELP_STRING(--without-gcc,never use gcc),
++ AS_HELP_STRING(--without-gcc,never use gcc),
+ [
+ case $withval in
+ no) CC=cc
+@@ -273,7 +272,7 @@
+ MAINOBJ=python.o
+ AC_MSG_CHECKING(for --with-cxx=<compiler>)
+ AC_ARG_WITH(cxx,
+- AC_HELP_STRING(--with-cxx=<compiler>, enable C++ support),
++ AS_HELP_STRING(--with-cxx=<compiler>,enable C++ support),
+ [
+ check_cxx=no
+ case $withval in
+@@ -298,15 +297,6 @@
+ dnl --without-cxx was given.
+ dnl Finally, it does not test whether CXX is g++.
+
+-dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore
+-ifdef([AC_PROG_CXX_WORKS],[],
+- [AC_DEFUN([AC_PROG_CXX_WORKS],
+- [AC_LANG_PUSH(C++)dnl
+- _AC_COMPILER_EXEEXT
+- AC_LANG_POP()
+- ]
+-)])
+-
+ if test "$check_cxx" = "yes"
+ then
+ AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound)
+@@ -348,7 +338,7 @@
+ AC_EXEEXT
+ AC_MSG_CHECKING(for --with-suffix)
+ AC_ARG_WITH(suffix,
+- AC_HELP_STRING(--with-suffix=.exe, set executable suffix),
++ AS_HELP_STRING(--with-suffix=.exe,set executable suffix),
+ [
+ case $withval in
+ no) EXEEXT=;;
+@@ -474,7 +464,7 @@
+
+ AC_MSG_CHECKING(for --enable-shared)
+ AC_ARG_ENABLE(shared,
+- AC_HELP_STRING(--enable-shared, disable/enable building shared python library))
++ AS_HELP_STRING(--enable-shared,disable/enable building shared python library))
+
+ if test -z "$enable_shared"
+ then
+@@ -583,7 +573,7 @@
+ # Check for --with-pydebug
+ AC_MSG_CHECKING(for --with-pydebug)
+ AC_ARG_WITH(pydebug,
+- AC_HELP_STRING(--with-pydebug, build with Py_DEBUG defined),
++ AS_HELP_STRING(--with-pydebug,build with Py_DEBUG defined),
+ [
+ if test "$withval" != no
+ then
+@@ -660,10 +650,7 @@
+ AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing)
+ ac_save_cc="$CC"
+ CC="$CC -fno-strict-aliasing"
+- AC_TRY_RUN([int main() { return 0; }],
+- ac_cv_no_strict_aliasing_ok=yes,
+- ac_cv_no_strict_aliasing_ok=no,
+- ac_cv_no_strict_aliasing_ok=no)
++ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_no_strict_aliasing_ok=yes],[ac_cv_no_strict_aliasing_ok=no],[ac_cv_no_strict_aliasing_ok=no])
+ CC="$ac_save_cc"
+ AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok)
+ if test $ac_cv_no_strict_aliasing_ok = yes
+@@ -711,10 +698,7 @@
+ AC_CACHE_VAL(ac_cv_opt_olimit_ok,
+ [ac_save_cc="$CC"
+ CC="$CC -OPT:Olimit=0"
+-AC_TRY_RUN([int main() { return 0; }],
+- ac_cv_opt_olimit_ok=yes,
+- ac_cv_opt_olimit_ok=no,
+- ac_cv_opt_olimit_ok=no)
++AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_opt_olimit_ok=yes],[ac_cv_opt_olimit_ok=no],[ac_cv_opt_olimit_ok=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_opt_olimit_ok)
+ if test $ac_cv_opt_olimit_ok = yes; then
+@@ -733,10 +717,7 @@
+ AC_CACHE_VAL(ac_cv_olimit_ok,
+ [ac_save_cc="$CC"
+ CC="$CC -Olimit 1500"
+- AC_TRY_RUN([int main() { return 0; }],
+- ac_cv_olimit_ok=yes,
+- ac_cv_olimit_ok=no,
+- ac_cv_olimit_ok=no)
++ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_olimit_ok=yes],[ac_cv_olimit_ok=no],[ac_cv_olimit_ok=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_olimit_ok)
+ if test $ac_cv_olimit_ok = yes; then
+@@ -751,7 +732,7 @@
+ # options before we can check whether -Kpthread improves anything.
+ AC_MSG_CHECKING(whether pthreads are available without options)
+ AC_CACHE_VAL(ac_cv_pthread_is_default,
+-[AC_TRY_RUN([
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+
+ void* routine(void* p){return NULL;}
+@@ -763,14 +744,11 @@
+ (void)pthread_detach(p);
+ return 0;
+ }
+-],
+-[
++]])],[
+ ac_cv_pthread_is_default=yes
+ ac_cv_kthread=no
+ ac_cv_pthread=no
+-],
+- ac_cv_pthread_is_default=no,
+- ac_cv_pthread_is_default=no)
++],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no])
+ ])
+ AC_MSG_RESULT($ac_cv_pthread_is_default)
+
+@@ -788,7 +766,7 @@
+ AC_CACHE_VAL(ac_cv_kpthread,
+ [ac_save_cc="$CC"
+ CC="$CC -Kpthread"
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+
+ void* routine(void* p){return NULL;}
+@@ -800,10 +778,7 @@
+ (void)pthread_detach(p);
+ return 0;
+ }
+-],
+- ac_cv_kpthread=yes,
+- ac_cv_kpthread=no,
+- ac_cv_kpthread=no)
++]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_kpthread)
+ fi
+@@ -819,7 +794,7 @@
+ AC_CACHE_VAL(ac_cv_kthread,
+ [ac_save_cc="$CC"
+ CC="$CC -Kthread"
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+
+ void* routine(void* p){return NULL;}
+@@ -831,10 +806,7 @@
+ (void)pthread_detach(p);
+ return 0;
+ }
+-],
+- ac_cv_kthread=yes,
+- ac_cv_kthread=no,
+- ac_cv_kthread=no)
++]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_kthread)
+ fi
+@@ -850,7 +822,7 @@
+ AC_CACHE_VAL(ac_cv_thread,
+ [ac_save_cc="$CC"
+ CC="$CC -pthread"
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <pthread.h>
+
+ void* routine(void* p){return NULL;}
+@@ -862,10 +834,7 @@
+ (void)pthread_detach(p);
+ return 0;
+ }
+-],
+- ac_cv_pthread=yes,
+- ac_cv_pthread=no,
+- ac_cv_pthread=no)
++]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no])
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_pthread)
+ fi
+@@ -911,11 +880,11 @@
+
+ dnl # check for ANSI or K&R ("traditional") preprocessor
+ dnl AC_MSG_CHECKING(for C preprocessor type)
+-dnl AC_TRY_COMPILE([
++dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ dnl #define spam(name, doc) {#name, &name, #name "() -- " doc}
+ dnl int foo;
+ dnl struct {char *name; int *addr; char *doc;} desc = spam(foo, "something");
+-dnl ], [;], cpp_type=ansi, AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional)
++dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional])
+ dnl AC_MSG_RESULT($cpp_type)
+
+ # checks for header files
+@@ -941,19 +910,13 @@
+
+ # Check whether using makedev requires defining _OSF_SOURCE
+ AC_MSG_CHECKING(for makedev)
+-AC_TRY_LINK([#include <sys/types.h> ],
+- [ makedev(0, 0) ],
+- ac_cv_has_makedev=yes,
+- ac_cv_has_makedev=no)
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
+ if test "$ac_cv_has_makedev" = "no"; then
+ # we didn't link, try if _OSF_SOURCE will allow us to link
+- AC_TRY_LINK([
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #define _OSF_SOURCE 1
+ #include <sys/types.h>
+- ],
+- [ makedev(0, 0) ],
+- ac_cv_has_makedev=yes,
+- ac_cv_has_makedev=no)
++ ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no])
+ if test "$ac_cv_has_makedev" = "yes"; then
+ AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.])
+ fi
+@@ -972,11 +935,11 @@
+
+ use_lfs=yes
+ AC_MSG_CHECKING(Solaris LFS bug)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #define _LARGEFILE_SOURCE 1
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/resource.h>
+-],struct rlimit foo;,sol_lfs_bug=no,sol_lfs_bug=yes)
++]], [[struct rlimit foo;]])],[sol_lfs_bug=no],[sol_lfs_bug=yes])
+ AC_MSG_RESULT($sol_lfs_bug)
+ if test "$sol_lfs_bug" = "yes"; then
+ use_lfs=no
+@@ -1018,10 +981,10 @@
+
+ AC_MSG_CHECKING(for long long support)
+ have_long_long=no
+-AC_TRY_COMPILE([], [long long x; x = (long long)0;], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[
+ AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.])
+ have_long_long=yes
+-])
++],[])
+ AC_MSG_RESULT($have_long_long)
+ if test "$have_long_long" = yes ; then
+ AC_CHECK_SIZEOF(long long, 8)
+@@ -1029,10 +992,10 @@
+
+ AC_MSG_CHECKING(for uintptr_t support)
+ have_uintptr_t=no
+-AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[uintptr_t x; x = (uintptr_t)0;]])],[
+ AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.])
+ have_uintptr_t=yes
+-])
++],[])
+ AC_MSG_RESULT($have_uintptr_t)
+ if test "$have_uintptr_t" = yes ; then
+ AC_CHECK_SIZEOF(uintptr_t, 4)
+@@ -1041,7 +1004,7 @@
+ # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
+ AC_MSG_CHECKING(size of off_t)
+ AC_CACHE_VAL(ac_cv_sizeof_off_t,
+-[AC_TRY_RUN([#include <stdio.h>
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+ #include <sys/types.h>
+ main()
+ {
+@@ -1049,10 +1012,7 @@
+ if (!f) exit(1);
+ fprintf(f, "%d\n", sizeof(off_t));
+ exit(0);
+-}],
+-ac_cv_sizeof_off_t=`cat conftestval`,
+-ac_cv_sizeof_off_t=0,
+-ac_cv_sizeof_off_t=4)
++}]])],[ac_cv_sizeof_off_t=`cat conftestval`],[ac_cv_sizeof_off_t=0],[ac_cv_sizeof_off_t=4])
+ ])
+ AC_MSG_RESULT($ac_cv_sizeof_off_t)
+ AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
+@@ -1075,7 +1035,7 @@
+ # AC_CHECK_SIZEOF() doesn't include <time.h>.
+ AC_MSG_CHECKING(size of time_t)
+ AC_CACHE_VAL(ac_cv_sizeof_time_t,
+-[AC_TRY_RUN([#include <stdio.h>
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+ #include <time.h>
+ main()
+ {
+@@ -1083,10 +1043,7 @@
+ if (!f) exit(1);
+ fprintf(f, "%d\n", sizeof(time_t));
+ exit(0);
+-}],
+-ac_cv_sizeof_time_t=`cat conftestval`,
+-ac_cv_sizeof_time_t=0,
+-ac_cv_sizeof_time_t=4)
++}]])],[ac_cv_sizeof_time_t=`cat conftestval`],[ac_cv_sizeof_time_t=0],[ac_cv_sizeof_time_t=4])
+ ])
+ AC_MSG_RESULT($ac_cv_sizeof_time_t)
+ AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
+@@ -1104,13 +1061,13 @@
+ fi
+ AC_MSG_CHECKING(for pthread_t)
+ have_pthread_t=no
+-AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])],[have_pthread_t=yes],[])
+ AC_MSG_RESULT($have_pthread_t)
+ if test "$have_pthread_t" = yes ; then
+ # AC_CHECK_SIZEOF() doesn't include <pthread.h>.
+ AC_MSG_CHECKING(size of pthread_t)
+ AC_CACHE_VAL(ac_cv_sizeof_pthread_t,
+- [AC_TRY_RUN([#include <stdio.h>
++ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+ #include <pthread.h>
+ main()
+ {
+@@ -1118,10 +1075,7 @@
+ if (!f) exit(1);
+ fprintf(f, "%d\n", sizeof(pthread_t));
+ exit(0);
+- }],
+- ac_cv_sizeof_pthread_t=`cat conftestval`,
+- ac_cv_sizeof_pthread_t=0,
+- ac_cv_sizeof_pthread_t=4)
++ }]])],[ac_cv_sizeof_pthread_t=`cat conftestval`],[ac_cv_sizeof_pthread_t=0],[ac_cv_sizeof_pthread_t=4])
+ ])
+ AC_MSG_RESULT($ac_cv_sizeof_pthread_t)
+ AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t,
+@@ -1131,7 +1085,7 @@
+
+ AC_MSG_CHECKING(for --enable-toolbox-glue)
+ AC_ARG_ENABLE(toolbox-glue,
+- AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions))
++ AS_HELP_STRING(--enable-toolbox-glue,disable/enable MacOSX glue code for extensions))
+
+ if test -z "$enable_toolbox_glue"
+ then
+@@ -1436,13 +1390,10 @@
+ # checks for system dependent C++ extensions support
+ case "$ac_sys_system" in
+ AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support)
+- AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"],
+- [loadAndInit("", 0, "")],
+- [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "/usr/lpp/xlC/include/load.h"]], [[loadAndInit("", 0, "")]])],[AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1,
+ [Define for AIX if your compiler is a genuine IBM xlC/xlC_r
+ and you want support for AIX C++ shared extension modules.])
+- AC_MSG_RESULT(yes)],
+- [AC_MSG_RESULT(no)]);;
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);;
+ *) ;;
+ esac
+
+@@ -1464,7 +1415,7 @@
+
+ AC_MSG_CHECKING(for --with-libs)
+ AC_ARG_WITH(libs,
+- AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs),
++ AS_HELP_STRING(--with-libs='lib1 ...',link against additional libs),
+ [
+ AC_MSG_RESULT($withval)
+ LIBS="$withval $LIBS"
+@@ -1476,7 +1427,7 @@
+ AC_SUBST(SIGNAL_OBJS)
+ AC_MSG_CHECKING(for --with-signal-module)
+ AC_ARG_WITH(signal-module,
+- AC_HELP_STRING(--with-signal-module, disable/enable signal module))
++ AS_HELP_STRING(--with-signal-module,disable/enable signal module))
+
+ if test -z "$with_signal_module"
+ then with_signal_module="yes"
+@@ -1498,7 +1449,7 @@
+ AC_MSG_CHECKING(for --with-dec-threads)
+ AC_SUBST(LDLAST)
+ AC_ARG_WITH(dec-threads,
+- AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries),
++ AS_HELP_STRING(--with-dec-threads,use DEC Alpha/OSF1 thread-safe libraries),
+ [
+ AC_MSG_RESULT($withval)
+ LDLAST=-threads
+@@ -1518,12 +1469,12 @@
+ AC_MSG_CHECKING(for --with-threads)
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_WITH(threads,
+- AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support))
++ AS_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@,disable/enable thread support))
+
+ # --with-thread is deprecated, but check for it anyway
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_WITH(thread,
+- AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads),
++ AS_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@,deprecated; use --with(out)-threads),
+ [with_threads=$with_thread])
+
+ if test -z "$with_threads"
+@@ -1603,7 +1554,7 @@
+ THREADOBJ="Python/thread.o"],[
+ AC_MSG_CHECKING(for --with-pth)
+ AC_ARG_WITH([pth],
+- AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
++ AS_HELP_STRING(--with-pth,use GNU pth threading libraries),
+ [AC_MSG_RESULT($withval)
+ AC_DEFINE([WITH_THREAD])
+ AC_DEFINE([HAVE_PTH], 1,
+@@ -1618,10 +1569,10 @@
+ _libs=$LIBS
+ LIBS="$LIBS -lpthread"
+ AC_MSG_CHECKING([for pthread_create in -lpthread])
+- AC_TRY_LINK([#include <pthread.h>
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
+
+-void * start_routine (void *arg) { exit (0); }], [
+-pthread_create (NULL, NULL, start_routine, NULL)], [
++void * start_routine (void *arg) { exit (0); }]], [[
++pthread_create (NULL, NULL, start_routine, NULL)]])],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(WITH_THREAD)
+ posix_threads=yes
+@@ -1705,7 +1656,7 @@
+
+ AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)
+ AC_CACHE_VAL(ac_cv_pthread_system_supported,
+- [AC_TRY_RUN([#include <pthread.h>
++ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h>
+ void *foo(void *parm) {
+ return NULL;
+ }
+@@ -1716,10 +1667,7 @@
+ if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);
+ if (pthread_create(&id, &attr, foo, NULL)) exit(-1);
+ exit(0);
+- }],
+- ac_cv_pthread_system_supported=yes,
+- ac_cv_pthread_system_supported=no,
+- ac_cv_pthread_system_supported=no)
++ }]])],[ac_cv_pthread_system_supported=yes],[ac_cv_pthread_system_supported=no],[ac_cv_pthread_system_supported=no])
+ ])
+ AC_MSG_RESULT($ac_cv_pthread_system_supported)
+ if test "$ac_cv_pthread_system_supported" = "yes"; then
+@@ -1754,7 +1702,7 @@
+
+ [
+ dnl the check does not work on cross compilation case...
+- AC_TRY_RUN([ /* AF_INET6 available check */
++ AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ main()
+@@ -1764,25 +1712,19 @@
+ else
+ exit(0);
+ }
+-],
+- AC_MSG_RESULT(yes)
+- ipv6=yes,
+- AC_MSG_RESULT(no)
+- ipv6=no,
+- AC_MSG_RESULT(no)
++]])],[AC_MSG_RESULT(yes)
++ ipv6=yes],[AC_MSG_RESULT(no)
++ ipv6=no],[AC_MSG_RESULT(no)
+ ipv6=no
+-)
++])
+
+ if test "$ipv6" = "yes"; then
+ AC_MSG_CHECKING(if RFC2553 API is available)
+- AC_TRY_COMPILE([#include <sys/types.h>
+-#include <netinet/in.h>],
+- [struct sockaddr_in6 x;
+-x.sin6_scope_id;],
+- AC_MSG_RESULT(yes)
+- ipv6=yes,
+- AC_MSG_RESULT(no, IPv6 disabled)
+- ipv6=no)
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
++#include <netinet/in.h>]], [[struct sockaddr_in6 x;
++x.sin6_scope_id;]])],[AC_MSG_RESULT(yes)
++ ipv6=yes],[AC_MSG_RESULT(no, IPv6 disabled)
++ ipv6=no])
+ fi
+
+ if test "$ipv6" = "yes"; then
+@@ -1905,7 +1847,7 @@
+ # Check for universal newline support
+ AC_MSG_CHECKING(for --with-universal-newlines)
+ AC_ARG_WITH(universal-newlines,
+- AC_HELP_STRING(--with(out)-universal-newlines, disable/enable foreign newlines))
++ AS_HELP_STRING(--with(out)-universal-newlines,disable/enable foreign newlines))
+
+ if test -z "$with_universal_newlines"
+ then with_universal_newlines="yes"
+@@ -1923,7 +1865,7 @@
+ # Check for --with-doc-strings
+ AC_MSG_CHECKING(for --with-doc-strings)
+ AC_ARG_WITH(doc-strings,
+- AC_HELP_STRING(--with(out)-doc-strings, disable/enable documentation strings))
++ AS_HELP_STRING(--with(out)-doc-strings,disable/enable documentation strings))
+
+ if test -z "$with_doc_strings"
+ then with_doc_strings="yes"
+@@ -1938,7 +1880,7 @@
+ # Check for Python-specific malloc support
+ AC_MSG_CHECKING(for --with-pymalloc)
+ AC_ARG_WITH(pymalloc,
+- AC_HELP_STRING(--with(out)-pymalloc, disable/enable specialized mallocs))
++ AS_HELP_STRING(--with(out)-pymalloc,disable/enable specialized mallocs))
+
+ if test -z "$with_pymalloc"
+ then with_pymalloc="yes"
+@@ -1953,7 +1895,7 @@
+ # Check for --with-wctype-functions
+ AC_MSG_CHECKING(for --with-wctype-functions)
+ AC_ARG_WITH(wctype-functions,
+- AC_HELP_STRING(--with-wctype-functions, use wctype.h functions),
++ AS_HELP_STRING(--with-wctype-functions,use wctype.h functions),
+ [
+ if test "$withval" != no
+ then
+@@ -1971,7 +1913,7 @@
+
+ AC_MSG_CHECKING(for --with-sgi-dl)
+ AC_ARG_WITH(sgi-dl,
+- AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking),
++ AS_HELP_STRING(--with-sgi-dl=DIRECTORY,IRIX 4 dynamic linking),
+ [
+ AC_MSG_RESULT($withval)
+ echo --with-sgi-dl is unsupported, see README
+@@ -1993,7 +1935,7 @@
+
+ AC_MSG_CHECKING(for --with-dl-dld)
+ AC_ARG_WITH(dl-dld,
+- AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking),
++ AS_HELP_STRING(--with-dl-dld=DL_DIR,GNU dynamic linking),
+ [
+ AC_MSG_RESULT($withval)
+ echo --with-dl-dld is unsupported, see README
+@@ -2085,41 +2027,29 @@
+ # For some functions, having a definition is not sufficient, since
+ # we want to take their address.
+ AC_MSG_CHECKING(for chroot)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=chroot,
+- AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=chroot]])],[AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for link)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=link,
+- AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=link]])],[AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for symlink)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=symlink,
+- AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=symlink]])],[AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for fchdir)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=fchdir,
+- AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fchdir]])],[AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for fsync)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=fsync,
+- AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fsync]])],[AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+ AC_MSG_CHECKING(for fdatasync)
+-AC_TRY_COMPILE([#include <unistd.h>], void *x=fdatasync,
+- AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fdatasync]])],[AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ # On some systems (eg. FreeBSD 5), we would find a definition of the
+ # functions ctermid_r, setgroups in the library, but no prototype
+@@ -2128,34 +2058,28 @@
+ # because of the missing prototypes.
+
+ AC_MSG_CHECKING(for ctermid_r)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h"
+ #include <stdio.h>
+-], void* p = ctermid_r,
+- AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++]], [[void* p = ctermid_r]])],[AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ AC_MSG_CHECKING(for flock)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h"
+ #include <sys/file.h>
+-], void* p = flock,
+- AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++]], [[void* p = flock]])],[AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ AC_MSG_CHECKING(for getpagesize)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h"
+ #include <unistd.h>
+-], void* p = getpagesize,
+- AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++]], [[void* p = getpagesize]])],[AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ dnl check for true
+ AC_CHECK_PROGS(TRUE, true, /bin/true)
+@@ -2167,54 +2091,45 @@
+ )
+
+ AC_MSG_CHECKING(for hstrerror)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h"
+ #include <netdb.h>
+-], void* p = hstrerror; hstrerror(0),
+- AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++]], [[void* p = hstrerror; hstrerror(0)]])],[AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ AC_MSG_CHECKING(for inet_aton)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h"
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-], void* p = inet_aton;inet_aton(0,0),
+- AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++]], [[void* p = inet_aton;inet_aton(0,0)]])],[AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ AC_MSG_CHECKING(for inet_pton)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-], void* p = inet_pton,
+- AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++]], [[void* p = inet_pton]])],[AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ # On some systems, setgroups is in unistd.h, on others, in grp.h
+ AC_MSG_CHECKING(for setgroups)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "confdefs.h"
+ #include <unistd.h>
+ #ifdef HAVE_GRP_H
+ #include <grp.h>
+ #endif
+-],
+-void* p = setgroups,
+- AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.)
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+-)
++]], [[void* p = setgroups]])],[AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.)
++ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++])
+
+ # check for openpty and forkpty
+
+@@ -2226,30 +2141,24 @@
+
+ AC_REPLACE_FUNCS(dup2 getcwd strdup strerror memmove)
+ AC_CHECK_FUNCS(getpgrp,
+- AC_TRY_COMPILE([#include <unistd.h>],
+- [getpgrp(0);],
+- AC_DEFINE(GETPGRP_HAVE_ARG, 1,
+- [Define if getpgrp() must be called as getpgrp(0).])
+- )
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[getpgrp(0);]])],[AC_DEFINE(GETPGRP_HAVE_ARG, 1,
++ Define if getpgrp() must be called as getpgrp(0).)
++ ],[])
+ )
+ AC_CHECK_FUNCS(setpgrp,
+- AC_TRY_COMPILE([#include <unistd.h>],
+- [setpgrp(0,0);],
+- AC_DEFINE(SETPGRP_HAVE_ARG, 1,
+- [Define if setpgrp() must be called as setpgrp(0, 0).])
+- )
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[setpgrp(0,0);]])],[AC_DEFINE(SETPGRP_HAVE_ARG, 1,
++ Define if setpgrp() must be called as setpgrp(0, 0).)
++ ],[])
+ )
+ AC_CHECK_FUNCS(gettimeofday,
+- AC_TRY_COMPILE([#include <sys/time.h>],
+- [gettimeofday((struct timeval*)0,(struct timezone*)0);], ,
+- AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
+- [Define if gettimeofday() does not have second (timezone) argument
+- This is the case on Motorola V4 (R40V4.2)])
+- )
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[gettimeofday((struct timeval*)0,(struct timezone*)0);]])],[],[AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1,
++ Define if gettimeofday() does not have second (timezone) argument
++ This is the case on Motorola V4 (R40V4.2))
++ ])
+ )
+
+ AC_MSG_CHECKING(for major, minor, and makedev)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if defined(MAJOR_IN_MKDEV)
+ #include <sys/mkdev.h>
+ #elif defined(MAJOR_IN_SYSMACROS)
+@@ -2257,9 +2166,9 @@
+ #else
+ #include <sys/types.h>
+ #endif
+-],[
++]], [[
+ makedev(major(0),minor(0));
+-],[
++]])],[
+ AC_DEFINE(HAVE_DEVICE_MACROS, 1,
+ [Define to 1 if you have the device macros.])
+ AC_MSG_RESULT(yes)
+@@ -2270,14 +2179,14 @@
+ # On OSF/1 V5.1, getaddrinfo is available, but a define
+ # for [no]getaddrinfo in netdb.h.
+ AC_MSG_CHECKING(for getaddrinfo)
+-AC_TRY_LINK([
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <stdio.h>
+-],[
++]], [[
+ getaddrinfo(NULL, NULL, NULL, NULL);
+-], [
++]])],[
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(getaddrinfo bug)
+ AC_TRY_RUN([
+@@ -2371,7 +2280,7 @@
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes,
+ AC_MSG_RESULT(buggy)
+-buggygetaddrinfo=yes)], [
++buggygetaddrinfo=yes)],[
+ AC_MSG_RESULT(no)
+ buggygetaddrinfo=yes
+ ])
+@@ -2397,9 +2306,7 @@
+
+ AC_MSG_CHECKING(for time.h that defines altzone)
+ AC_CACHE_VAL(ac_cv_header_time_altzone,
+-[AC_TRY_COMPILE([#include <time.h>], [return altzone;],
+- ac_cv_header_time_altzone=yes,
+- ac_cv_header_time_altzone=no)])
++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[return altzone;]])],[ac_cv_header_time_altzone=yes],[ac_cv_header_time_altzone=no])])
+ AC_MSG_RESULT($ac_cv_header_time_altzone)
+ if test $ac_cv_header_time_altzone = yes; then
+ AC_DEFINE(HAVE_ALTZONE, 1, [Define this if your time.h defines altzone.])
+@@ -2407,25 +2314,22 @@
+
+ was_it_defined=no
+ AC_MSG_CHECKING(whether sys/select.h and sys/time.h may both be included)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <sys/types.h>
+ #include <sys/select.h>
+ #include <sys/time.h>
+-], [;], [
++]], [[;]])],[
+ AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1,
+ [Define if you can safely include both <sys/select.h> and <sys/time.h>
+ (which you can't on SCO ODT 3.0).])
+ was_it_defined=yes
+-])
++],[])
+ AC_MSG_RESULT($was_it_defined)
+
+ AC_MSG_CHECKING(for addrinfo)
+ AC_CACHE_VAL(ac_cv_struct_addrinfo,
+-AC_TRY_COMPILE([
+-# include <netdb.h>],
+- [struct addrinfo a],
+- ac_cv_struct_addrinfo=yes,
+- ac_cv_struct_addrinfo=no))
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++# include <netdb.h>]], [[struct addrinfo a]])],[ac_cv_struct_addrinfo=yes],[ac_cv_struct_addrinfo=no]))
+ AC_MSG_RESULT($ac_cv_struct_addrinfo)
+ if test $ac_cv_struct_addrinfo = yes; then
+ AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)])
+@@ -2433,12 +2337,9 @@
+
+ AC_MSG_CHECKING(for sockaddr_storage)
+ AC_CACHE_VAL(ac_cv_struct_sockaddr_storage,
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ # include <sys/types.h>
+-# include <sys/socket.h>],
+- [struct sockaddr_storage s],
+- ac_cv_struct_sockaddr_storage=yes,
+- ac_cv_struct_sockaddr_storage=no))
++# include <sys/socket.h>]], [[struct sockaddr_storage s]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no]))
+ AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
+ if test $ac_cv_struct_sockaddr_storage = yes; then
+ AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)])
+@@ -2451,30 +2352,28 @@
+
+ works=no
+ AC_MSG_CHECKING(for working volatile)
+-AC_TRY_COMPILE([],[volatile int x; x = 0;], works=yes,
+- AC_DEFINE(volatile, [], [Define to empty if the keyword does not work.])
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[volatile int x; x = 0;]])],[works=yes],[AC_DEFINE(volatile, , Define to empty if the keyword does not work.)
++])
+ AC_MSG_RESULT($works)
+
+ works=no
+ AC_MSG_CHECKING(for working signed char)
+-AC_TRY_COMPILE([], [signed char c;], works=yes,
+- AC_DEFINE(signed, [], [Define to empty if the keyword does not work.])
+-)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char c;]])],[works=yes],[AC_DEFINE(signed, , Define to empty if the keyword does not work.)
++])
+ AC_MSG_RESULT($works)
+
+ have_prototypes=no
+ AC_MSG_CHECKING(for prototypes)
+-AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],[
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(int x) { return 0; }]], [[return foo(10);]])],[
+ AC_DEFINE(HAVE_PROTOTYPES, 1,
+ [Define if your compiler supports function prototype])
+ have_prototypes=yes
+-])
++],[])
+ AC_MSG_RESULT($have_prototypes)
+
+ works=no
+ AC_MSG_CHECKING(for variable length prototypes and stdarg.h)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdarg.h>
+ int foo(int x, ...) {
+ va_list va;
+@@ -2484,45 +2383,41 @@
+ va_arg(va, double);
+ return 0;
+ }
+-], [return foo(10, "", 3.14);], [
++]], [[return foo(10, "", 3.14);]])],[
+ AC_DEFINE(HAVE_STDARG_PROTOTYPES, 1,
+ [Define if your compiler supports variable length function prototypes
+ (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h>])
+ works=yes
+-])
++],[])
+ AC_MSG_RESULT($works)
+
+ if test "$have_prototypes" = yes; then
+ bad_prototypes=no
+ AC_MSG_CHECKING(for bad exec* prototypes)
+-AC_TRY_COMPILE([#include <unistd.h>], [char **t;execve("@",t,t);], ,
+- AC_DEFINE(BAD_EXEC_PROTOTYPES, 1,
+- [Define if your <unistd.h> contains bad prototypes for exec*()
+- (as it does on SGI IRIX 4.x)])
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[char **t;execve("@",t,t);]])],[],[AC_DEFINE(BAD_EXEC_PROTOTYPES, 1,
++ Define if your <unistd.h> contains bad prototypes for exec*()
++ (as it does on SGI IRIX 4.x))
+ bad_prototypes=yes
+-)
++])
+ AC_MSG_RESULT($bad_prototypes)
+ fi
+
+ # check if sockaddr has sa_len member
+ AC_MSG_CHECKING(if sockaddr has sa_len member)
+-AC_TRY_COMPILE([#include <sys/types.h>
+-#include <sys/socket.h>],
+-[struct sockaddr x;
+-x.sa_len = 0;],
+- AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]),
+- AC_MSG_RESULT(no))
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
++#include <sys/socket.h>]], [[struct sockaddr x;
++x.sa_len = 0;]])],[AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, Define if sockaddr has sa_len member)],[AC_MSG_RESULT(no)])
+
+ va_list_is_array=no
+ AC_MSG_CHECKING(whether va_list is an array)
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_STDARG_PROTOTYPES
+ #include <stdarg.h>
+ #else
+ #include <varargs.h>
+ #endif
+-], [va_list list1, list2; list1 = list2;], , [
++]], [[va_list list1, list2; list1 = list2;]])],[],[
+ AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind])
+ va_list_is_array=yes
+ ])
+@@ -2537,9 +2432,9 @@
+ AC_MSG_CHECKING([gethostbyname_r with 6 args])
+ OLD_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS"
+- AC_TRY_COMPILE([
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ # include <netdb.h>
+- ], [
++ ]], [[
+ char *name;
+ struct hostent *he, *res;
+ char buffer[2048];
+@@ -2547,12 +2442,12 @@
+ int h_errnop;
+
+ (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop)
+- ], [
++ ]])],[
+ AC_DEFINE(HAVE_GETHOSTBYNAME_R)
+ AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG, 1,
+ [Define this if you have the 6-arg version of gethostbyname_r().])
+ AC_MSG_RESULT(yes)
+- ], [
++ ],[
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([gethostbyname_r with 5 args])
+ AC_TRY_COMPILE([
+@@ -2613,7 +2508,7 @@
+ # Check for --with-fpectl
+ AC_MSG_CHECKING(for --with-fpectl)
+ AC_ARG_WITH(fpectl,
+- AC_HELP_STRING(--with-fpectl, enable SIGFPE catching),
++ AS_HELP_STRING(--with-fpectl,enable SIGFPE catching),
+ [
+ if test "$withval" != no
+ then
+@@ -2633,7 +2528,7 @@
+ esac
+ AC_MSG_CHECKING(for --with-libm=STRING)
+ AC_ARG_WITH(libm,
+- AC_HELP_STRING(--with-libm=STRING, math library),
++ AS_HELP_STRING(--with-libm=STRING,math library),
+ [
+ if test "$withval" = no
+ then LIBM=
+@@ -2649,7 +2544,7 @@
+ AC_SUBST(LIBC)
+ AC_MSG_CHECKING(for --with-libc=STRING)
+ AC_ARG_WITH(libc,
+- AC_HELP_STRING(--with-libc=STRING, C library),
++ AS_HELP_STRING(--with-libc=STRING,C library),
+ [
+ if test "$withval" = no
+ then LIBC=
+@@ -2684,20 +2579,20 @@
+
+ AC_MSG_CHECKING(for UCS-4 tcl)
+ have_ucs4_tcl=no
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <tcl.h>
+ #if TCL_UTF_MAX != 6
+ # error "NOT UCS4_TCL"
+-#endif], [], [
++#endif]], [[]])],[
+ AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6])
+ have_ucs4_tcl=yes
+-])
++],[])
+ AC_MSG_RESULT($have_ucs4_tcl)
+
+ AC_MSG_CHECKING(what type to use for unicode)
+ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
+ AC_ARG_ENABLE(unicode,
+- AC_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@, Enable Unicode strings (default is yes)),
++ AS_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@,Enable Unicode strings (default is yes)),
+ [],
+ [enable_unicode=yes])
+
+@@ -2764,15 +2659,12 @@
+ # or fills with zeros (like the Cray J90, according to Tim Peters).
+ AC_MSG_CHECKING(whether right shift extends the sign bit)
+ AC_CACHE_VAL(ac_cv_rshift_extends_sign, [
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ int main()
+ {
+ exit(((-1)>>3 == -1) ? 0 : 1);
+ }
+-],
+-ac_cv_rshift_extends_sign=yes,
+-ac_cv_rshift_extends_sign=no,
+-ac_cv_rshift_extends_sign=yes)])
++]])],[ac_cv_rshift_extends_sign=yes],[ac_cv_rshift_extends_sign=no],[ac_cv_rshift_extends_sign=yes])])
+ AC_MSG_RESULT($ac_cv_rshift_extends_sign)
+ if test "$ac_cv_rshift_extends_sign" = no
+ then
+@@ -2784,12 +2676,12 @@
+ # check for getc_unlocked and related locking functions
+ AC_MSG_CHECKING(for getc_unlocked() and friends)
+ AC_CACHE_VAL(ac_cv_have_getc_unlocked, [
+-AC_TRY_LINK([#include <stdio.h>],[
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[
+ FILE *f = fopen("/dev/null", "r");
+ flockfile(f);
+ getc_unlocked(f);
+ funlockfile(f);
+-], ac_cv_have_getc_unlocked=yes, ac_cv_have_getc_unlocked=no)])
++]])],[ac_cv_have_getc_unlocked=yes],[ac_cv_have_getc_unlocked=no])])
+ AC_MSG_RESULT($ac_cv_have_getc_unlocked)
+ if test "$ac_cv_have_getc_unlocked" = yes
+ then
+@@ -2798,8 +2690,7 @@
+ fi
+
+ # check for readline 2.2
+-AC_TRY_CPP([#include <readline/readline.h>],
+-have_readline=yes, have_readline=no)
++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <readline/readline.h>]])],[have_readline=yes],[have_readline=no])
+ if test $have_readline = yes
+ then
+ AC_EGREP_HEADER([extern int rl_completion_append_character;],
+@@ -2820,7 +2711,7 @@
+
+ AC_MSG_CHECKING(for broken nice())
+ AC_CACHE_VAL(ac_cv_broken_nice, [
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ int main()
+ {
+ int val1 = nice(1);
+@@ -2828,10 +2719,7 @@
+ exit(0);
+ exit(1);
+ }
+-],
+-ac_cv_broken_nice=yes,
+-ac_cv_broken_nice=no,
+-ac_cv_broken_nice=no)])
++]])],[ac_cv_broken_nice=yes],[ac_cv_broken_nice=no],[ac_cv_broken_nice=no])])
+ AC_MSG_RESULT($ac_cv_broken_nice)
+ if test "$ac_cv_broken_nice" = yes
+ then
+@@ -2842,7 +2730,7 @@
+ # tzset(3) exists and works like we expect it to
+ AC_MSG_CHECKING(for working tzset())
+ AC_CACHE_VAL(ac_cv_working_tzset, [
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdlib.h>
+ #include <time.h>
+ #include <string.h>
+@@ -2880,10 +2768,7 @@
+
+ exit(0);
+ }
+-],
+-ac_cv_working_tzset=yes,
+-ac_cv_working_tzset=no,
+-ac_cv_working_tzset=no)])
++]])],[ac_cv_working_tzset=yes],[ac_cv_working_tzset=no],[ac_cv_working_tzset=no])])
+ AC_MSG_RESULT($ac_cv_working_tzset)
+ if test "$ac_cv_working_tzset" = yes
+ then
+@@ -2894,13 +2779,10 @@
+ # Look for subsecond timestamps in struct stat
+ AC_MSG_CHECKING(for tv_nsec in struct stat)
+ AC_CACHE_VAL(ac_cv_stat_tv_nsec,
+-AC_TRY_COMPILE([#include <sys/stat.h>], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[
+ struct stat st;
+ st.st_mtim.tv_nsec = 1;
+-],
+-ac_cv_stat_tv_nsec=yes,
+-ac_cv_stat_tv_nsec=no,
+-ac_cv_stat_tv_nsec=no))
++]])],[ac_cv_stat_tv_nsec=yes],[ac_cv_stat_tv_nsec=no]))
+ AC_MSG_RESULT($ac_cv_stat_tv_nsec)
+ if test "$ac_cv_stat_tv_nsec" = yes
+ then
+@@ -2911,12 +2793,10 @@
+ # On HP/UX 11.0, mvwdelch is a block with a return statement
+ AC_MSG_CHECKING(whether mvwdelch is an expression)
+ AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,
+-AC_TRY_COMPILE([#include <curses.h>], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+ int rtn;
+ rtn = mvwdelch(0,0,0);
+-], ac_cv_mvwdelch_is_expression=yes,
+- ac_cv_mvwdelch_is_expression=no,
+- ac_cv_mvwdelch_is_expression=yes))
++]])],[ac_cv_mvwdelch_is_expression=yes],[ac_cv_mvwdelch_is_expression=no]))
+ AC_MSG_RESULT($ac_cv_mvwdelch_is_expression)
+
+ if test "$ac_cv_mvwdelch_is_expression" = yes
+@@ -2927,12 +2807,10 @@
+
+ AC_MSG_CHECKING(whether WINDOW has _flags)
+ AC_CACHE_VAL(ac_cv_window_has_flags,
+-AC_TRY_COMPILE([#include <curses.h>], [
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+ WINDOW *w;
+ w->_flags = 0;
+-], ac_cv_window_has_flags=yes,
+- ac_cv_window_has_flags=no,
+- ac_cv_window_has_flags=no))
++]])],[ac_cv_window_has_flags=yes],[ac_cv_window_has_flags=no]))
+ AC_MSG_RESULT($ac_cv_window_has_flags)
+
+
diff --git a/meta-extras/packages/python/python-2.4.3/bindir-libdir.patch b/meta-extras/packages/python/python-2.4.3/bindir-libdir.patch
new file mode 100644
index 000000000..27ae5dce5
--- /dev/null
+++ b/meta-extras/packages/python/python-2.4.3/bindir-libdir.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- Python-2.4c1/Makefile.pre.in~bindir-libdir.patch
++++ Python-2.4c1/Makefile.pre.in
+@@ -78,8 +78,8 @@
+ exec_prefix= @exec_prefix@
+
+ # Expanded directories
+-BINDIR= $(exec_prefix)/bin
+-LIBDIR= $(exec_prefix)/lib
++BINDIR= @bindir@
++LIBDIR= @libdir@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
diff --git a/meta-extras/packages/python/python-2.4.3/crosscompile.patch b/meta-extras/packages/python/python-2.4.3/crosscompile.patch
new file mode 100644
index 000000000..f917bb256
--- /dev/null
+++ b/meta-extras/packages/python/python-2.4.3/crosscompile.patch
@@ -0,0 +1,108 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- Python-2.4c1/Makefile.pre.in~crosscompile
++++ Python-2.4c1/Makefile.pre.in
+@@ -162,6 +162,7 @@
+
+ PYTHON= python$(EXE)
+ BUILDPYTHON= python$(BUILDEXE)
++HOSTPYTHON= $(BUILDPYTHON)
+
+ # === Definitions added by makesetup ===
+
+@@ -188,7 +189,7 @@
+ ##########################################################################
+ # Parser
+ PGEN= Parser/pgen$(EXE)
+-
++HOSTPGEN= $(PGEN)$(EXE)
+ POBJS= \
+ Parser/acceler.o \
+ Parser/grammar1.o \
+@@ -320,8 +321,8 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ case $$MAKEFLAGS in \
+- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
+ esac
+
+ # buildno should really depend on something like LIBRARY_SRC
+@@ -442,7 +443,7 @@
+
+
+ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+
+ $(PGEN): $(PGENOBJS)
+ $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -718,19 +719,19 @@
+ done
+ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
+ -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
++ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST)/site-packages -f \
+ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+
+@@ -825,7 +826,7 @@
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall:
+- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
+ --prefix=$(prefix) \
+ --install-scripts=$(BINDIR) \
+ --install-platlib=$(DESTSHARED) \
+--- Python-2.4c1/setup.py~crosscompile
++++ Python-2.4c1/setup.py
+@@ -206,6 +206,7 @@
+ except ImportError, why:
+ self.announce('*** WARNING: renaming "%s" since importing it'
+ ' failed: %s' % (ext.name, why), level=3)
++ return
+ assert not self.inplace
+ basename, tail = os.path.splitext(ext_filename)
+ newname = basename + "_failed" + tail
+@@ -239,8 +240,8 @@
+
+ def detect_modules(self):
+ # Ensure that /usr/local is always used
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+
+ # Add paths to popular package managers on OS X/darwin
+ if sys.platform == "darwin":
+@@ -293,6 +294,9 @@
+
+ # XXX Omitted modules: gl, pure, dl, SGI-specific modules
+
++ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
++ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
++
+ #
+ # The following modules are all pretty straightforward, and compile
+ # on pretty much any POSIXish platform.
diff --git a/meta-extras/packages/python/python-2.4.3/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.4.3/fix-tkinter-detection.patch
new file mode 100644
index 000000000..602aa8e02
--- /dev/null
+++ b/meta-extras/packages/python/python-2.4.3/fix-tkinter-detection.patch
@@ -0,0 +1,39 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- Python-2.4.1/setup.py~fix-tkinter-detection
++++ Python-2.4.1/setup.py
+@@ -999,7 +999,7 @@
+ dotversion = dotversion[:-1] + '.' + dotversion[-1]
+ tcl_include_sub = []
+ tk_include_sub = []
+- for dir in inc_dirs:
++ for dir in [os.getenv("STAGING_INCDIR")]:
+ tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
+ tk_include_sub += [dir + os.sep + "tk" + dotversion]
+ tk_include_sub += tcl_include_sub
+@@ -1018,22 +1018,6 @@
+ if dir not in include_dirs:
+ include_dirs.append(dir)
+
+- # Check for various platform-specific directories
+- if platform == 'sunos5':
+- include_dirs.append('/usr/openwin/include')
+- added_lib_dirs.append('/usr/openwin/lib')
+- elif os.path.exists('/usr/X11R6/include'):
+- include_dirs.append('/usr/X11R6/include')
+- added_lib_dirs.append('/usr/X11R6/lib64')
+- added_lib_dirs.append('/usr/X11R6/lib')
+- elif os.path.exists('/usr/X11R5/include'):
+- include_dirs.append('/usr/X11R5/include')
+- added_lib_dirs.append('/usr/X11R5/lib')
+- else:
+- # Assume default location for X11
+- include_dirs.append('/usr/X11/include')
+- added_lib_dirs.append('/usr/X11/lib')
+-
+ # If Cygwin, then verify that X is installed before proceeding
+ if platform == 'cygwin':
+ x11_inc = find_file('X11/Xlib.h', [], include_dirs)
diff --git a/meta-extras/packages/python/python-2.4.3/sitebranding.patch b/meta-extras/packages/python/python-2.4.3/sitebranding.patch
new file mode 100644
index 000000000..85bb83a50
--- /dev/null
+++ b/meta-extras/packages/python/python-2.4.3/sitebranding.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- Python-2.4.3/Lib/site.py~sitebranding
++++ Python-2.4.3/Lib/site.py
+@@ -305,8 +305,9 @@
+ "Jython is maintained by the Jython developers (www.jython.org).")
+ else:
+ __builtin__.credits = _Printer("credits", """\
+- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
+- for supporting Python development. See www.python.org for more information.""")
++ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org).
++ It is a part of the Python-For-Embedded-Systems initiative which is maintained by
++ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""")
+ here = os.path.dirname(os.__file__)
+ __builtin__.license = _Printer(
+ "license", "See http://www.python.org/%.3s/license.html" % sys.version,
diff --git a/meta-extras/packages/python/python-native-2.4.0/bindir-libdir.patch b/meta-extras/packages/python/python-native-2.4.0/bindir-libdir.patch
new file mode 100644
index 000000000..999bddc44
--- /dev/null
+++ b/meta-extras/packages/python/python-native-2.4.0/bindir-libdir.patch
@@ -0,0 +1,18 @@
+
+#
+# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200
++++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100
+@@ -78,8 +78,8 @@
+ exec_prefix= @exec_prefix@
+
+ # Expanded directories
+-BINDIR= $(exec_prefix)/bin
+-LIBDIR= $(exec_prefix)/lib
++BINDIR= @bindir@
++LIBDIR= @libdir@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
diff --git a/meta-extras/packages/python/python-native-2.4.0/cross-distutils.patch b/meta-extras/packages/python/python-native-2.4.0/cross-distutils.patch
new file mode 100644
index 000000000..76ae883c1
--- /dev/null
+++ b/meta-extras/packages/python/python-native-2.4.0/cross-distutils.patch
@@ -0,0 +1,38 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100
++++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100
+@@ -19,8 +19,8 @@
+ from errors import DistutilsPlatformError
+
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
++EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
+
+ # python_build: (Boolean) if true, we're either building Python or
+ # building an extension with an un-installed Python, so we use
+@@ -192,7 +192,8 @@
+ else:
+ # The name of the config.h file changed in 2.2
+ config_h = 'pyconfig.h'
+- return os.path.join(inc_dir, config_h)
++ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
++ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
+
+
+ def get_makefile_filename():
+@@ -200,7 +201,8 @@
+ if python_build:
+ return os.path.join(os.path.dirname(sys.executable), "Makefile")
+ lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+- return os.path.join(lib_dir, "config", "Makefile")
++ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
++ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
+
+
+ def parse_config_h(fp, g=None):
diff --git a/meta-extras/packages/python/python-native_2.4.0.bb b/meta-extras/packages/python/python-native_2.4.0.bb
new file mode 100644
index 000000000..00092d1e1
--- /dev/null
+++ b/meta-extras/packages/python/python-native_2.4.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Python Programming Language"
+HOMEPAGE = "http://www.python.org"
+LICENSE = "PSF"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = ""
+PR = "r0"
+
+EXCLUDE_FROM_WORLD = "1"
+
+SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \
+ file://bindir-libdir.patch;patch=1 \
+ file://cross-distutils.patch;patch=1"
+S = "${WORKDIR}/Python-2.4"
+
+inherit autotools native
+
+EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \
+ --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
+
+do_configure () {
+ oe_runconf
+}
+
+do_stage_append() {
+ # install pgen for later usage with non-native builds
+ install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
+}
+
diff --git a/meta-extras/packages/python/python-pygtk2/acinclude.m4 b/meta-extras/packages/python/python-pygtk2/acinclude.m4
new file mode 100644
index 000000000..eec3758af
--- /dev/null
+++ b/meta-extras/packages/python/python-pygtk2/acinclude.m4
@@ -0,0 +1,84 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+ import $1
+except ImportError:
+ sys.exit(1)
+except:
+ sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+ then
+ eval "py_cv_mod_$py_mod_var=yes"
+ else
+ eval "py_cv_mod_$py_mod_var=no"
+ fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], [],, [$3
+])dnl
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS. If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\ \ @:>@$1@<:@\ \ @:>@*)
+ ;;
+*)
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_MSG_CHECKING([whether [$]CC understands $1])
+ AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+ AC_MSG_RESULT($jh_has_option)
+ if test $jh_has_option = no; then
+ CFLAGS="$save_CFLAGS"
+ fi
+ ;;
+esac])
diff --git a/meta-extras/packages/python/python-pygtk2_2.8.6.bb b/meta-extras/packages/python/python-pygtk2_2.8.6.bb
new file mode 100644
index 000000000..d91e13532
--- /dev/null
+++ b/meta-extras/packages/python/python-pygtk2_2.8.6.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Python GTK+ Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "gtk+ libglade"
+RDEPENDS = "python-shell"
+SRCNAME = "pygtk"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${SRCNAME}-${PV}.tar.bz2 \
+ file://acinclude.m4"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit autotools pkgconfig distutils-base
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_stage() {
+ autotools_stage_includes
+ install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/
+}
diff --git a/meta-extras/packages/python/python_2.4.3.bb b/meta-extras/packages/python/python_2.4.3.bb
new file mode 100644
index 000000000..30ce73abe
--- /dev/null
+++ b/meta-extras/packages/python/python_2.4.3.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "Python Programming Language"
+HOMEPAGE = "http://www.python.org"
+LICENSE = "PSF"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
+DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
+PR = "ml3"
+
+PYTHON_MAJMIN = "2.4"
+
+SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+ file://bindir-libdir.patch;patch=1 \
+ file://crosscompile.patch;patch=1 \
+ file://fix-tkinter-detection.patch;patch=1 \
+ file://sitebranding.patch;patch=1"
+S = "${WORKDIR}/Python-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
+ --without-cxx --with-signal-module --with-wctype-functions \
+ --enable-shared"
+
+#
+# copy config.h and an appropriate Makefile for distutils.sysconfig
+# which laters uses the information out of these to compile extensions
+#
+do_compile_prepend() {
+ install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+ install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
+ install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+ install -m 0644 Makefile Makefile.orig
+ install -m 0644 Makefile Makefile.backup
+ sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile
+ install -m 0644 Makefile Makefile.backup
+ sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile
+ install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
+}
+
+do_compile() {
+ oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
+ HOSTPYTHON=${STAGING_BINDIR}/python \
+ STAGING_LIBDIR=${STAGING_LIBDIR} \
+ STAGING_INCDIR=${STAGING_INCDIR} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS}
+}
+
+do_stage() {
+ install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+ oe_libinstall -a -so libpython2.4 ${STAGING_LIBDIR}
+}
+
+do_install() {
+ install -m 0644 Makefile.orig Makefile
+ oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
+ HOSTPYTHON=${STAGING_BINDIR}/python \
+ STAGING_LIBDIR=${STAGING_LIBDIR} \
+ STAGING_INCDIR=${STAGING_INCDIR} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ DESTDIR=${D} install
+}
+
+include python-${PV}-manifest.inc
+
+RPROVIDES_python-core = "python"
+RPROVIDES_python-curses = "python"
+PACKAGES =+ "libpython2"
+FILES_libpython2 = "${libdir}/libpython*"
--
cgit v1.2.3