On Tue, Jun 28, 2005 at 11:31:48AM +0200, lode leroy wrote:
> The native windows version of Python has it's headers in C:\Python24\include
> and not in C:\Python24\include\python24, so I changed the pythondev m4
> macro as follows:
>
> diff -u -r1.1 pythondev.m4
> --- m4macros/pythondev.m4 24 Jun 2005 21:17:57 -0000 1.1
> +++ m4macros/pythondev.m4 28 Jun 2005 09:19:09 -0000
> @@ -10,7 +10,7 @@
> dnl deduce PYTHON_INCLUDES
> py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
> py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
> -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
> +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}
> -I${py_prefix}/include"
> if test "$py_prefix" != "$py_exec_prefix"; then
> PYTHON_INCLUDES="$PYTHON_INCLUDES
> -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
> fi
Blinding doing this isn't correct, especially if python is in /usr.
Looks like we'll have to special case windows here.
> the WMF plugin uses freetype2, but freetype2 likes to have "ft2build.h"
> included...
>
> diff -u -r1.52 wmf.c
> --- plug-ins/common/wmf.c 4 Mar 2005 15:12:28 -0000 1.52
> +++ plug-ins/common/wmf.c 28 Jun 2005 09:19:09 -0000
> @@ -23,6 +23,8 @@
>
> #include "config.h"
>
> +#include "ft2build.h"
> +
> #include <libwmf/api.h>
> #include <libwmf/gd.h>
Your libwmf library is too old. Upgrade.
> the autodetection of python on MSYS is not too good:
> the "\"es need to be replaced with "/"es, so I added this to
Where did it screw up? You sure you are using a CVS snapshot with all
the relevant changes? The ChangeLog should have:
2005-06-26 Manish Singh <[EMAIL PROTECTED]>
* plug-ins/pygimp/Makefile.am: actually define pygimpdir in terms
of pygimpbase.
> C:\Python24\lib\site-packages\site-customize.py
>
> import sys
> import os
> import re
> if os.environ.get("MSYSTEM") == "MINGW32":
> os.sep='/'
> os.pathsep='/'
> sys.prefix = re.sub('\\\\',os.sep,sys.prefix)
> sys.exec_prefix = re.sub('\\\\',os.sep,sys.exec_prefix)
Changing stuff outside of gimp should be considered last resort.
> which is still not perfect: I modified python.m4 to replace "\"es by "/"es:
>
> [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig;
> print
> sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX').replace('\\','/')"
> 2>/dev/
> null ||
Why is this needed at all? gimp doesn't use $pythondir anywhere.
-Yosh
_______________________________________________
Gimp-developer mailing list
[email protected]
http://lists.xcf.berkeley.edu/mailman/listinfo/gimp-developer
