improved python detection and added --with-pythonincdir for configure.in

diff --git a/configure.in b/configure.in
index 04af93d8a1bd0653e0af352b59d70a108b447a6d..54f000f1766bc66fba3411f2fb2360407a5e45c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -340,21 +340,28 @@ AC_ARG_ENABLE(python,
   AS_HELP_STRING([--disable-python], [disable the python components]),
   [build_python="$enableval"], [build_python="yes"])
 PYTHON_LIBS=""
+PYTHON_INCDIR=""
 if test "$build_python" = "yes"; then
   AC_ARG_WITH(pythonlibs,
     AS_HELP_STRING([--with-pythonlibs=ldflags],
       [specify python libraries (-lpthread -lm -ldl -lpython2.4)]),
     pythonlibs="$withval", pythonlibs=`python-config --libs`)
-  if test -z "$pythonlibs" ; then
+  AC_ARG_WITH(pythonincludes,
+    AS_HELP_STRING([--with-pythonincdir=dir],
+      [specify python C header files (-I/usr/include/python)]),
+    pythonincdir="$withval", pythonincdir=`python-config --includes`)
+  if test -z "$pythonlibs" -o -z "$pythonincdir"; then
     echo "Unable to determine python libraries! Probably python-config is not"
-    echo "available on this system. Please, use --with-pythonlibs options."
-    echo "Python components are disabled in this build."
+    echo "available on this system. Please, use --with-pythonlibs and"
+    echo "--with-pythonincdir options. Python components are disabled in this build."
     build_python="no"
   else
     PYTHON_LIBS="$pythonlibs"
+    PYTHON_INCDIR="$pythonincdir"
   fi
 fi
 AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_INCDIR)
 
 if test "$build_seq" != "yes"; then
   build_instr="no"

diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am
index d287c7e56a0912cab59113ff8a23992b34246614..38f106c075e4ecdd3bff57359970dffab8d02b58 100644 (file)
--- a/modules/mixer/simple/Makefile.am
+++ b/modules/mixer/simple/Makefile.am
@@ -1,5 +1,6 @@
 pkglibdir = @ALSA_PLUGIN_DIR@/smixer
 pythonlibs = @PYTHON_LIBS@
+pythonincdir = @PYTHON_INCDIR@
 
 AM_CFLAGS = -g -O2 -W -Wall
 
@@ -30,5 +31,6 @@ smixer_hda_la_LIBADD = ../../../src/libasound.la
 if BUILD_PYTHON
 smixer_python_la_SOURCES = python.c
 smixer_python_la_LDFLAGS = -module -avoid-version $(pythonlibs)
+smixer_python_la_CFLAGS = -I$(pythonincdir)
 smixer_python_la_LIBADD = ../../../src/libasound.la
 endif

diff --git a/modules/mixer/simple/python.c b/modules/mixer/simple/python.c
index ce9c8fd48a242d3f6de8b7f1b536000f70a601f7..6bfe73861c9b5ad843d1fc59b8b0d7a6e14a9012 100644 (file)
--- a/modules/mixer/simple/python.c
+++ b/modules/mixer/simple/python.c
@@ -19,11 +19,11 @@
  *
  */
 
+#include "Python.h"
 #include <stddef.h>
 #include "config.h"
 #include "asoundlib.h"
 #include "mixer_abst.h"
-#include <python/Python.h>
 
 struct python_priv {
        int py_initialized;