You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
3.0 KiB
80 lines
3.0 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../paragui/python24.patch
|
||
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||
|
|
# Copyright (C) 1998 - 2003 Clifford Wolf
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
Adds support for detecting python2.4
|
||
|
|
|
||
|
|
diff -ruN paragui-1.0.4/configure paragui-1.0.4-avm/configure
|
||
|
|
--- paragui-1.0.4/configure 2003-06-27 10:34:29.000000000 +0200
|
||
|
|
+++ paragui-1.0.4-avm/configure 2003-09-27 18:31:27.000000000 +0200
|
||
|
|
@@ -7381,10 +7381,46 @@
|
||
|
|
if test "x$PYTHON" = xno; then
|
||
|
|
{ echo "configure: error: *** Unable to find python interpreter! ***" 1>&2; exit 1; }
|
||
|
|
fi
|
||
|
|
- PYTHON_INCLUDE_DIR=""
|
||
|
|
+ PYTHON_INCLUDE_DIR=""
|
||
|
|
PYTHON_LIB_DIR=""
|
||
|
|
have_python_include=no
|
||
|
|
- ac_safe=`echo "python2.2/Python.h" | sed 'y%./+-%__p_%'`
|
||
|
|
+ ac_safe=`echo "python2.4/Python.h" | sed 'y%./+-%__p_%'`
|
||
|
|
+echo $ac_n "checking for python2.4/Python.h""... $ac_c" 1>&6
|
||
|
|
+echo "configure:7426: checking for python2.4/Python.h" >&5
|
||
|
|
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||
|
|
+ echo $ac_n "(cached) $ac_c" 1>&6
|
||
|
|
+else
|
||
|
|
+ cat > conftest.$ac_ext <<EOF
|
||
|
|
+#line 7431 "configure"
|
||
|
|
+#include "confdefs.h"
|
||
|
|
+#include <python2.4/Python.h>
|
||
|
|
+EOF
|
||
|
|
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||
|
|
+{ (eval echo configure:7436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||
|
|
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||
|
|
+if test -z "$ac_err"; then
|
||
|
|
+ rm -rf conftest*
|
||
|
|
+ eval "ac_cv_header_$ac_safe=yes"
|
||
|
|
+else
|
||
|
|
+ echo "$ac_err" >&5
|
||
|
|
+ echo "configure: failed program was:" >&5
|
||
|
|
+ cat conftest.$ac_ext >&5
|
||
|
|
+ rm -rf conftest*
|
||
|
|
+ eval "ac_cv_header_$ac_safe=no"
|
||
|
|
+fi
|
||
|
|
+rm -f conftest*
|
||
|
|
+fi
|
||
|
|
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||
|
|
+ echo "$ac_t""yes" 1>&6
|
||
|
|
+ have_python_include=yes
|
||
|
|
+else
|
||
|
|
+ echo "$ac_t""no" 1>&6
|
||
|
|
+fi
|
||
|
|
+
|
||
|
|
+ PYTHON_INCLUDE_DIR=$prefix/include/python2.4
|
||
|
|
+ PYTHON_LIB_DIR=$libdir/python2.4
|
||
|
|
+ if test x$have_python_include = xno; then
|
||
|
|
+ ac_safe=`echo "python2.2/Python.h" | sed 'y%./+-%__p_%'`
|
||
|
|
echo $ac_n "checking for python2.2/Python.h""... $ac_c" 1>&6
|
||
|
|
echo "configure:7390: checking for python2.2/Python.h" >&5
|
||
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||
|
|
@@ -7419,6 +7455,7 @@
|
||
|
|
|
||
|
|
PYTHON_INCLUDE_DIR=$prefix/include/python2.2
|
||
|
|
PYTHON_LIB_DIR=$libdir/python2.2
|
||
|
|
+ fi
|
||
|
|
if test x$have_python_include = xno; then
|
||
|
|
ac_safe=`echo "python2.1/Python.h" | sed 'y%./+-%__p_%'`
|
||
|
|
echo $ac_n "checking for python2.1/Python.h""... $ac_c" 1>&6
|