changed python-incdir to python-includes for configure.in

This commit is contained in:
Jaroslav Kysela 2007-09-12 15:02:03 +02:00
parent b8aa6c8766
commit 8f5fa1a4aa
2 changed files with 8 additions and 8 deletions

View file

@ -340,28 +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="" PYTHON_INCLUDES=""
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`)
AC_ARG_WITH(pythonincludes, AC_ARG_WITH(pythonincludes,
AS_HELP_STRING([--with-pythonincdir=dir], AS_HELP_STRING([--with-pythonincludes=Cflags],
[specify python C header files (-I/usr/include/python)]), [specify python C header files (-I/usr/include/python)]),
pythonincdir="$withval", pythonincdir=`python-config --includes`) pythonincludes="$withval", pythonincludes=`python-config --includes`)
if test -z "$pythonlibs"; then if test -z "$pythonlibs"; 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 and" echo "available on this system. Please, use --with-pythonlibs and"
echo "--with-pythonincdir options. Python components are disabled in this build." echo "--with-pythonincludes 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" PYTHON_INCLUDES="$pythonincludes"
fi fi
fi fi
AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_LIBS)
AC_SUBST(PYTHON_INCDIR) AC_SUBST(PYTHON_INCLUDES)
if test "$build_seq" != "yes"; then if test "$build_seq" != "yes"; then
build_instr="no" build_instr="no"

View file

@ -1,6 +1,6 @@
pkglibdir = @ALSA_PLUGIN_DIR@/smixer pkglibdir = @ALSA_PLUGIN_DIR@/smixer
pythonlibs = @PYTHON_LIBS@ pythonlibs = @PYTHON_LIBS@
pythonincdir = @PYTHON_INCDIR@ pythonincludes = @PYTHON_INCLUDES@
AM_CFLAGS = -g -O2 -W -Wall AM_CFLAGS = -g -O2 -W -Wall
@ -31,6 +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 = $(pythonincdir) smixer_python_la_CFLAGS = $(pythonincludes)
smixer_python_la_LIBADD = ../../../src/libasound.la smixer_python_la_LIBADD = ../../../src/libasound.la
endif endif