]>
Commit | Line | Data |
---|---|---|
9a3b65ac | 1 | --- abiword-2.0.14/abiword-plugins/acinclude.m4.orig 2004-12-23 12:36:33.009389184 +0000 |
2 | +++ abiword-2.0.14/abiword-plugins/acinclude.m4 2004-12-23 12:37:29.448809088 +0000 | |
3 | @@ -304,27 +304,27 @@ | |
4 | # Checks for libraries. | |
5 | # Checks for header files. | |
6 | ||
7 | -AC_ARG_WITH(python,[ --with-python=DIR Python 2.3 library in DIR],[ | |
8 | +AC_ARG_WITH(python,[ --with-python=DIR Python 2.4 library in DIR],[ | |
9 | if test "x$withval" = "xno"; then | |
10 | ABI_PLUGIN_REPORT([gypsython: Python support disabled]) | |
11 | abi_plugin_disable=yes | |
12 | elif test "x$withval" != "xyes"; then | |
13 | - ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.3" | |
14 | + ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.4" | |
15 | ABI_GYPSY_LDFLAGS="-L$withval/lib" | |
16 | - CPPFLAGS="$CPPFLAGS -I$withval/include/python2.3" | |
17 | + CPPFLAGS="$CPPFLAGS -I$withval/include/python2.4" | |
18 | LDFLAGS="$LDFLAGS -L$withval/lib" | |
19 | else | |
20 | - ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3" | |
21 | - CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3" | |
22 | + ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4" | |
23 | + CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4" | |
24 | fi | |
25 | -],[ ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3" | |
26 | - CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3" | |
27 | +],[ ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4" | |
28 | + CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4" | |
29 | ]) | |
30 | ||
31 | if test $abi_plugin_disable != yes; then | |
32 | AC_CHECK_HEADER(Python.h,[ | |
33 | - AC_CHECK_LIB(python2.3,Py_Initialize,[ | |
34 | - ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython2.3" | |
35 | + AC_CHECK_LIB(python2.4,Py_Initialize,[ | |
36 | + ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython2.4" | |
37 | ABI_PLUGIN_REPORT([gypsython: okay]) | |
38 | ],[ ABI_PLUGIN_REPORT([gypsython: error - Python library not found]) | |
39 | abi_plugin_disable=yes |