9 files changed, 5 insertions, 1705 deletions
diff --git a/packages/python/python-2.3.4-manifest.inc b/packages/python/python-2.3.4-manifest.inc
deleted file mode 100644
index e2344f2029..0000000000
--- a/packages/python/python-2.3.4-manifest.inc
+++ /dev/null
@@ -1,210 +0,0 @@
-### AUTO-GENERATED by './generate-bb.py' [(C) 2002-2004 Michael Lauer] on Sat Oct 16 12:45:14 2004
-###
-### Warning: Manual edits will be lost!
-###
- 
-
-PACKAGES="python-codecs python-threading python-distutils python-textutils python-curses python-pickle python-core python-io python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-math python-hotshot python-unixadmin python-gdbm python-fcntl python-netclient python-pprint python-netserver python-compiler python-syslog python-html python-readline python-pydoc python-xml python-mime python-unittest python-stringold python-compile python-shell python-mmap python-zlib python-db python-crypt python-lang python-audio "
-
-DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml2"
-RDEPENDS_python-codecs="python-core"
-FILES_python-codecs="${libdir}/python2.3/codecs.* ${libdir}/python2.3/encodings ${libdir}/python2.3/locale.* ${libdir}/python2.3/lib-dynload/_locale.so ${libdir}/python2.3/lib-dynload/unicodedata.so ${libdir}/python2.3/gettext.* ${libdir}/python2.3/xdrlib.* "
-
-DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml2"
-RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="${libdir}/python2.3/bisect.* ${libdir}/python2.3/threading.* ${libdir}/python2.3/Queue.* "
-
-DESCRIPTION_python-distutils="Python Distribution Utility"
-PR_python-distutils="ml2"
-RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="${libdir}/python2.3/distutils "
-
-DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-PR_python-textutils="ml2"
-RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
-FILES_python-textutils="${libdir}/python2.3/lib-dynload/_csv.so ${libdir}/python2.3/csv.* ${libdir}/python2.3/optparse.* ${libdir}/python2.3/textwrap.* "
-
-DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml2"
-RDEPENDS_python-curses="python-core libncurses5"
-FILES_python-curses="${libdir}/python2.3/curses ${libdir}/python2.3/lib-dynload/_curses.so ${libdir}/python2.3/lib-dynload/_curses_panel.so "
-
-DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml2"
-RDEPENDS_python-pickle="python-core python-re"
-FILES_python-pickle="${libdir}/python2.3/pickle.* ${libdir}/python2.3/shelve.* ${libdir}/python2.3/lib-dynload/cPickle.so "
-
-DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml2"
-RDEPENDS_python-core=""
-FILES_python-core="${libdir}/python2.3/__future__.* ${libdir}/python2.3/copy.* ${libdir}/python2.3/copy_reg.* ${libdir}/python2.3/ConfigParser.py ${libdir}/python2.3/getopt.* ${libdir}/python2.3/new.* ${libdir}/python2.3/os.* ${libdir}/python2.3/posixpath.* ${libdir}/python2.3/warnings.* ${libdir}/python2.3/site.* ${libdir}/python2.3/stat.* ${libdir}/python2.3/UserDict.* ${libdir}/python2.3/lib-dynload/binascii.so ${libdir}/python2.3/lib-dynload/struct.so ${libdir}/python2.3/lib-dynload/time.so ${libdir}/python2.3/lib-dynload/xreadlines.so ${libdir}/python2.3/types.* ${bindir}/python "
-
-DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml2"
-RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.3/lib-dynload/_socket.so ${libdir}/python2.3/lib-dynload/select.so ${libdir}/python2.3/lib-dynload/termios.so ${libdir}/python2.3/lib-dynload/cStringIO.so ${libdir}/python2.3/pipes.* ${libdir}/python2.3/socket.* ${libdir}/python2.3/tempfile.* ${libdir}/python2.3/StringIO.* "
-
-DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml2"
-RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="${libdir}/python2.3/gzip.* ${libdir}/python2.3/zipfile.* "
-
-DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml2"
-RDEPENDS_python-re="python-core python-stringold"
-FILES_python-re="${libdir}/python2.3/re.* ${libdir}/python2.3/sre.* ${libdir}/python2.3/sre_compile.* ${libdir}/python2.3/sre_constants* ${libdir}/python2.3/sre_parse.* "
-
-DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-PR_python-xmlrpc="ml2"
-RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
-FILES_python-xmlrpc="${libdir}/python2.3/xmlrpclib.* ${libdir}/python2.3/SimpleXMLRPCServer.* "
-
-DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml2"
-RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="${libdir}/python2.3/pty.* ${libdir}/python2.3/tty.* "
-
-DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml2"
-RDEPENDS_python-email="python-core python-io python-re"
-FILES_python-email="${libdir}/python2.3/email "
-
-DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml2"
-RDEPENDS_python-image="python-core"
-FILES_python-image="${libdir}/python2.3/colorsys.* ${libdir}/python2.3/imghdr.* ${libdir}/python2.3/lib-dynload/imageop.so ${libdir}/python2.3/lib-dynload/rgbimg.so "
-
-DESCRIPTION_python-resource="Python Resource Control Interface"
-PR_python-resource="ml2"
-RDEPENDS_python-resource="python-core"
-FILES_python-resource="${libdir}/python2.3/lib-dynload/resource.so "
-
-DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml2"
-RDEPENDS_python-math="python-core"
-FILES_python-math="${libdir}/python2.3/lib-dynload/cmath.so ${libdir}/python2.3/lib-dynload/math.so ${libdir}/python2.3/lib-dynload/_random.so ${libdir}/python2.3/random.* "
-
-DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml2"
-RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="${libdir}/python2.3/hotshot ${libdir}/python2.3/lib-dynload/_hotshot.so "
-
-DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-PR_python-unixadmin="ml2"
-RDEPENDS_python-unixadmin="python-core"
-FILES_python-unixadmin="${libdir}/python2.3/lib-dynload/nis.so ${libdir}/python2.3/lib-dynload/grp.so ${libdir}/python2.3/lib-dynload/pwd.so ${libdir}/python2.3/getpass.* "
-
-DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml2"
-RDEPENDS_python-gdbm="python-core libgdbm3"
-FILES_python-gdbm="${libdir}/python2.3/lib-dynload/gdbm.so "
-
-DESCRIPTION_python-fcntl="Python's fcntl Interface"
-PR_python-fcntl="ml2"
-RDEPENDS_python-fcntl="python-core"
-FILES_python-fcntl="${libdir}/python2.3/lib-dynload/fcntl.so "
-
-DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml2"
-RDEPENDS_python-netclient="python-core python-io python-mime"
-FILES_python-netclient="${libdir}/python2.3/base64.* ${libdir}/python2.3/ftplib.* ${libdir}/python2.3/gopherlib.* ${libdir}/python2.3/hmac.* ${libdir}/python2.3/httplib.* ${libdir}/python2.3/mimetypes.* ${libdir}/python2.3/nntplib.* ${libdir}/python2.3/poplib.* ${libdir}/python2.3/smtplib.* ${libdir}/python2.3/telnetlib.* ${libdir}/python2.3/urllib.* ${libdir}/python2.3/urllib2.* ${libdir}/python2.3/urlparse.* "
-
-DESCRIPTION_python-pprint="Python Pretty-Print Support"
-PR_python-pprint="ml2"
-RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="${libdir}/python2.3/pprint.* "
-
-DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-PR_python-netserver="ml2"
-RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="${libdir}/python2.3/cgi.* ${libdir}/python2.3/BaseHTTPServer.* ${libdir}/python2.3/SimpleHTTPServer.* ${libdir}/python2.3/SocketServer.* "
-
-DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml2"
-RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="${libdir}/python2.3/compiler "
-
-DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml2"
-RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="${libdir}/python2.3/lib-dynload/syslog.so "
-
-DESCRIPTION_python-html="Python HTML Processing"
-PR_python-html="ml2"
-RDEPENDS_python-html="python-core"
-FILES_python-html="${libdir}/python2.3/formatter.* ${libdir}/python2.3/htmlentitydefs.* ${libdir}/python2.3/htmllib.* ${libdir}/python2.3/markupbase.* ${libdir}/python2.3/sgmllib.* "
-
-DESCRIPTION_python-readline="Python Readline Support"
-PR_python-readline="ml2"
-RDEPENDS_python-readline="python-core libreadline4"
-FILES_python-readline="${libdir}/python2.3/lib-dynload/readline.so ${libdir}/python2.3/rlcompleter.* "
-
-DESCRIPTION_python-pydoc="Python Interactive Help Support"
-PR_python-pydoc="ml2"
-RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.3/pydoc.* "
-
-DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml2"
-RDEPENDS_python-xml="python-core python-re"
-FILES_python-xml="${libdir}/python2.3/lib-dynload/pyexpat.so ${libdir}/python2.3/xml ${libdir}/python2.3/xmllib.* "
-
-DESCRIPTION_python-mime="Python MIME Handling APIs"
-PR_python-mime="ml2"
-RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="${libdir}/python2.3/mimetools.* ${libdir}/python2.3/rfc822.* "
-
-DESCRIPTION_python-unittest="Python Unit Testing Framework"
-PR_python-unittest="ml2"
-RDEPENDS_python-unittest="python-core python-stringold python-lang"
-FILES_python-unittest="${libdir}/python2.3/unittest.* "
-
-DESCRIPTION_python-stringold="Python Deprecated String APIs"
-PR_python-stringold="ml2"
-RDEPENDS_python-stringold="python-core"
-FILES_python-stringold="${libdir}/python2.3/lib-dynload/strop.so ${libdir}/python2.3/string.* "
-
-DESCRIPTION_python-compile="Python Bytecode Compilation Support"
-PR_python-compile="ml2"
-RDEPENDS_python-compile="python-core"
-FILES_python-compile="${libdir}/python2.3/py_compile.* ${libdir}/python2.3/compileall.* "
-
-DESCRIPTION_python-shell="Python Shell-Like Functionality"
-PR_python-shell="ml2"
-RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="${libdir}/python2.3/commands.* ${libdir}/python2.3/dircache.* ${libdir}/python2.3/fnmatch.* ${libdir}/python2.3/glob.* ${libdir}/python2.3/popen2.* ${libdir}/python2.3/shutil.* "
-
-DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
-PR_python-mmap="ml2"
-RDEPENDS_python-mmap="python-core python-io"
-FILES_python-mmap="${libdir}/python2.3/lib-dynload/mmap.so "
-
-DESCRIPTION_python-zlib="Python zlib Support."
-PR_python-zlib="ml3"
-RDEPENDS_python-zlib="python-core libz1"
-FILES_python-zlib="${libdir}/python2.3/lib-dynload/zlib.so "
-
-DESCRIPTION_python-db="Python File-Based Database Support"
-PR_python-db="ml2"
-RDEPENDS_python-db="python-core"
-FILES_python-db="${libdir}/python2.3/anydbm.* ${libdir}/python2.3/dumbdbm.* ${libdir}/python2.3/whichdb.* "
-
-DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
-PR_python-crypt="ml2"
-RDEPENDS_python-crypt="python-core"
-FILES_python-crypt="${libdir}/python2.3/lib-dynload/crypt.so ${libdir}/python2.3/lib-dynload/md5.so ${libdir}/python2.3/lib-dynload/rotor.so ${libdir}/python2.3/lib-dynload/sha.so "
-
-DESCRIPTION_python-lang="Python Low-Level Language Support"
-PR_python-lang="ml2"
-RDEPENDS_python-lang="python-core"
-FILES_python-lang="${libdir}/python2.3/lib-dynload/array.so ${libdir}/python2.3/lib-dynload/parser.so ${libdir}/python2.3/lib-dynload/operator.so ${libdir}/python2.3/lib-dynload/_weakref.so ${libdir}/python2.3/atexit.* ${libdir}/python2.3/code.* ${libdir}/python2.3/codeop.* ${libdir}/python2.3/dis.* ${libdir}/python2.3/inspect.* ${libdir}/python2.3/keyword.* ${libdir}/python2.3/opcode.* ${libdir}/python2.3/repr.* ${libdir}/python2.3/token.* ${libdir}/python2.3/tokenize.* ${libdir}/python2.3/traceback.* ${libdir}/python2.3/linecache.* ${libdir}/python2.3/weakref.* "
-
-DESCRIPTION_python-audio="Python Audio Handling"
-PR_python-audio="ml2"
-RDEPENDS_python-audio="python-core"
-FILES_python-audio="${libdir}/python2.3/wave.* ${libdir}/python2.3/chunk.* ${libdir}/python2.3/lib-dynload/ossaudiodev.so ${libdir}/python2.3/lib-dynload/audioop.so "
-
-
-
diff --git a/packages/python/python-2.3.4/.mtn2git_empty b/packages/python/python-2.3.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/python/python-2.3.4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/python/python-2.3.4/autohell.patch b/packages/python/python-2.3.4/autohell.patch
deleted file mode 100644
index b0eebb9ce8..0000000000
--- a/packages/python/python-2.3.4/autohell.patch
+++ /dev/null
@@ -1,1209 +0,0 @@
---- 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)