mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jaroslav Kysela 2007-08-31 15:22:26 +02:00
parent 77603ff798
commit dcdf8c2a00
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
configure.in
View file

@ -340,21 +340,28 @@ AC_ARG_ENABLE(python,
AS_HELP_STRING([--disable-python], [disable the python components]), AS_HELP_STRING([--disable-python], [disable the python components]),
[build_python="$enableval"], [build_python="yes"]) [build_python="$enableval"], [build_python="yes"])
PYTHON_LIBS="" PYTHON_LIBS=""
PYTHON_INCDIR=""
if test "$build_python" = "yes"; then if test "$build_python" = "yes"; then
AC_ARG_WITH(pythonlibs, AC_ARG_WITH(pythonlibs,
AS_HELP_STRING([--with-pythonlibs=ldflags], AS_HELP_STRING([--with-pythonlibs=ldflags],
[specify python libraries (-lpthread -lm -ldl -lpython2.4)]), [specify python libraries (-lpthread -lm -ldl -lpython2.4)]),
pythonlibs="$withval", pythonlibs=`python-config --libs`) 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 "Unable to determine python libraries! Probably python-config is not"
echo "available on this system. Please, use --with-pythonlibs options." echo "available on this system. Please, use --with-pythonlibs and"
echo "Python components are disabled in this build." echo "--with-pythonincdir options. Python components are disabled in this build."
build_python="no" build_python="no"
else else
PYTHON_LIBS="$pythonlibs" PYTHON_LIBS="$pythonlibs"
PYTHON_INCDIR="$pythonincdir"
fi fi
fi fi
AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_LIBS)
AC_SUBST(PYTHON_INCDIR)
if test "$build_seq" != "yes"; then if test "$build_seq" != "yes"; then
build_instr="no" build_instr="no"

2
modules/mixer/simple/Makefile.am
View file

@ -1,5 +1,6 @@
pkglibdir = @ALSA_PLUGIN_DIR@/smixer pkglibdir = @ALSA_PLUGIN_DIR@/smixer
pythonlibs = @PYTHON_LIBS@ pythonlibs = @PYTHON_LIBS@
pythonincdir = @PYTHON_INCDIR@
AM_CFLAGS = -g -O2 -W -Wall AM_CFLAGS = -g -O2 -W -Wall
@ -30,5 +31,6 @@ smixer_hda_la_LIBADD = ../../../src/libasound.la
if BUILD_PYTHON if BUILD_PYTHON
smixer_python_la_SOURCES = python.c smixer_python_la_SOURCES = python.c
smixer_python_la_LDFLAGS = -module -avoid-version $(pythonlibs) smixer_python_la_LDFLAGS = -module -avoid-version $(pythonlibs)
smixer_python_la_CFLAGS = -I$(pythonincdir)
smixer_python_la_LIBADD = ../../../src/libasound.la smixer_python_la_LIBADD = ../../../src/libasound.la
endif endif

2
modules/mixer/simple/python.c
View file

@ -19,11 +19,11 @@
* *
*/ */
#include "Python.h"
#include <stddef.h> #include <stddef.h>
#include "config.h" #include "config.h"
#include "asoundlib.h" #include "asoundlib.h"
#include "mixer_abst.h" #include "mixer_abst.h"
#include <python/Python.h>
struct python_priv { struct python_priv {
int py_initialized; int py_initialized;