13
|
1 |
--- configure 2009-10-30 08:57:45.000000000 -0700
|
|
2 |
+++ configure 2010-04-15 08:59:26.926442400 -0700
|
|
3 |
@@ -5246,13 +5246,8 @@
|
|
4 |
|
|
5 |
|
|
6 |
# Configure python. AM_PATH_PYTHON is basically braindead
|
|
7 |
-PYTHON=''
|
|
8 |
if test "$with_python" = 'yes'
|
|
9 |
then
|
|
10 |
-
|
|
11 |
-
|
|
12 |
-
|
|
13 |
-
|
|
14 |
if test -n "$PYTHON"; then
|
|
15 |
# If the user set $PYTHON, use it and don't search something else.
|
|
16 |
{ echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
|
|
17 |
@@ -5400,8 +5395,7 @@
|
|
18 |
if test "${am_cv_python_pythondir+set}" = set; then
|
|
19 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
20 |
else
|
|
21 |
- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
|
|
22 |
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
|
|
23 |
+ am_cv_python_pythondir=`echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/vendor-packages"`
|
|
24 |
fi
|
|
25 |
{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
|
|
26 |
echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
|
|
27 |
@@ -5417,8 +5411,7 @@
|
|
28 |
if test "${am_cv_python_pyexecdir+set}" = set; then
|
|
29 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
30 |
else
|
|
31 |
- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
|
|
32 |
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
|
|
33 |
+ am_cv_python_pyexecdir=`echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/vendor-packages"`
|
|
34 |
fi
|
|
35 |
{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
|
|
36 |
echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
|
|
37 |
@@ -5436,7 +5429,8 @@
|
|
38 |
if test -n "$PYTHON"
|
|
39 |
then
|
|
40 |
LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
|
|
41 |
- LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1)"`
|
|
42 |
+ LCMS_PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
|
|
43 |
+ LCMS_PYEXECDIR=`echo "$LCMS_PYTHON_PREFIX/lib/python$LCMS_PYTHON_VERSION/vendor-packages"`
|
|
44 |
LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
|
|
45 |
LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)"`
|
|
46 |
as_ac_File=`echo "ac_cv_file_$LCMS_PYINCLUDE/Python.h" | $as_tr_sh`
|
|
47 |
@@ -9489,9 +9483,9 @@
|
|
48 |
$CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
|
|
49 |
else
|
|
50 |
wlarc=''
|
|
51 |
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
|
52 |
+ archive_cmds='$CXX $CXXFLAGS $LDFLAGS -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
|
53 |
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
|
54 |
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
|
55 |
+ $CXX $CXXFLAGS $LDFLAGS -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
|
|
56 |
fi
|
|
57 |
hardcode_libdir_flag_spec='-R$libdir'
|
|
58 |
hardcode_shlibpath_var=no
|
|
59 |
@@ -11270,7 +11264,7 @@
|
|
60 |
echo "$as_me: creating $ofile" >&6;}
|
|
61 |
|
|
62 |
cat <<__EOF__ >> "$cfgfile"
|
|
63 |
-#! $SHELL
|
|
64 |
+#! $CONFIG_SHELL
|
|
65 |
|
|
66 |
# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
|
|
67 |
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
|