[Libreoffice-commits] .: config_host.mk.in configure.in python/makefile.mk python/prj python/Python-2.6.1-cross.berkeleydb.patch python/Python-2.6.1-mingw.patch python/Python-2.6.2-bdb48.patch python/Python-2.6.2-cross.fix-configure.patch python/Python-2.6.2-cross.patch
David Tardon
dtardon at kemper.freedesktop.org
Sun Jun 17 08:37:07 PDT 2012
config_host.mk.in | 1
configure.in | 15
python/Python-2.6.1-cross.berkeleydb.patch | 15
python/Python-2.6.1-mingw.patch | 1269
python/Python-2.6.2-bdb48.patch | 163
python/Python-2.6.2-cross.fix-configure.patch |34111 ++++++++++++++++++++++++++
python/Python-2.6.2-cross.patch | 2029 +
python/makefile.mk | 38
python/prj/build.lst | 2
9 files changed, 36364 insertions(+), 1279 deletions(-)
New commits:
commit 794e2e601fcbed83e6f886db14f3754b68ae0311
Author: David Tardon <dtardon at redhat.com>
Date: Sat Jun 16 13:56:33 2012 +0200
(incomplete) attempt to build internal python with MinGW
Change-Id: I39c880e8615b164a66eb900c11b26da9d6489e02
diff --git a/config_host.mk.in b/config_host.mk.in
index 83ef204..ecc3042 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -424,6 +424,7 @@ export PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
export PTHREAD_LIBS=@PTHREAD_LIBS@
export PYTHON=@PYTHON@
export PYTHON_CFLAGS=@PYTHON_CFLAGS@
+export PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
export PYTHON_LIBS=@PYTHON_LIBS@
export RANLIB=@RANLIB@
export REDLAND_CFLAGS=@REDLAND_CFLAGS@
diff --git a/configure.in b/configure.in
index 8edae7c..011aa22 100644
--- a/configure.in
+++ b/configure.in
@@ -3543,8 +3543,8 @@ if test "$cross_compiling" = "yes"; then
cp config.log ../config.Build.log
sed -e 's,=\(.*\),="\1",' < config_host.mk > config_host.sh
. ./config_host.sh
- for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
- SYSTEM_LIBXSLT; do
+ for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
+ PYTHON SYSTEM_LIBXSLT; do
VV='$'$V
VV=`eval "echo $VV"`
if test -n "$VV"; then
@@ -3581,6 +3581,7 @@ else
CPUNAME_FOR_BUILD="$CPUNAME"
CPU_FOR_BUILD="$CPU"
CXX_FOR_BUILD="$CXX"
+ DISABLE_PYTHON_FOR_BUILD="$DISABLE_PYTHON"
GUIBASE_FOR_BUILD="$GUIBASE"
GUI_FOR_BUILD="$GUI"
INPATH_FOR_BUILD="$INPATH"
@@ -3588,6 +3589,7 @@ else
OS_FOR_BUILD="$OS"
OUTDIR_FOR_BUILD="$OUTDIR"
OUTPATH_FOR_BUILD="$OUTPATH"
+ PYTHON_FOR_BUILD="$PYTHON"
WORKDIR_FOR_BUILD="$WORKDIR"
fi
AC_SUBST(COM_FOR_BUILD)
@@ -3601,6 +3603,7 @@ AC_SUBST(CXX_FOR_BUILD)
AC_SUBST(INPATH_FOR_BUILD)
AC_SUBST(OUTPATH_FOR_BUILD)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
+AC_SUBST([PYTHON_FOR_BUILD])
AC_SUBST(OUTDIR_FOR_BUILD)
AC_SUBST(WORKDIR_FOR_BUILD)
@@ -6728,6 +6731,14 @@ no)
;;
esac
+dnl Cross-build of python requires python that is runnable on the build
+dnl platform, because it is used in the build process
+if test "$cross_compiling" = yes; then
+ if test "$DISABLE_PYTHON" = no -a "$SYSTEM_PYTHON" = no -a "$DISABLE_PYTHON_FOR_BUILD" = yes; then
+ AC_MSG_ERROR([Cross-build of python requires python that is runnable on the build platform. You must not use --disable-python for the 'build' config.])
+ fi
+fi
+
AC_SUBST(SYSTEM_PYTHON)
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LIBS)
diff --git a/python/Python-2.6.1-cross.berkeleydb.patch b/python/Python-2.6.1-cross.berkeleydb.patch
new file mode 100644
index 0000000..e6783f6
--- /dev/null
+++ b/python/Python-2.6.1-cross.berkeleydb.patch
@@ -0,0 +1,15 @@
+--- misc/build/Python-2.6.1/Modules/Setup.dist (revision 74955)
++++ misc/build/Python-2.6.1/Modules/Setup.dist (working copy)
+@@ -413,9 +413,9 @@
+ # and the subdirectory of PORT where you built it.
+ DB=$(prefix)
+ DBLIBVER=4.8
+-DBINC=$(DB)/include
+-DBLIB=$(DB)/lib
+-_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
++DBINC=$(OUTDIR)/inc/berkeleydb
++DBLIB=$(OUTDIR)/lib
++_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb47
+
+ # Historical Berkeley DB 1.85
+ #
diff --git a/python/Python-2.6.1-mingw.patch b/python/Python-2.6.1-mingw.patch
deleted file mode 100644
index 26bc4cb..0000000
--- a/python/Python-2.6.1-mingw.patch
+++ /dev/null
@@ -1,1269 +0,0 @@
---- misc/Python-2.6.1/Include/pyport.h 2008-06-11 16:41:16.000000000 +0900
-+++ misc/build/Python-2.6.1/Include/pyport.h 2009-03-29 23:28:13.859000000 +0900
-@@ -3,6 +3,30 @@
-
- #include "pyconfig.h" /* include for defines */
-
-+#if defined(__MINGW32__)
-+#undef HAVE_FORKPTY
-+#undef HAVE_OPENPTY
-+#undef HAVE_DEV_PTMX
-+#undef _POSIX_THREADS
-+#undef HAVE_PTHREAD_H
-+#define MS_WINDOWS
-+#define MS_WIN32
-+#define Py_WIN_WIDE_FILENAMES
-+#ifndef PYTHONPATH
-+# define PYTHONPATH ".\\lib;.\\lib\\python" VERSION ";.\\lib\\python" VERSION "\\lib-dynload;.\\lib\\python" VERSION "\\plat-winmingw32;.\\lib\\python" VERSION "\\lib-tk"
-+#endif
-+#define NT_THREADS
-+#define WITH_THREAD
-+#define WINVER 0x0501
-+#ifdef socklen_t
-+#undef socklen_t
-+#endif
-+#define HAVE_ADDRINFO
-+#define HAVE_GETADDRINFO
-+#define HAVE_GETNAMEINFO
-+#define HAVE_GETPEERNAME
-+#endif
-+
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
- #endif
---- misc/Python-2.6.1/Lib/distutils/ccompiler.py 2008-02-22 03:18:37.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/distutils/ccompiler.py 2009-04-04 01:00:37.014250000 +0900
-@@ -1058,6 +1058,7 @@
- # on a cygwin built python we can use gcc like an ordinary UNIXish
- # compiler
- ('cygwin.*', 'unix'),
-+ ('winmingw*', 'unix'),
- ('os2emx', 'emx'),
-
- # OS name mappings
---- misc/Python-2.6.1/Lib/distutils/command/build_ext.py 2008-08-17 13:16:04.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/distutils/command/build_ext.py 2009-04-04 01:05:32.311125000 +0900
-@@ -223,7 +223,7 @@
-
- # for extensions under Cygwin and AtheOS Python's library directory must be
- # appended to library_dirs
-- if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
-+ if sys.platform[:6] == 'cygwin' or sys.platform[:8] == 'winmingw' or sys.platform[:6] == 'atheos':
- if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
- # building third party extensions
- self.library_dirs.append(os.path.join(sys.prefix, "lib",
-@@ -729,7 +729,7 @@
- # don't extend ext.libraries, it may be shared with other
- # extensions, it is a reference to the original list
- return ext.libraries + [pythonlib]
-- elif sys.platform[:6] == "cygwin":
-+ elif sys.platform[:6] == "cygwin" or sys.platform[:8] == "winmingw":
- template = "python%d.%d"
- pythonlib = (template %
- (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
---- misc/Python-2.6.1/Lib/distutils/command/install.py 2008-05-07 07:41:46.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/distutils/command/install.py 2009-04-05 23:15:56.540750000 +0900
-@@ -362,9 +362,10 @@
-
- # Convert directories from Unix /-separated syntax to the local
- # convention.
-- self.convert_paths('lib', 'purelib', 'platlib',
-- 'scripts', 'data', 'headers',
-- 'userbase', 'usersite')
-+ if os.sep != '/':
-+ self.convert_paths('lib', 'purelib', 'platlib',
-+ 'scripts', 'data', 'headers',
-+ 'userbase', 'usersite')
-
- # Well, we're not actually fully completely finalized yet: we still
- # have to deal with 'extra_path', which is the hack for allowing
-@@ -376,7 +377,7 @@
-
- # If a new root directory was supplied, make all the installation
- # dirs relative to it.
-- if self.root is not None:
-+ if self.root is not None and self.root != "":
- self.change_roots('libbase', 'lib', 'purelib', 'platlib',
- 'scripts', 'data', 'headers')
-
-@@ -515,7 +516,10 @@
- def convert_paths (self, *names):
- for name in names:
- attr = "install_" + name
-- setattr(self, attr, convert_path(getattr(self, attr)))
-+ if self.root is None or self.root == "":
-+ setattr(self, attr, getattr(self, attr).replace('/', os.sep))
-+ else:
-+ setattr(self, attr, convert_path(getattr(self, attr)))
-
-
- def handle_extra_path (self):
---- misc/Python-2.6.1/Lib/distutils/spawn.py 2004-11-11 07:23:15.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/distutils/spawn.py 2009-03-22 19:38:32.935625000 +0900
-@@ -186,7 +186,7 @@
- path = os.environ['PATH']
- paths = string.split(path, os.pathsep)
- (base, ext) = os.path.splitext(executable)
-- if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
-+ if (sys.platform == 'win32' or sys.platform[:8] == "winmingw" or os.name == 'os2') and (ext != '.exe'):
- executable = executable + '.exe'
- if not os.path.isfile(executable):
- for p in paths:
---- misc/Python-2.6.1/Lib/distutils/sysconfig.py 2008-06-05 21:58:24.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/distutils/sysconfig.py 2009-03-29 10:56:10.965750000 +0900
-@@ -381,6 +381,9 @@
-
- raise DistutilsPlatformError(my_msg)
-
-+ if sys.platform[:8] == "winmingw":
-+ g['SO'] = '.pyd'
-+
- # On MacOSX we need to check the setting of the environment variable
- # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
- # it needs to be compatible.
-@@ -510,6 +513,9 @@
- global _config_vars
- if _config_vars is None:
- func = globals().get("_init_" + os.name)
-+ if sys.platform[:8] == "winmingw":
-+ func = globals().get("_init_posix")
-+
- if func:
- func()
- else:
---- misc/Python-2.6.1/Lib/distutils/unixccompiler.py 2008-07-16 22:24:06.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/distutils/unixccompiler.py 2009-04-04 01:11:18.420500000 +0900
-@@ -139,7 +139,7 @@
- shared_lib_extension = ".so"
- dylib_lib_extension = ".dylib"
- static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
-- if sys.platform == "cygwin":
-+ if sys.platform == "cygwin" or sys.platform == "winmingw":
- exe_extension = ".exe"
-
- def preprocess(self, source,
---- misc/Python-2.6.1/Lib/os.py 2008-09-02 14:36:11.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/os.py 2009-03-22 16:55:18.356375000 +0900
-@@ -38,7 +38,21 @@
- except AttributeError:
- return [n for n in dir(module) if n[0] != '_']
-
--if 'posix' in _names:
-+if 'winmingw32' in _names:
-+ name = 'nt'
-+ linesep = '\r\n'
-+ from posix import *
-+ try:
-+ from posix import _exit
-+ except ImportError:
-+ pass
-+ import ntpath as path
-+
-+ import posix
-+ __all__.extend(_get_exports_list(posix))
-+ del posix
-+
-+elif 'posix' in _names:
- name = 'posix'
- linesep = '\n'
- from posix import *
---- misc/Python-2.6.1/Lib/socket.py 2008-08-08 13:27:28.000000000 +0900
-+++ misc/build/Python-2.6.1/Lib/socket.py 2009-04-02 00:40:46.941750000 +0900
-@@ -148,7 +148,7 @@
- 'sendall', 'setblocking',
- 'settimeout', 'gettimeout', 'shutdown')
-
--if os.name == "nt":
-+if os.name == "nt" and sys.platform[:8] != "winmingw":
- _socketmethods = _socketmethods + ('ioctl',)
-
- if sys.platform == "riscos":
---- misc/Python-2.6.1/Makefile.pre.in 2008-10-22 01:48:37.000000000 +0900
-+++ misc/build/Python-2.6.1/Makefile.pre.in 2009-04-08 23:38:27.989250000 +0900
-@@ -105,6 +105,16 @@
- LDSHARED= @LDSHARED@
- BLDSHARED= @BLDSHARED@
- DESTSHARED= $(BINLIBDEST)/lib-dynload
-+ifeq (@MACHDEP@,winmingw32)
-+DESTSHAREDFORRULES= $(shell cd $(DESTSHARED) && pwd || echo DESTSHARED)
-+LIBPYTHONPATH= $(shell cd $(DESTDIR)$(LIBDEST) && cmd /c cd | sed -e s:\\\\:/:g)
-+DESTPYTHONPATH= $(LIBPYTHONPATH);$(shell cd $(DESTDIR)$(DESTSHARED) && cmd /c cd | sed -e s:\\\\:/:g)
-+LIBDESTPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(LIBDEST) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(LIBDEST) ; fi)
-+PREFIXPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(prefix) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(prefix) ; fi)
-+BINDIRPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(BINDIR) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(BINDIR) ; fi)
-+DESTSHAREDPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(DESTSHARED) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(DESTSHARED) ; fi)
-+DESTDIRPARAM= $(shell if test ! -z "$(DESTDIR)" ; then cd $(DESTDIR) && cmd /c | sed -e s:\\\\:/:g ; fi)
-+endif
-
- # Executable suffix (.exe on Windows and Mac OS X)
- EXE= @EXEEXT@
-@@ -187,7 +197,7 @@
- # Modules
- MODULE_OBJS= \
- Modules/config.o \
-- Modules/getpath.o \
-+ @GETPATH_OBJS@ \
- Modules/main.o \
- Modules/gcmodule.o
-
-@@ -507,6 +517,10 @@
- -DVPATH='"$(VPATH)"' \
- -o $@ $(srcdir)/Modules/getpath.c
-
-+PC/getpathp.o: $(srcdir)/PC/getpathp.c Makefile
-+ $(CC) -c $(PY_CFLAGS) -DVERSION='"$(VERSION)"' \
-+ -o $@ $(srcdir)/PC/getpathp.c
-+
- Modules/python.o: $(srcdir)/Modules/python.c
- $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
-
-@@ -544,6 +558,12 @@
- Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
- $(srcdir)/Objects/unicodetype_db.h
-
-+Objects/exceptions.o: $(srcdir)/Objects/exceptions.c
-+ $(CC) -c $(PY_CFLAGS) -I$(srcdir)/PC -o $@ $(srcdir)/Objects/exceptions.c
-+
-+PC/import_nt.o: $(srcdir)/PC/import_nt.c
-+ $(CC) -c $(PY_CFLAGS) -I$(srcdir)/Python -o $@ $(srcdir)/PC/import_nt.c
-+
- STRINGLIB_HEADERS= \
- $(srcdir)/Include/bytes_methods.h \
- $(srcdir)/Objects/stringlib/count.h \
-@@ -727,7 +747,11 @@
- # Install shared libraries enabled by Setup
- DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
-
-+ifeq (@MACHDEP@,winmingw32)
-+oldsharedinstall: $(DESTSHAREDFORRULES) $(SHAREDMODS)
-+else
- oldsharedinstall: $(DESTSHARED) $(SHAREDMODS)
-+endif
- @for i in X $(SHAREDMODS); do \
- if test $$i != X; then \
- echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
-@@ -735,7 +759,11 @@
- fi; \
- done
-
-+ifeq (@MACHDEP@,winmingw32)
-+$(DESTSHAREDFORRULES):
-+else
- $(DESTSHARED):
-+endif
- @for i in $(DESTDIRS); \
- do \
- if test ! -d $(DESTDIR)$$i; then \
-@@ -822,7 +850,11 @@
- multiprocessing multiprocessing/dummy \
- lib-old \
- curses $(MACHDEPS)
-+ifeq (@MACHDEP@,winmingw32)
-+libinstall: build_all $(srcdir)/Lib/$(PLATDIR) sharedinstall
-+else
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
-+endif
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
- if test ! -d $(DESTDIR)$$i; then \
-@@ -878,6 +910,26 @@
- done; \
- done
- $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
-+ifeq (@MACHDEP@,winmingw32)
-+ PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -tt $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM) -f \
-+ -x 'bad_coding|badsyntax|site-packages' $(LIBPYTHONPATH)
-+ PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -tt -O $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM) -f \
-+ -x 'bad_coding|badsyntax|site-packages' $(LIBPYTHONPATH)
-+ -PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -t $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM)/site-packages -f \
-+ -x badsyntax $(LIBPYTHONPATH)/site-packages
-+ -PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -t -O $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM)/site-packages -f \
-+ -x badsyntax $(LIBPYTHONPATH)/site-packages
-+ -PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
-+else
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
-@@ -896,16 +948,19 @@
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
-+endif
-
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
- mkdir $(srcdir)/Lib/$(PLATDIR)
-+ifneq (@MACHDEP@,winmingw32)
- cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
- export PATH; PATH="`pwd`:$$PATH"; \
- export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
- export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
- export EXE; EXE="$(BUILDEXE)"; \
- cd $(srcdir)/Lib/$(PLATDIR); ./regen
-+endif
-
- # Install the include files
- INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -992,12 +1047,21 @@
-
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
-+ifeq (@MACHDEP@,winmingw32)
-+sharedinstall: $(DESTSHAREDFORRULES)
-+ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
-+ --prefix=$(PREFIXPARAM) \
-+ --install-scripts=$(BINDIRPARAM) \
-+ --install-platlib=$(DESTSHAREDPARAM) \
-+ --root=$(DESTDIRPARAM)
-+else
- sharedinstall:
- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
- --prefix=$(prefix) \
- --install-scripts=$(BINDIR) \
- --install-platlib=$(DESTSHARED) \
- --root=/$(DESTDIR)
-+endif
-
- # Here are a couple of targets for MacOSX again, to install a full
- # framework-based Python. frameworkinstall installs everything, the
---- misc/Python-2.6.1/Modules/Setup.config.in 2002-12-13 02:37:50.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/Setup.config.in 2009-03-21 18:46:57.988875000 +0900
-@@ -9,5 +9,9 @@
- # The signal module
- @USE_SIGNAL_MODULE at signal signalmodule.c
-
-+# The password module
-+ at USE_PASSWORD_MODULE@pwd pwdmodule.c # this is needed to find out the user's home dir
-+ # if $HOME is not set
-+
- # The rest of the modules previously listed in this file are built
- # by the setup.py script in Python 2.1 and later.
---- misc/Python-2.6.1/Modules/Setup.dist 2008-11-27 19:15:12.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/Setup.dist 2009-03-21 18:46:53.785750000 +0900
-@@ -114,7 +114,7 @@
-
- posix posixmodule.c # posix (UNIX) system calls
- errno errnomodule.c # posix (UNIX) errno values
--pwd pwdmodule.c # this is needed to find out the user's home dir
-+#pwd pwdmodule.c # this is needed to find out the user's home dir
- # if $HOME is not set
- _sre _sre.c # Fredrik Lundh's new regular expressions
- _codecs _codecsmodule.c # access to the builtin codecs and codec registry
---- misc/Python-2.6.1/Modules/_ctypes/libffi/configure 2008-05-24 00:06:50.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure 2009-04-05 08:30:43.964750000 +0900
-@@ -22707,19 +22707,41 @@
- multilib_arg=
- fi
-
-+case $host_os in
-+mingw*)
-+ srcdir=`cd $srcdir && cmd /c cd | sed -e 's:\\\\:/:g'`
-+ ;;
-+esac
-+
- ac_config_commands="$ac_config_commands include"
-
- ac_config_commands="$ac_config_commands src"
-
-
-+case $host_os in
-+mingw*)
-+ac_config_commands="$ac_config_commands mingw_ffitarget.h"
-+
-+;;
-+*)
- ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h"
-
-+;;
-+esac
-
- ac_config_files="$ac_config_files include/ffi.h"
-
-
-+case $host_os in
-+mingw*)
-+ac_config_commands="$ac_config_commands mingw_ffi_common.h"
-+
-+;;
-+*)
- ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
-
-+;;
-+esac
-
- ac_config_files="$ac_config_files fficonfig.py"
-
-@@ -23506,8 +23528,10 @@
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;;
- "src") CONFIG_COMMANDS="$CONFIG_COMMANDS src" ;;
-+ "mingw_ffitarget.h") CONFIG_COMMANDS="$CONFIG_COMMANDS mingw_ffitarget.h" ;;
- "include/ffitarget.h") CONFIG_LINKS="$CONFIG_LINKS include/ffitarget.h:src/$TARGETDIR/ffitarget.h" ;;
- "include/ffi.h") CONFIG_FILES="$CONFIG_FILES include/ffi.h" ;;
-+ "mingw_ffi_common.h") CONFIG_COMMANDS="$CONFIG_COMMANDS mingw_ffi_common.h" ;;
- "include/ffi_common.h") CONFIG_LINKS="$CONFIG_LINKS include/ffi_common.h:include/ffi_common.h" ;;
- "fficonfig.py") CONFIG_FILES="$CONFIG_FILES fficonfig.py" ;;
-
-@@ -24386,6 +24410,16 @@
- test -d src || mkdir src
- test -d src/$TARGETDIR || mkdir src/$TARGETDIR
- ;;
-+ "mingw_ffitarget.h":C)
-+{ echo "$as_me:$LINENO: copying $srcdir/src/$TARGETDIR/ffitarget.h to include/ffitarget.h" >&5
-+echo "$as_me: copying $srcdir/src/$TARGETDIR/ffitarget.h to include/ffitarget.h" >&6;}
-+cp -p $srcdir/src/$TARGETDIR/ffitarget.h include/ffitarget.h
-+ ;;
-+ "mingw_ffi_common.h":C)
-+{ echo "$as_me:$LINENO: copying $srcdir/include/ffi_common.h to include/ffi_common.h" >&5
-+echo "$as_me: copying $srcdir/include/ffi_common.h to include/ffi_common.h" >&6;}
-+cp -p $srcdir/include/ffi_common.h include/ffi_common.h
-+ ;;
-
- esac
- done # for ac_tag
---- misc/Python-2.6.1/Modules/_ctypes/libffi/configure.ac 2008-05-24 00:06:50.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure.ac 2009-04-05 08:30:27.527250000 +0900
-@@ -358,17 +358,43 @@
- multilib_arg=
- fi
-
-+case $host_os in
-+mingw*)
-+ srcdir=`cd $srcdir && cmd /c cd | sed -e 's:\\\\:/:g'`
-+ ;;
-+esac
-+
- AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
- AC_CONFIG_COMMANDS(src, [
- test -d src || mkdir src
- test -d src/$TARGETDIR || mkdir src/$TARGETDIR
- ], [TARGETDIR="$TARGETDIR"])
-
-+case $host_os in
-+mingw*)
-+AC_CONFIG_COMMANDS(mingw_ffitarget.h, [
-+AC_MSG_NOTICE(copying $srcdir/src/$TARGETDIR/ffitarget.h to include/ffitarget.h)
-+cp -p $srcdir/src/$TARGETDIR/ffitarget.h include/ffitarget.h
-+])
-+;;
-+*)
- AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
-+;;
-+esac
-
- AC_CONFIG_FILES(include/ffi.h)
-
-+case $host_os in
-+mingw*)
-+AC_CONFIG_COMMANDS(mingw_ffi_common.h, [
-+AC_MSG_NOTICE(copying $srcdir/include/ffi_common.h to include/ffi_common.h)
-+cp -p $srcdir/include/ffi_common.h include/ffi_common.h
-+])
-+;;
-+*)
- AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
-+;;
-+esac
-
- AC_CONFIG_FILES(fficonfig.py)
-
---- misc/Python-2.6.1/Modules/_ctypes/libffi/include/ffi.h.in 2008-04-05 01:01:54.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/include/ffi.h.in 2009-03-24 20:53:04.519875000 +0900
-@@ -350,7 +350,11 @@
- ffi_type *rtype,
- ffi_type **atypes);
-
-+#ifdef MS_WIN32
-+int ffi_call(ffi_cif *cif,
-+#else
- void ffi_call(ffi_cif *cif,
-+#endif
- void (*fn)(void),
- void *rvalue,
- void **avalue);
---- misc/Python-2.6.1/Modules/config.c.in 2008-09-19 08:20:28.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/config.c.in 2009-03-22 16:28:09.418875000 +0900
-@@ -48,6 +48,9 @@
- {"__builtin__", NULL},
- {"sys", NULL},
- {"exceptions", NULL},
-+#ifdef __MINGW32__
-+ {"winmingw32", NULL},
-+#endif
-
- /* This lives in gcmodule.c */
- {"gc", initgc},
---- misc/Python-2.6.1/Modules/posixmodule.c 2008-10-10 03:06:58.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/posixmodule.c 2009-03-22 20:04:01.404375000 +0900
-@@ -131,6 +131,15 @@
- #define HAVE_FSYNC 1
- #define fsync _commit
- #else
-+#ifdef __MINGW32__
-+#define HAVE_SPAWNV 1
-+#define HAVE_EXECV 1
-+#define HAVE_GETCWD 1
-+#define HAVE_OPENDIR 1
-+#define HAVE_PIPE 1
-+#define HAVE_POPEN 1
-+#define HAVE_SYSTEM 1
-+#else
- #if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS)
- /* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */
- #else /* all other compilers */
-@@ -156,6 +165,7 @@
- #define HAVE_WAIT 1
- #define HAVE_TTYNAME 1
- #endif /* PYOS_OS2 && PYCC_GCC && __VMS */
-+#endif /* __MINGW32__ */
- #endif /* _MSC_VER */
- #endif /* __BORLANDC__ */
- #endif /* ! __WATCOMC__ || __QNX__ */
-@@ -275,6 +285,14 @@
- #define pclose _pclose
- #endif /* _MSC_VER */
-
-+#ifdef __MINGW32__
-+#include "osdefs.h"
-+#include <windows.h>
-+#include <shellapi.h> /* for ShellExecute() */
-+#define popen _popen
-+#define pclose _pclose
-+#endif
-+
- #if defined(PYCC_VACPP) && defined(PYOS_OS2)
- #include <io.h>
- #endif /* OS2 */
-@@ -350,7 +368,7 @@
- */
- #include <crt_externs.h>
- static char **environ;
--#elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) )
-+#elif !defined(_MSC_VER) && !defined(__MINGW32__) && ( !defined(__WATCOMC__) || defined(__QNX__) )
- extern char **environ;
- #endif /* !_MSC_VER */
-
-@@ -775,7 +793,7 @@
- int st_ctime_nsec;
- };
-
--static __int64 secs_between_epochs = 11644473600; /* Seconds between 1.1.1601 and 1.1.1970 */
-+static __int64 secs_between_epochs = 11644473600LL; /* Seconds between 1.1.1601 and 1.1.1970 */
-
- static void
- FILE_TIME_to_time_t_nsec(FILETIME *in_ptr, int *time_out, int* nsec_out)
-@@ -8189,7 +8207,7 @@
- }
- #endif
-
--#ifdef MS_WINDOWS
-+#if defined(MS_WINDOWS) && !defined(__MINGW32__)
-
- PyDoc_STRVAR(win32_urandom__doc__,
- "urandom(n) -> str\n\n\
-@@ -8605,7 +8623,7 @@
- #ifdef HAVE_GETLOADAVG
- {"getloadavg", posix_getloadavg, METH_NOARGS, posix_getloadavg__doc__},
- #endif
-- #ifdef MS_WINDOWS
-+ #if defined(MS_WINDOWS) && !defined(__MINGW32__)
- {"urandom", win32_urandom, METH_VARARGS, win32_urandom__doc__},
- #endif
- #ifdef __VMS
---- misc/Python-2.6.1/Modules/socketmodule.c 2008-08-12 23:49:50.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/socketmodule.c 2009-03-29 20:55:19.750375000 +0900
-@@ -312,7 +312,7 @@
- /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
- * EAI_* constants are defined in (the already included) ws2tcpip.h.
- */
--#else
-+#elif !defined(__MINGW32__)
- # include "addrinfo.h"
- #endif
-
---- misc/Python-2.6.1/PC/_winreg.c 2008-06-09 13:58:54.000000000 +0900
-+++ misc/build/Python-2.6.1/PC/_winreg.c 2009-04-12 18:25:01.944250000 +0900
-@@ -1630,6 +1630,9 @@
- }
-
- #define ADD_KEY(val) inskey(d, #val, val)
-+#ifndef REG_LEGAL_CHANGE_FILTER
-+#define REG_LEGAL_CHANGE_FILTER (REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_ATTRIBUTES|REG_NOTIFY_CHANGE_LAST_SET|REG_NOTIFY_CHANGE_SECURITY)
-+#endif
-
- PyMODINIT_FUNC init_winreg(void)
- {
---- misc/Python-2.6.1/Python/dynload_win.c 2008-01-24 02:15:06.000000000 +0900
-+++ misc/build/Python-2.6.1/Python/dynload_win.c 2009-03-21 22:05:59.683125000 +0900
-@@ -24,6 +24,7 @@
- /* Case insensitive string compare, to avoid any dependencies on particular
- C RTL implementations */
-
-+#ifndef __MINGW32__
- static int strcasecmp (char *string1, char *string2)
- {
- int first, second;
-@@ -37,6 +38,7 @@
-
- return (first - second);
- }
-+#endif
-
-
- /* Function to return the name of the "python" DLL that the supplied module
---- misc/Python-2.6.1/Python/frozenmain.c 2002-07-01 00:26:10.000000000 +0900
-+++ misc/build/Python-2.6.1/Python/frozenmain.c 2009-03-22 15:36:03.993875000 +0900
-@@ -3,7 +3,7 @@
-
- #include "Python.h"
-
--#ifdef MS_WINDOWS
-+#if defined(MS_WINDOWS) && !defined(__MINGW32__)
- extern void PyWinFreeze_ExeInit(void);
- extern void PyWinFreeze_ExeTerm(void);
- extern int PyInitFrozenExtensions(void);
-@@ -32,12 +32,12 @@
- setbuf(stderr, (char *)NULL);
- }
-
--#ifdef MS_WINDOWS
-+#if defined(MS_WINDOWS) && !defined(__MINGW32__)
- PyInitFrozenExtensions();
- #endif /* MS_WINDOWS */
- Py_SetProgramName(argv[0]);
- Py_Initialize();
--#ifdef MS_WINDOWS
-+#if defined(MS_WINDOWS) && !defined(__MINGW32__)
- PyWinFreeze_ExeInit();
- #endif
-
-@@ -60,7 +60,7 @@
- if (inspect && isatty((int)fileno(stdin)))
- sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
-
--#ifdef MS_WINDOWS
-+#if defined(MS_WINDOWS) && !defined(__MINGW32__)
- PyWinFreeze_ExeTerm();
- #endif
- Py_Finalize();
---- misc/Python-2.6.1/configure 2008-11-17 02:57:10.000000000 +0900
-+++ misc/build/Python-2.6.1/configure 2009-04-11 16:57:56.149375000 +0900
-@@ -719,8 +719,10 @@
- USE_THREAD_MODULE
- LDLAST
- THREADOBJ
-+USE_PASSWORD_MODULE
- DLINCLDIR
- DYNLOADFILE
-+GETPATH_OBJS
- MACHDEP_OBJS
- TRUE
- LIBOBJS
-@@ -2201,6 +2203,13 @@
- LDFLAGS="$SGI_ABI $LDFLAGS"
- MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'`
- fi
-+case $MACHDEP in
-+ *mingw*|*MINGW*|*MinGW*)
-+ MACHDEP="winmingw32"
-+ ac_sys_system=`uname -s`
-+ ac_sys_release=`uname -r`
-+ ;;
-+esac
- { echo "$as_me:$LINENO: result: $MACHDEP" >&5
- echo "${ECHO_T}$MACHDEP" >&6; }
-
-@@ -3995,7 +4004,7 @@
- if test -z "$enable_shared"
- then
- case $ac_sys_system in
-- CYGWIN* | atheos*)
-+ CYGWIN* | MINGW* | atheos*)
- enable_shared="yes";;
- *)
- enable_shared="no";;
-@@ -4096,7 +4105,7 @@
- BeOS*)
- LDLIBRARY='libpython$(VERSION).so'
- ;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- LDLIBRARY='libpython$(VERSION).dll.a'
- DLLLIBRARY='libpython$(VERSION).dll'
- ;;
-@@ -4142,7 +4151,7 @@
- esac
- else # shared is disabled
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- BLDLIBRARY='$(LIBRARY)'
- LDLIBRARY='libpython$(VERSION).dll.a'
- ;;
-@@ -12645,6 +12654,10 @@
- _ACEOF
-
-
-+ac_cv_sizeof_off_t=`echo $ac_cv_sizeof_off_t | tr -d '\015'`
-+ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
-+ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
-+ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
- { echo "$as_me:$LINENO: checking whether to enable large file support" >&5
- echo $ECHO_N "checking whether to enable large file support... $ECHO_C" >&6; }
- if test "$have_long_long" = yes -a \
-@@ -12985,7 +12998,7 @@
- *) SO=.sl;;
- esac
- ;;
-- CYGWIN*) SO=.dll;;
-+ CYGWIN* | MINGW*) SO=.dll;;
- *) SO=.so;;
- esac
- else
-@@ -13113,7 +13126,7 @@
- fi;;
- SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport';;
- Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
-- CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
-+ CYGWIN* | MINGW*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base ${LDFLAGS}";;
- atheos*) LDSHARED="gcc -shared";;
- *) LDSHARED="ld";;
- esac
-@@ -13205,7 +13218,7 @@
- LINKFORSHARED="-Xlinker --export-dynamic"
- fi;;
- esac;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- if test $enable_shared = "no"
- then
- LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
-@@ -13229,7 +13242,7 @@
- if test ! "$LIBRARY" = "$LDLIBRARY"
- then
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- # Cygwin needs CCSHARED when building extension DLLs
- # but not when building the interpreter DLL.
- CFLAGSFORSHARED='';;
-@@ -15443,7 +15456,7 @@
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_BROKEN_PTHREAD_SIGMASK 1
-@@ -15457,6 +15470,17 @@
- fi
-
-
-+case $MACHDEP in
-+winmingw*)
-+ THREADOBJ="Python/thread.o"
-+ USE_THREAD_MODULE="#"
-+ USE_PASSWORD_MODULE="#"
-+ ;;
-+*)
-+ USE_PASSWORD_MODULE=""
-+ ;;
-+esac
-+
- # Check for enable-ipv6
-
-
-@@ -16057,6 +16081,11 @@
- # Use dynload_next.c only on 10.2 and below, which don't have native dlopen()
- Darwin/[0156]\..*) DYNLOADFILE="dynload_next.o";;
- atheos*) DYNLOADFILE="dynload_atheos.o";;
-+ CYGWIN* | MINGW*)
-+ case $MACHDEP in
-+ winmingw*) DYNLOADFILE="dynload_win.o PC/import_nt.o PC/dl_nt.o";;
-+ esac
-+ ;;
- *)
- # use dynload_shlib.c and dlopen() if we have it; otherwise stub
- # out any dynamic loading
-@@ -16078,6 +16107,21 @@
-
- fi
-
-+
-+{ echo "$as_me:$LINENO: checking GETPATH_OBJS" >&5
-+echo $ECHO_N "checking GETPATH_OBJS... $ECHO_C" >&6; }
-+if test -z "$GETPATH_OBJS"
-+then
-+ case $MACHDEP in
-+ winmingw*)
-+ GETPATH_OBJS='PC/getpathp.o';;
-+ *)
-+ GETPATH_OBJS='Modules/getpath.o';;
-+ esac
-+fi
-+{ echo "$as_me:$LINENO: result: $GETPATH_OBJS" >&5
-+echo "${ECHO_T}$GETPATH_OBJS" >&6; }
-+
- # MACHDEP_OBJS can be set to platform-specific object files needed by Python
-
-
-@@ -19952,6 +19996,112 @@
-
- fi
-
-+case $MACHDEP in
-+winmingw*)
-+{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
-+echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
-+if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static struct stat ac_aggr;
-+if (ac_aggr.st_blocks)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_member_struct_stat_st_blocks=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+static struct stat ac_aggr;
-+if (sizeof ac_aggr.st_blocks)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_member_struct_stat_st_blocks=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_member_struct_stat_st_blocks=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
-+if test $ac_cv_member_struct_stat_st_blocks = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-+_ACEOF
-+
-+
-+fi
-+
-+;;
-+*)
- { echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
- echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
-@@ -20066,6 +20216,8 @@
- fi
-
-
-+;;
-+esac
-
- { echo "$as_me:$LINENO: checking for time.h that defines altzone" >&5
- echo $ECHO_N "checking for time.h that defines altzone... $ECHO_C" >&6; }
-@@ -22530,6 +22682,7 @@
-
-
-
-+ac_cv_sizeof_wchar_t=`echo $ac_cv_sizeof_wchar_t | tr -d '\015'`
-
- if test "$enable_unicode" = "no"
- then
-@@ -25368,8 +25521,10 @@
- USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
- LDLAST!$LDLAST$ac_delim
- THREADOBJ!$THREADOBJ$ac_delim
-+USE_PASSWORD_MODULE!$USE_PASSWORD_MODULE$ac_delim
- DLINCLDIR!$DLINCLDIR$ac_delim
- DYNLOADFILE!$DYNLOADFILE$ac_delim
-+GETPATH_OBJS!$GETPATH_OBJS$ac_delim
- MACHDEP_OBJS!$MACHDEP_OBJS$ac_delim
- TRUE!$TRUE$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
-@@ -25386,7 +25541,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- misc/Python-2.6.1/configure.in 2008-11-16 17:02:56.000000000 +0900
-+++ misc/build/Python-2.6.1/configure.in 2009-04-11 16:56:07.258750000 +0900
-@@ -359,6 +359,13 @@
- LDFLAGS="$SGI_ABI $LDFLAGS"
- MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'`
- fi
-+case $MACHDEP in
-+ *mingw*|*MINGW*|*MinGW*)
-+ MACHDEP="winmingw32"
-+ ac_sys_system=`uname -s`
-+ ac_sys_release=`uname -r`
-+ ;;
-+esac
- AC_MSG_RESULT($MACHDEP)
-
- # And add extra plat-mac for darwin
-@@ -643,7 +650,7 @@
- if test -z "$enable_shared"
- then
- case $ac_sys_system in
-- CYGWIN* | atheos*)
-+ CYGWIN* | MINGW* | atheos*)
- enable_shared="yes";;
- *)
- enable_shared="no";;
-@@ -694,7 +701,7 @@
- BeOS*)
- LDLIBRARY='libpython$(VERSION).so'
- ;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- LDLIBRARY='libpython$(VERSION).dll.a'
- DLLLIBRARY='libpython$(VERSION).dll'
- ;;
-@@ -740,7 +747,7 @@
- esac
- else # shared is disabled
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- BLDLIBRARY='$(LIBRARY)'
- LDLIBRARY='libpython$(VERSION).dll.a'
- ;;
-@@ -1402,6 +1409,10 @@
- AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
- [The number of bytes in an off_t.])
-
-+ac_cv_sizeof_off_t=`echo $ac_cv_sizeof_off_t | tr -d '\015'`
-+ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
-+ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
-+ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
- AC_MSG_CHECKING(whether to enable large file support)
- if test "$have_long_long" = yes -a \
- "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
-@@ -1581,7 +1592,7 @@
- *) SO=.sl;;
- esac
- ;;
-- CYGWIN*) SO=.dll;;
-+ CYGWIN* | MINGW*) SO=.dll;;
- *) SO=.so;;
- esac
- else
-@@ -1703,7 +1714,7 @@
- fi;;
- SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport';;
- Monterey*) LDSHARED="cc -G -dy -Bdynamic -Bexport -L/usr/lib/ia64l64";;
-- CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
-+ CYGWIN* | MINGW*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base ${LDFLAGS}";;
- atheos*) LDSHARED="gcc -shared";;
- *) LDSHARED="ld";;
- esac
-@@ -1791,7 +1802,7 @@
- LINKFORSHARED="-Xlinker --export-dynamic"
- fi;;
- esac;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- if test $enable_shared = "no"
- then
- LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
-@@ -1813,7 +1824,7 @@
- if test ! "$LIBRARY" = "$LDLIBRARY"
- then
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- # Cygwin needs CCSHARED when building extension DLLs
- # but not when building the interpreter DLL.
- CFLAGSFORSHARED='';;
-@@ -2149,13 +2160,24 @@
- fi
- AC_CHECK_FUNCS(pthread_sigmask,
- [case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- AC_DEFINE(HAVE_BROKEN_PTHREAD_SIGMASK, 1,
- [Define if pthread_sigmask() does not work on your system.])
- ;;
- esac])
- fi
-
-+AC_SUBST(USE_PASSWORD_MODULE)
-+case $MACHDEP in
-+winmingw*)
-+ THREADOBJ="Python/thread.o"
-+ USE_THREAD_MODULE="#"
-+ USE_PASSWORD_MODULE="#"
-+ ;;
-+*)
-+ USE_PASSWORD_MODULE=""
-+ ;;
-+esac
-
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
-@@ -2415,6 +2437,11 @@
- # Use dynload_next.c only on 10.2 and below, which don't have native dlopen()
- Darwin/@<:@0156@:>@\..*) DYNLOADFILE="dynload_next.o";;
- atheos*) DYNLOADFILE="dynload_atheos.o";;
-+ CYGWIN* | MINGW*)
-+ case $MACHDEP in
-+ winmingw*) DYNLOADFILE="dynload_win.o PC/import_nt.o PC/dl_nt.o";;
-+ esac
-+ ;;
- *)
- # use dynload_shlib.c and dlopen() if we have it; otherwise stub
- # out any dynamic loading
-@@ -2432,6 +2459,19 @@
- [Defined when any dynamic module loading is enabled.])
- fi
-
-+AC_SUBST(GETPATH_OBJS)
-+AC_MSG_CHECKING(GETPATH_OBJS)
-+if test -z "$GETPATH_OBJS"
-+then
-+ case $MACHDEP in
-+ winmingw*)
-+ GETPATH_OBJS='PC/getpathp.o';;
-+ *)
-+ GETPATH_OBJS='Modules/getpath.o';;
-+ esac
-+fi
-+AC_MSG_RESULT($GETPATH_OBJS)
-+
- # MACHDEP_OBJS can be set to platform-specific object files needed by Python
-
- AC_SUBST(MACHDEP_OBJS)
-@@ -2862,7 +2902,14 @@
- AC_CHECK_MEMBERS([struct stat.st_flags])
- AC_CHECK_MEMBERS([struct stat.st_gen])
- AC_CHECK_MEMBERS([struct stat.st_birthtime])
-+case $MACHDEP in
-+winmingw*)
-+AC_CHECK_MEMBERS([struct stat.st_blocks])
-+;;
-+*)
- AC_STRUCT_ST_BLOCKS
-+;;
-+esac
-
- AC_MSG_CHECKING(for time.h that defines altzone)
- AC_CACHE_VAL(ac_cv_header_time_altzone,
-@@ -3247,6 +3294,7 @@
- AH_TEMPLATE(PY_UNICODE_TYPE,
- [Define as the integral type used for Unicode representation.])
-
-+ac_cv_sizeof_wchar_t=`echo $ac_cv_sizeof_wchar_t | tr -d '\015'`
- AC_SUBST(UNICODE_OBJS)
- if test "$enable_unicode" = "no"
- then
---- misc/Python-2.6.1/setup.py 2008-11-05 05:43:31.000000000 +0900
-+++ misc/build/Python-2.6.1/setup.py 2009-04-12 16:02:22.654125000 +0900
-@@ -234,6 +234,18 @@
- if not self.configure_ctypes(ext):
- return
-
-+ if self.get_platform() == "winmingw":
-+ if ext.name == '_ctypes_test':
-+ ext.libraries.append('oleaut32')
-+ elif ext.name == 'select':
-+ ext.libraries.append('ws2_32')
-+ elif ext.name == '_socket':
-+ ext.libraries.append('ws2_32')
-+ if ext.name == '_ctypes':
-+ ext.libraries.append('uuid')
-+ ext.libraries.append('oleaut32')
-+ ext.libraries.append('ole32')
-+
- try:
- build_ext.build_extension(self, ext)
- except (CCompilerError, DistutilsError), why:
-@@ -263,7 +275,7 @@
-
- # Workaround for Cygwin: Cygwin currently has fork issues when many
- # modules have been imported
-- if self.get_platform() == 'cygwin':
-+ if self.get_platform() in ['cygwin', 'winmingw']:
- self.announce('WARNING: skipping import check for Cygwin-based "%s"'
- % ext.name)
- return
-@@ -303,7 +315,7 @@
-
- def get_platform(self):
- # Get value of sys.platform
-- for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
-+ for platform in ['cygwin', 'winmingw', 'beos', 'darwin', 'atheos', 'osf1']:
- if sys.platform.startswith(platform):
- return platform
- return sys.platform
-@@ -1009,7 +1021,7 @@
- missing.append('bsddb185')
-
- # The standard Unix dbm module:
-- if platform not in ['cygwin']:
-+ if platform not in ['cygwin', 'winmingw']:
- if find_file("ndbm.h", inc_dirs, []) is not None:
- # Some systems have -lndbm, others don't
- if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-@@ -1053,7 +1065,7 @@
- missing.append('resource')
-
- # Sun yellow pages. Some systems have the functions in libc.
-- if platform not in ['cygwin', 'atheos', 'qnx6']:
-+ if platform not in ['cygwin', 'winmingw', 'atheos', 'qnx6']:
- if (self.compiler.find_library_file(lib_dirs, 'nsl')):
- libs = ['nsl']
- else:
-@@ -1252,14 +1264,14 @@
- )
- libraries = []
-
-- elif platform == 'cygwin': # Cygwin
-+ elif platform in ['cygwin', 'winmingw']: # Cygwin
- macros = dict(
- HAVE_SEM_OPEN=1,
- HAVE_SEM_TIMEDWAIT=1,
- HAVE_FD_TRANSFER=0,
- HAVE_BROKEN_SEM_UNLINK=1
- )
-- libraries = []
-+ libraries = ['ws2_32']
-
- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
- # FreeBSD's P1003.1b semaphore support is very experimental
-@@ -1287,7 +1299,7 @@
- )
- libraries = ['rt']
-
-- if platform == 'win32':
-+ if platform in ['win32', 'winmingw']:
- multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
- '_multiprocessing/semaphore.c',
- '_multiprocessing/pipe_connection.c',
-@@ -1305,6 +1317,7 @@
-
- exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
- define_macros=macros.items(),
-+ libraries=libraries,
- include_dirs=["Modules/_multiprocessing"]))
- # End multiprocessing
-
-@@ -1423,6 +1436,10 @@
- '-framework', 'Carbon']) )
-
-
-+ if platform == 'winmingw':
-+ exts.append( Extension('_winreg', ['../PC/_winreg.c']) )
-+ exts.append( Extension('winsound', ['../PC/winsound.c'], libraries = ['winmm']) )
-+
- self.extensions.extend(exts)
-
- # Call the method for detecting whether _tkinter can be compiled
-@@ -1575,7 +1592,7 @@
- added_lib_dirs.append('/usr/X11/lib')
-
- # If Cygwin, then verify that X is installed before proceeding
-- if platform == 'cygwin':
-+ if platform in ['cygwin', 'winmingw']:
- x11_inc = find_file('X11/Xlib.h', [], include_dirs)
- if x11_inc is None:
- return
-@@ -1598,7 +1615,7 @@
- libs.append('ld')
-
- # Finally, link with the X11 libraries (not appropriate on cygwin)
-- if platform != "cygwin":
-+ if not platform in ["cygwin", "winmingw"]:
- libs.append('X11')
-
- ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-@@ -1669,6 +1686,8 @@
- from distutils.dir_util import mkpath
- mkpath(ffi_builddir)
- config_args = []
-+ if self.get_platform() == "winmingw":
-+ config_args.append(" --build=mingw32")
-
- # Pass empty CFLAGS because we'll just append the resulting
- # CFLAGS to Python's; -g or -O2 is to be avoided.
diff --git a/python/Python-2.6.2-bdb48.patch b/python/Python-2.6.2-bdb48.patch
new file mode 100644
index 0000000..61f450c
--- /dev/null
+++ b/python/Python-2.6.2-bdb48.patch
@@ -0,0 +1,163 @@
+Index: setup.py
+===================================================================
+--- misc/build/Python-2.6.1/setup.py (revision 74955)
++++ misc/build/Python-2.6.1/setup.py (working copy)
+@@ -695,7 +695,7 @@
+ # a release. Most open source OSes come with one or more
+ # versions of BerkeleyDB already installed.
+
+- max_db_ver = (4, 7)
++ max_db_ver = (4, 8)
+ min_db_ver = (3, 3)
+ db_setup_debug = False # verbose debug prints from this script?
+
+Index: Modules/_bsddb.c
+===================================================================
+--- misc/build/Python-2.6.1/Modules/_bsddb.c (revision 74955)
++++ misc/build/Python-2.6.1/Modules/_bsddb.c (working copy)
+@@ -215,7 +215,11 @@
+ #define DB_BUFFER_SMALL ENOMEM
+ #endif
+
++#if (DBVER < 48)
++#define DB_GID_SIZE DB_XIDDATASIZE
++#endif
+
++
+ /* --------------------------------------------------------------------- */
+ /* Structure definitions */
+
+@@ -4501,7 +4505,11 @@
+ DBTxnObject *txn;
+ #define PREPLIST_LEN 16
+ DB_PREPLIST preplist[PREPLIST_LEN];
++#if (DBVER < 48)
+ long retp;
++#else
++ u_int32_t retp;
++#endif
+
+ CHECK_ENV_NOT_CLOSED(self);
+
+@@ -4522,7 +4530,7 @@
+ flags=DB_NEXT; /* Prepare for next loop pass */
+ for (i=0; i<retp; i++) {
+ gid=PyBytes_FromStringAndSize((char *)(preplist[i].gid),
+- DB_XIDDATASIZE);
++ DB_GID_SIZE);
+ if (!gid) {
+ Py_DECREF(list);
+ return NULL;
+@@ -5047,6 +5055,7 @@
+ }
+
+
++#if (DBVER < 48)
+ static PyObject*
+ DBEnv_set_rpc_server(DBEnvObject* self, PyObject* args, PyObject* kwargs)
+ {
+@@ -5068,6 +5077,7 @@
+ RETURN_IF_ERR();
+ RETURN_NONE();
+ }
++#endif
+
+ static PyObject*
+ DBEnv_set_verbose(DBEnvObject* self, PyObject* args)
+@@ -5947,9 +5957,9 @@
+ if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
+ return NULL;
+
+- if (gid_size != DB_XIDDATASIZE) {
++ if (gid_size != DB_GID_SIZE) {
+ PyErr_SetString(PyExc_TypeError,
+- "gid must be DB_XIDDATASIZE bytes long");
++ "gid must be DB_GID_SIZE bytes long");
+ return NULL;
+ }
+
+@@ -6539,8 +6549,10 @@
+ #endif
+ {"set_get_returns_none",(PyCFunction)DBEnv_set_get_returns_none, METH_VARARGS},
+ {"txn_recover", (PyCFunction)DBEnv_txn_recover, METH_NOARGS},
++#if (DBVER < 48)
+ {"set_rpc_server", (PyCFunction)DBEnv_set_rpc_server,
+ METH_VARARGS||METH_KEYWORDS},
++#endif
+ {"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS},
+ #if (DBVER >= 42)
+ {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS},
+@@ -7089,6 +7101,7 @@
+ ADD_INT(d, DB_MAX_PAGES);
+ ADD_INT(d, DB_MAX_RECORDS);
+
++#if (DBVER < 48)
+ #if (DBVER >= 42)
+ ADD_INT(d, DB_RPCCLIENT);
+ #else
+@@ -7096,7 +7109,11 @@
+ /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */
+ _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
+ #endif
++#endif
++
++#if (DBVER < 48)
+ ADD_INT(d, DB_XA_CREATE);
++#endif
+
+ ADD_INT(d, DB_CREATE);
+ ADD_INT(d, DB_NOMMAP);
+@@ -7113,7 +7130,13 @@
+ ADD_INT(d, DB_INIT_TXN);
+ ADD_INT(d, DB_JOINENV);
+
++#if (DBVER >= 48)
++ ADD_INT(d, DB_GID_SIZE);
++#else
+ ADD_INT(d, DB_XIDDATASIZE);
++ /* Allow new code to work in old BDB releases */
++ _addIntToDict(d, "DB_GID_SIZE", DB_XIDDATASIZE);
++#endif
+
+ ADD_INT(d, DB_RECOVER);
+ ADD_INT(d, DB_RECOVER_FATAL);
+--- misc/build/Python-2.6.1/Lib/bsddb/test/test_distributed_transactions.py~ 2008-08-31 16:00:51.000000000 +0200
++++ misc/build/Python-2.6.1/Lib/bsddb/test/test_distributed_transactions.py 2010-03-14 21:36:19.762842468 +0100
+@@ -35,7 +35,7 @@
+ db.DB_INIT_TXN | db.DB_INIT_LOG | db.DB_INIT_MPOOL |
+ db.DB_INIT_LOCK, 0666)
+ self.db = db.DB(self.dbenv)
+- self.db.set_re_len(db.DB_XIDDATASIZE)
++ self.db.set_re_len(db.DB_GID_SIZE)
+ if must_open_db :
+ if db.version() > (4,1) :
+ txn=self.dbenv.txn_begin()
+@@ -76,7 +76,7 @@
+ # let them be garbage collected.
+ for i in xrange(self.num_txns) :
+ txn = self.dbenv.txn_begin()
+- gid = "%%%dd" %db.DB_XIDDATASIZE
++ gid = "%%%dd" %db.DB_GID_SIZE
+ gid = adapt(gid %i)
+ self.db.put(i, gid, txn=txn, flags=db.DB_APPEND)
+ txns.add(gid)
+--- misc/build/Python-2.6.1/Lib/bsddb/test/test_basics.py~ 2009-07-02 17:37:21.000000000 +0200
++++ misc/build/Python-2.6.1/Lib/bsddb/test/test_basics.py 2010-03-14 21:33:00.077842066 +0100
+@@ -1032,11 +1032,12 @@
+ # # See http://bugs.python.org/issue3307
+ # self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535)
+
+- def test02_DBEnv_dealloc(self):
+- # http://bugs.python.org/issue3885
+- import gc
+- self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT)
+- gc.collect()
++ if db.version() < (4, 8) :
++ def test02_DBEnv_dealloc(self):
++ # http://bugs.python.org/issue3885
++ import gc
++ self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT)
++ gc.collect()
+
+
+ #----------------------------------------------------------------------
diff --git a/python/Python-2.6.2-cross.fix-configure.patch b/python/Python-2.6.2-cross.fix-configure.patch
new file mode 100644
index 0000000..85beb45
--- /dev/null
+++ b/python/Python-2.6.2-cross.fix-configure.patch
@@ -0,0 +1,34111 @@
+--- misc/build/Python-2.6.1/configure 2012-06-17 10:28:32.528616022 +0200
++++ misc/build/Python-2.6.1/configure 2012-06-17 10:28:42.477677537 +0200
+@@ -1,63 +1,86 @@
+ #! /bin/sh
+ # From configure.in Revision: 67229 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.61 for python 2.6.
++# Generated by GNU Autoconf 2.68 for python 2.6.
+ #
+ # Report bugs to <http://www.python.org/python-bugs>.
+ #
++#
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
++#
++#
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-## --------------------- ##
+-## M4sh Initialization. ##
+-## --------------------- ##
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in
+- *posix*) set -o posix ;;
++ case `(set -o) 2>/dev/null` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
+ esac
+-
+ fi
+
+
+-
+-
+-# PATH needs CR
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+- echo "#! /bin/sh" >conf$$.sh
+- echo "exit 0" >>conf$$.sh
+- chmod +x conf$$.sh
+- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='print -r --'
++ as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='printf %s\n'
++ as_echo_n='printf %s'
++else
++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++ as_echo_n='/usr/ucb/echo -n'
+ else
+- PATH_SEPARATOR=:
++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++ as_echo_n_body='eval
++ arg=$1;
++ case $arg in #(
++ *"$as_nl"*)
++ expr "X$arg" : "X\\(.*\\)$as_nl";
++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++ esac;
++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++ '
++ export as_echo_n_body
++ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+- rm -f conf$$.sh
++ export as_echo_body
++ as_echo='sh -c $as_echo_body as_echo'
+ fi
+
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+- as_unset=unset
+-else
+- as_unset=false
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ PATH_SEPARATOR=:
++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++ PATH_SEPARATOR=';'
++ }
+ fi
+
+
+@@ -66,20 +89,19 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
+-as_nl='
+-'
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+-case $0 in
++as_myself=
++case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -90,354 +112,329 @@ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+- { (exit 1); exit 1; }
++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ exit 1
+ fi
+
+-# Work around bugs in pre-3.0 UWIN ksh.
+-for as_var in ENV MAIL MAILPATH
+-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there. '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+ done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+
+ # NLS nuisances.
+-for as_var in \
+- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+- LC_TELEPHONE LC_TIME
+-do
+- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+- eval $as_var=C; export $as_var
+- else
+- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+- fi
+-done
+-
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+- as_expr=expr
+-else
+- as_expr=false
+-fi
+-
+-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+- as_basename=basename
+-else
+- as_basename=false
+-fi
+-
+-
+-# Name of the executable.
+-as_me=`$as_basename -- "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X/"$0" |
+- sed '/^.*\/\([^/][^/]*\)\/*$/{
+- s//\1/
+- q
+- }
+- /^X\/\(\/\/\)$/{
+- s//\1/
+- q
+- }
+- /^X\/\(\/\).*/{
+- s//\1/
+- q
+- }
+- s/.*/./; q'`
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+
+ # CDPATH.
+-$as_unset CDPATH
+-
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test "x$CONFIG_SHELL" = x; then
+- if (eval ":") 2>/dev/null; then
+- as_have_required=yes
++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++ emulate sh
++ NULLCMD=:
++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
+ else
+- as_have_required=no
++ case \`(set -o) 2>/dev/null\` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
++esac
+ fi
+-
+- if test $as_have_required = yes && (eval ":
+-(as_func_return () {
+- (exit \$1)
+-}
+-as_func_success () {
+- as_func_return 0
+-}
+-as_func_failure () {
+- as_func_return 1
+-}
+-as_func_ret_success () {
+- return 0
+-}
+-as_func_ret_failure () {
+- return 1
+-}
++"
++ as_required="as_fn_return () { (exit \$1); }
++as_fn_success () { as_fn_return 0; }
++as_fn_failure () { as_fn_return 1; }
++as_fn_ret_success () { return 0; }
++as_fn_ret_failure () { return 1; }
+
+ exitcode=0
+-if as_func_success; then
+- :
+-else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+-
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+-
+-if as_func_ret_success; then
+- :
+-else
+- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+- :
++as_fn_success || { exitcode=1; echo as_fn_success failed.; }
++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++
++else
++ exitcode=1; echo positional parameters were not saved.
++fi
++test x\$exitcode = x0 || exit 1"
++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
++ if (eval "$as_required") 2>/dev/null; then :
++ as_have_required=yes
+ else
+- exitcode=1
+- echo positional parameters were not saved.
++ as_have_required=no
+ fi
++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+-test \$exitcode = 0) || { (exit 1); exit 1; }
+-
+-(
+- as_lineno_1=\$LINENO
+- as_lineno_2=\$LINENO
+- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+-") 2> /dev/null; then
+- :
+ else
+- as_candidate_shells=
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_found=false
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- case $as_dir in
++ as_found=:
++ case $as_dir in #(
+ /*)
+ for as_base in sh bash ksh sh5; do
+- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++ # Try only shells that exist, to save several forks.
++ as_shell=$as_dir/$as_base
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
++ CONFIG_SHELL=$as_shell as_have_required=yes
++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
++ break 2
++fi
++fi
+ done;;
+ esac
++ as_found=false
+ done
++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
++ CONFIG_SHELL=$SHELL as_have_required=yes
++fi; }
+ IFS=$as_save_IFS
+
+
+- for as_shell in $as_candidate_shells $SHELL; do
+- # Try only shells that exist, to save several forks.
+- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+- { ("$as_shell") 2> /dev/null <<\_ASEOF
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+- emulate sh
+- NULLCMD=:
+- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+- # is contrary to our usage. Disable this feature.
+- alias -g '${1+"$@"}'='"$@"'
+- setopt NO_GLOB_SUBST
+-else
+- case `(set -o) 2>/dev/null` in
+- *posix*) set -o posix ;;
+-esac
+-
+-fi
+-
+-
+-:
+-_ASEOF
+-}; then
+- CONFIG_SHELL=$as_shell
+- as_have_required=yes
+- if { "$as_shell" 2> /dev/null <<\_ASEOF
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+- emulate sh
+- NULLCMD=:
+- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+- # is contrary to our usage. Disable this feature.
+- alias -g '${1+"$@"}'='"$@"'
+- setopt NO_GLOB_SUBST
+-else
+- case `(set -o) 2>/dev/null` in
+- *posix*) set -o posix ;;
+-esac
+-
+-fi
+-
+-
+-:
+-(as_func_return () {
+- (exit $1)
+-}
+-as_func_success () {
+- as_func_return 0
+-}
+-as_func_failure () {
+- as_func_return 1
+-}
+-as_func_ret_success () {
+- return 0
+-}
+-as_func_ret_failure () {
+- return 1
+-}
+-
+-exitcode=0
+-if as_func_success; then
+- :
+-else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+-
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
+-fi
+-
+-if as_func_ret_success; then
+- :
+-else
+- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = "$1" ); then
+- :
+-else
+- exitcode=1
+- echo positional parameters were not saved.
++ if test "x$CONFIG_SHELL" != x; then :
++ # We cannot yet assume a decent shell, so we have to provide a
++ # neutralization value for shells without unset; and this also
++ # works around shells that cannot unset nonexistent variables.
++ # Preserve -v and -x to the replacement shell.
++ BASH_ENV=/dev/null
++ ENV=/dev/null
++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++ export CONFIG_SHELL
++ case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++ esac
++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+
+-test $exitcode = 0) || { (exit 1); exit 1; }
+-
+-(
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+-
+-_ASEOF
+-}; then
+- break
++ if test x$as_have_required = xno; then :
++ $as_echo "$0: This script requires a shell more modern than all"
++ $as_echo "$0: the shells that I found on your system."
++ if test x${ZSH_VERSION+set} = xset ; then
++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
++ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
++ else
++ $as_echo "$0: Please tell bug-autoconf at gnu.org and
++$0: http://www.python.org/python-bugs about your system,
++$0: including any error possibly output before this
++$0: message. Then install a modern shell, or manually run
++$0: the script under such a shell if you do have one."
++ fi
++ exit 1
+ fi
+-
+ fi
+-
+- done
+-
+- if test "x$CONFIG_SHELL" != x; then
+- for as_var in BASH_ENV ENV
+- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+- done
+- export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
++SHELL=${CONFIG_SHELL-/bin/sh}
++export SHELL
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
+
++## --------------------- ##
++## M4sh Shell Functions. ##
++## --------------------- ##
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++ { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++ return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++ set +e
++ as_fn_set_status $1
++ exit $1
++} # as_fn_exit
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
+
+- if test $as_have_required = no; then
+- echo This script requires a shell more modern than all the
+- echo shells that I found on your system. Please install a
+- echo modern shell, or manually run the script under such a
+- echo shell if you do have one.
+- { (exit 1); exit 1; }
+-fi
+-
++ case $as_dir in #(
++ -*) as_dir=./$as_dir;;
++ esac
++ test -d "$as_dir" || eval $as_mkdir_p || {
++ as_dirs=
++ while :; do
++ case $as_dir in #(
++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++ *) as_qdir=$as_dir;;
++ esac
++ as_dirs="'$as_qdir' $as_dirs"
++ as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$as_dir" : 'X\(//\)[^/]' \| \
++ X"$as_dir" : 'X\(//\)$' \| \
++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
++ test -d "$as_dir" && break
++ done
++ test -z "$as_dirs" || eval "mkdir $as_dirs"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+-fi
+
+-fi
++} # as_fn_mkdir_p
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++ eval 'as_fn_append ()
++ {
++ eval $1+=\$2
++ }'
++else
++ as_fn_append ()
++ {
++ eval $1=\$$1\$2
++ }
++fi # as_fn_append
+
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++ eval 'as_fn_arith ()
++ {
++ as_val=$(( $* ))
++ }'
++else
++ as_fn_arith ()
++ {
++ as_val=`expr "$@" || test $? -eq 1`
++ }
++fi # as_fn_arith
+
+
+-(eval "as_func_return () {
+- (exit \$1)
+-}
+-as_func_success () {
+- as_func_return 0
+-}
+-as_func_failure () {
+- as_func_return 1
+-}
+-as_func_ret_success () {
+- return 0
+-}
+-as_func_ret_failure () {
+- return 1
+-}
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with STATUS, using 1 if that was 0.
++as_fn_error ()
++{
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ fi
++ $as_echo "$as_me: error: $2" >&2
++ as_fn_exit $as_status
++} # as_fn_error
+
+-exitcode=0
+-if as_func_success; then
+- :
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++ test "X`expr 00001 : '.*\(...\)'`" = X001; then
++ as_expr=expr
+ else
+- exitcode=1
+- echo as_func_success failed.
+-fi
+-
+-if as_func_failure; then
+- exitcode=1
+- echo as_func_failure succeeded.
++ as_expr=false
+ fi
+
+-if as_func_ret_success; then
+- :
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
++ as_basename=basename
+ else
+- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
++ as_basename=false
+ fi
+
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+- :
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++ as_dirname=dirname
+ else
+- exitcode=1
+- echo positional parameters were not saved.
++ as_dirname=false
+ fi
+
+-test \$exitcode = 0") || {
+- echo No shell found that supports shell functions.
+- echo Please tell autoconf at gnu.org about your system,
+- echo including any error possibly output before this
+- echo message
+-}
++as_me=`$as_basename -- "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++ X"$0" : 'X\(//\)$' \| \
++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++ sed '/^.*\/\([^/][^/]*\)\/*$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\/\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'`
+
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+-
+- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+- # uniformly replaced by the line number. The first 'sed' inserts a
+- # line-number line after each line using $LINENO; the second 'sed'
+- # does the real work. The second script uses 'N' to pair each
+- # line-number line with the line containing $LINENO, and appends
+- # trailing '-' during substitution so that $LINENO is not a special
+- # case at line end.
+- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+- # scripts with optimization help from Paolo Bonzini. Blame Lee
+- # E. McMahon (1931-1989) for sed's syntax. :-)
++ as_lineno_1=$LINENO as_lineno_1a=$LINENO
++ as_lineno_2=$LINENO as_lineno_2a=$LINENO
++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+@@ -454,8 +451,7 @@ test \$exitcode = 0") || {
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+- { (exit 1); exit 1; }; }
++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+@@ -465,49 +461,40 @@ test \$exitcode = 0") || {
+ exit
+ }
+
+-
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+- as_dirname=dirname
+-else
+- as_dirname=false
+-fi
+-
+ ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in
++case `echo -n x` in #(((((
+ -n*)
+- case `echo 'x\c'` in
++ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+- *) ECHO_C='\c';;
++ xy) ECHO_C='\c';;
++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
++ ECHO_T=' ';;
+ esac;;
+ *)
+ ECHO_N='-n';;
+ esac
+
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+- as_expr=expr
+-else
+- as_expr=false
+-fi
+-
+ rm -f conf$$ conf$$.exe conf$$.file
+ if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+ else
+ rm -f conf$$.dir
+- mkdir conf$$.dir
++ mkdir conf$$.dir 2>/dev/null
+ fi
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s='ln -s'
+- # ... but there are two gotchas:
+- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+- # In both cases, we have to default to `cp -p'.
+- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++if (echo >conf$$.file) 2>/dev/null; then
++ if ln -s conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s='ln -s'
++ # ... but there are two gotchas:
++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++ # In both cases, we have to default to `cp -p'.
++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++ as_ln_s='cp -p'
++ elif ln conf$$.file conf$$ 2>/dev/null; then
++ as_ln_s=ln
++ else
+ as_ln_s='cp -p'
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+- as_ln_s=ln
++ fi
+ else
+ as_ln_s='cp -p'
+ fi
+@@ -515,7 +502,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+ rmdir conf$$.dir 2>/dev/null
+
+ if mkdir -p . 2>/dev/null; then
+- as_mkdir_p=:
++ as_mkdir_p='mkdir -p "$as_dir"'
+ else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+@@ -532,12 +519,12 @@ else
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+- test -d "$1/.";
++ test -d "$1/.";
+ else
+- case $1 in
+- -*)set "./$1";;
++ case $1 in #(
++ -*)set "./$1";;
+ esac;
+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+@@ -551,11 +538,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+@@ -570,7 +557,6 @@ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
+
+ # Identity of this package.
+ PACKAGE_NAME='python'
+@@ -578,6 +564,7 @@ PACKAGE_TARNAME='python'
+ PACKAGE_VERSION='2.6'
+ PACKAGE_STRING='python 2.6'
+ PACKAGE_BUGREPORT='http://www.python.org/python-bugs'
++PACKAGE_URL=''
+
+ ac_unique_file="Include/object.h"
+ # Factoring default headers for most tests.
+@@ -616,126 +603,178 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL
+-PATH_SEPARATOR
+-PACKAGE_NAME
+-PACKAGE_TARNAME
+-PACKAGE_VERSION
+-PACKAGE_STRING
+-PACKAGE_BUGREPORT
+-exec_prefix
+-prefix
+-program_transform_name
+-bindir
+-sbindir
+-libexecdir
+-datarootdir
+-datadir
+-sysconfdir
+-sharedstatedir
+-localstatedir
+-includedir
+-oldincludedir
+-docdir
+-infodir
+-htmldir
+-dvidir
+-pdfdir
+-psdir
+-libdir
+-localedir
+-mandir
+-DEFS
+-ECHO_C
+-ECHO_N
+-ECHO_T
+-LIBS
+-build_alias
+-host_alias
+-target_alias
+-VERSION
+-SOVERSION
+-CONFIG_ARGS
+-UNIVERSALSDK
+-ARCH_RUN_32BIT
+-PYTHONFRAMEWORK
+-PYTHONFRAMEWORKIDENTIFIER
+-PYTHONFRAMEWORKDIR
+-PYTHONFRAMEWORKPREFIX
+-PYTHONFRAMEWORKINSTALLDIR
+-FRAMEWORKINSTALLFIRST
+-FRAMEWORKINSTALLLAST
+-FRAMEWORKALTINSTALLFIRST
+-FRAMEWORKALTINSTALLLAST
+-FRAMEWORKUNIXTOOLSPREFIX
+-MACHDEP
+-SGI_ABI
+-EXTRAPLATDIR
+-EXTRAMACHDEPPATH
+-CONFIGURE_MACOSX_DEPLOYMENT_TARGET
+-EXPORT_MACOSX_DEPLOYMENT_TARGET
+-CC
+-CFLAGS
+-LDFLAGS
+-CPPFLAGS
+-ac_ct_CC
+-EXEEXT
++ac_subst_vars='LTLIBOBJS
++O_FOR_BUILD
++LIBS_FOR_BUILD
++LDFLAGS_FOR_BUILD
++EXEEXT_FOR_BUILD
++CROSS_COMMENT
++CPPFLAGS_FOR_BUILD
++CFLAGS_FOR_BUILD
++PYTHON_FOR_BUILD
++CC_FOR_BUILD
++cross_compiling
++SRCDIRS
++THREADHEADERS
++UNICODE_OBJS
++LIBC
++LIBM
++HAVE_GETHOSTBYNAME
++HAVE_GETHOSTBYNAME_R
++HAVE_GETHOSTBYNAME_R_3_ARG
++HAVE_GETHOSTBYNAME_R_5_ARG
++HAVE_GETHOSTBYNAME_R_6_ARG
++LIBOBJS
++TRUE
++MACHDEP_OBJS
++DYNLOADFILE
++DLINCLDIR
++THREADOBJ
++LDLAST
++USE_THREAD_MODULE
++SIGNAL_OBJS
++USE_SIGNAL_MODULE
++SHLIBS
++CFLAGSFORSHARED
++LINKFORSHARED
++CCSHARED
++BLDSHARED
++LDSHARED
++SO
++LIBTOOL_CRUFT
++OTHER_LIBTOOL_OPT
++UNIVERSAL_ARCH_FLAGS
++BASECFLAGS
++OPT
++LN
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++SVNVERSION
++ac_ct_AR
++AR
++RANLIB
++LINKCC
++RUNSHARED
++INSTSONAME
++LDLIBRARYDIR
++BLDLIBRARY
++DLLLIBRARY
++LDLIBRARY
++LIBRARY
++BUILDEXEEXT
++EGREP
++GREP
++CPP
++MAINCC
+ OBJEXT
++EXEEXT
++CPPFLAGS
++LDFLAGS
++CFLAGS
++EXPORT_MACOSX_DEPLOYMENT_TARGET
++CONFIGURE_MACOSX_DEPLOYMENT_TARGET
++DELIM
++EXTRAMACHDEPPATH
++EXTRAPLATDIR
++SGI_ABI
++MACHDEP
++FRAMEWORKUNIXTOOLSPREFIX
++FRAMEWORKALTINSTALLLAST
++FRAMEWORKALTINSTALLFIRST
++FRAMEWORKINSTALLLAST
++FRAMEWORKINSTALLFIRST
++PYTHONFRAMEWORKINSTALLDIR
++PYTHONFRAMEWORKPREFIX
++PYTHONFRAMEWORKDIR
++PYTHONFRAMEWORKIDENTIFIER
++PYTHONFRAMEWORK
++ARCH_RUN_32BIT
++UNIVERSALSDK
++CONFIG_ARGS
++SOVERSION
++VERSION
++ac_ct_CXX
+ CXX
+-MAINCC
+-CPP
+-GREP
+-EGREP
+-BUILDEXEEXT
+-LIBRARY
+-LDLIBRARY
+-DLLLIBRARY
+-BLDLIBRARY
+-LDLIBRARYDIR
+-INSTSONAME
+-RUNSHARED
+-LINKCC
+-RANLIB
+-AR
+-SVNVERSION
+-INSTALL_PROGRAM
+-INSTALL_SCRIPT
+-INSTALL_DATA
+-LN
+-OPT
+-BASECFLAGS
+-UNIVERSAL_ARCH_FLAGS
+-OTHER_LIBTOOL_OPT
+-LIBTOOL_CRUFT
+-SO
+-LDSHARED
+-BLDSHARED
+-CCSHARED
+-LINKFORSHARED
+-CFLAGSFORSHARED
+-SHLIBS
+-USE_SIGNAL_MODULE
+-SIGNAL_OBJS
+-USE_THREAD_MODULE
+-LDLAST
+-THREADOBJ
+-DLINCLDIR
+-DYNLOADFILE
+-MACHDEP_OBJS
+-TRUE
+-LIBOBJS
+-HAVE_GETHOSTBYNAME_R_6_ARG
+-HAVE_GETHOSTBYNAME_R_5_ARG
+-HAVE_GETHOSTBYNAME_R_3_ARG
+-HAVE_GETHOSTBYNAME_R
+-HAVE_GETHOSTBYNAME
+-LIBM
+-LIBC
+-UNICODE_OBJS
+-THREADHEADERS
+-SRCDIRS
+-LTLIBOBJS'
++ac_ct_CC
++CC
++host_os
++host_vendor
++host_cpu
++host
++build_os
++build_vendor
++build_cpu
++build
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_URL
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
++ac_user_opts='
++enable_option_checking
++enable_universalsdk
++with_universal_archs
++with_framework_name
++enable_framework
++with_gcc
++with_cxx_main
++with_suffix
++enable_shared
++enable_profiling
++with_pydebug
++enable_toolbox_glue
++with_libs
++with_system_ffi
++with_signal_module
++with_dec_threads
++with_threads
++with_thread
++with_pth
++enable_ipv6
++with_doc_strings
++with_tsc
++with_pymalloc
++with_wctype_functions
++with_fpectl
++with_libm
++with_libc
++enable_unicode
++'
+ ac_precious_vars='build_alias
+ host_alias
+ target_alias
+@@ -744,12 +783,16 @@ CFLAGS
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++CPP
++CC_FOR_BUILD
++PYTHON_FOR_BUILD'
+
+
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
++ac_unrecognized_opts=
++ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -805,8 +848,9 @@ do
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -848,13 +892,20 @@ do
+ datarootdir=$ac_optarg ;;
+
+ -disable-* | --disable-*)
+- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+- { (exit 1); exit 1; }; }
+- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+- eval enable_$ac_feature=no ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid feature name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"enable_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
++ esac
++ eval enable_$ac_useropt=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+@@ -867,13 +918,20 @@ do
+ dvidir=$ac_optarg ;;
+
+ -enable-* | --enable-*)
+- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+- { (exit 1); exit 1; }; }
+- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+- eval enable_$ac_feature=\$ac_optarg ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid feature name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"enable_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
++ esac
++ eval enable_$ac_useropt=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -1064,22 +1122,36 @@ do
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid package name: $ac_package" >&2
+- { (exit 1); exit 1; }; }
+- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+- eval with_$ac_package=\$ac_optarg ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid package name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"with_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
++ esac
++ eval with_$ac_useropt=\$ac_optarg ;;
+
+ -without-* | --without-*)
+- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid package name: $ac_package" >&2
+- { (exit 1); exit 1; }; }
+- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+- eval with_$ac_package=no ;;
++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++ as_fn_error $? "invalid package name: $ac_useropt"
++ ac_useropt_orig=$ac_useropt
++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++ case $ac_user_opts in
++ *"
++"with_$ac_useropt"
++"*) ;;
++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
++ ac_unrecognized_sep=', ';;
++ esac
++ eval with_$ac_useropt=no ;;
+
+ --x)
+ # Obsolete; use --with-x.
+@@ -1099,26 +1171,26 @@ do
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) { echo "$as_me: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&2
+- { (exit 1); exit 1; }; }
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+- { (exit 1); exit 1; }; }
++ case $ac_envvar in #(
++ '' | [0-9]* | *[!_$as_cr_alnum]* )
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
++ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ ;;
+
+ esac
+@@ -1126,23 +1198,36 @@ done
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- { echo "$as_me: error: missing argument to $ac_option" >&2
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "missing argument to $ac_option"
+ fi
+
+-# Be sure to have absolute directory names.
+-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++if test -n "$ac_unrecognized_opts"; then
++ case $enable_option_checking in
++ no) ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
++ esac
++fi
++
++# Check all directory arguments for consistency.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
+ do
+ eval ac_val=\$$ac_var
++ # Remove trailing slashes.
++ case $ac_val in
++ */ )
++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
++ eval $ac_var=\$ac_val;;
++ esac
++ # Be sure to have absolute directory names.
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1156,8 +1241,8 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used." >&2
++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used" >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -1172,23 +1257,21 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- { echo "$as_me: error: Working directory cannot be determined" >&2
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- { echo "$as_me: error: pwd does not report name of working directory" >&2
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "pwd does not report name of working directory"
+
+
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then the parent directory.
+- ac_confdir=`$as_dirname -- "$0" ||
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$0" : 'X\(//\)[^/]' \| \
+- X"$0" : 'X\(//\)$' \| \
+- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X"$0" |
++ ac_confdir=`$as_dirname -- "$as_myself" ||
++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$as_myself" : 'X\(//\)[^/]' \| \
++ X"$as_myself" : 'X\(//\)$' \| \
++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_myself" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -1215,13 +1298,11 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+- { (exit 1); exit 1; }; }
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+- { (exit 1); exit 1; }; }
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1261,7 +1342,7 @@ Configuration:
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+@@ -1269,9 +1350,9 @@ Configuration:
+
+ Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+- [$ac_default_prefix]
++ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+- [PREFIX]
++ [PREFIX]
+
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+@@ -1281,28 +1362,32 @@ for instance \`--prefix=\$HOME'.
+ For better control, use the options below.
+
+ Fine tuning of the installation directories:
+- --bindir=DIR user executables [EPREFIX/bin]
+- --sbindir=DIR system admin executables [EPREFIX/sbin]
+- --libexecdir=DIR program executables [EPREFIX/libexec]
+- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+- --libdir=DIR object code libraries [EPREFIX/lib]
+- --includedir=DIR C header files [PREFIX/include]
+- --oldincludedir=DIR C header files for non-gcc [/usr/include]
+- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+- --infodir=DIR info documentation [DATAROOTDIR/info]
+- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+- --mandir=DIR man documentation [DATAROOTDIR/man]
+- --docdir=DIR documentation root [DATAROOTDIR/doc/python]
+- --htmldir=DIR html documentation [DOCDIR]
+- --dvidir=DIR dvi documentation [DOCDIR]
+- --pdfdir=DIR pdf documentation [DOCDIR]
+- --psdir=DIR ps documentation [DOCDIR]
++ --bindir=DIR user executables [EPREFIX/bin]
++ --sbindir=DIR system admin executables [EPREFIX/sbin]
++ --libexecdir=DIR program executables [EPREFIX/libexec]
++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
++ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++ --libdir=DIR object code libraries [EPREFIX/lib]
++ --includedir=DIR C header files [PREFIX/include]
++ --oldincludedir=DIR C header files for non-gcc [/usr/include]
++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
++ --infodir=DIR info documentation [DATAROOTDIR/info]
++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
++ --mandir=DIR man documentation [DATAROOTDIR/man]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/python]
++ --htmldir=DIR html documentation [DOCDIR]
++ --dvidir=DIR dvi documentation [DOCDIR]
++ --pdfdir=DIR pdf documentation [DOCDIR]
++ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
++
++System types:
++ --build=BUILD configure for building on BUILD [guessed]
++ --host=HOST cross-compile to build programs to run on HOST [BUILD]
+ _ACEOF
+ fi
+
+@@ -1313,6 +1398,7 @@ if test -n "$ac_init_help"; then
+ cat <<\_ACEOF
+
+ Optional Features:
++ --disable-option-checking ignore unrecognized --enable/--with options
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-universalsdk[=SDKDIR]
+@@ -1365,9 +1451,13 @@ Some influential environment variables:
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
++ CC_FOR_BUILD
++ build system C compiler (default: cc)
++ PYTHON_FOR_BUILD
++ build system python (default: python)
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -1380,15 +1470,17 @@ fi
+ if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+- test -d "$ac_dir" || continue
++ test -d "$ac_dir" ||
++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++ continue
+ ac_builddir=.
+
+ case "$ac_dir" in
+ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *)
+- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+@@ -1424,7 +1516,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+@@ -1434,591 +1526,1567 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ python configure 2.6
+-generated by GNU Autoconf 2.61
++generated by GNU Autoconf 2.68
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+ exit
+ fi
+-cat >config.log <<_ACEOF
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+
+-It was created by python $as_me 2.6, which was
+-generated by GNU Autoconf 2.61. Invocation command line was
++## ------------------------ ##
++## Autoconf initialization. ##
++## ------------------------ ##
++
++# ac_fn_c_try_compile LINENO
++# --------------------------
++# Try to compile conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_compile ()
++{
++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ rm -f conftest.$ac_objext
++ if { { ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list