diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2007-09-12 15:02:03 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-09-12 15:02:03 +0200 |
| commit | 8f5fa1a4aa27251bf945faae60291f602d3cc0b0 (patch) | |
| tree | 2c44cf17228ac298fec87e2232b47e5ed18f5d07 | |
| parent | b8aa6c876646c74dd03522c6a88e45e352a042fa (diff) | |
| download | alsa-lib-8f5fa1a4aa27251bf945faae60291f602d3cc0b0.tar.gz | |
changed python-incdir to python-includes for configure.in
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | modules/mixer/simple/Makefile.am | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 98e7790e..fc4c1f8b 100644 --- a/configure.in +++ b/configure.in @@ -340,28 +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="" +PYTHON_INCLUDES="" 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`) 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)]), - pythonincdir="$withval", pythonincdir=`python-config --includes`) + pythonincludes="$withval", pythonincludes=`python-config --includes`) if test -z "$pythonlibs"; then echo "Unable to determine python libraries! Probably python-config is not" 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" else PYTHON_LIBS="$pythonlibs" - PYTHON_INCDIR="$pythonincdir" + PYTHON_INCLUDES="$pythonincludes" fi fi AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_INCDIR) +AC_SUBST(PYTHON_INCLUDES) if test "$build_seq" != "yes"; then build_instr="no" diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am index 1ab8c2e6..7e49e074 100644 --- a/modules/mixer/simple/Makefile.am +++ b/modules/mixer/simple/Makefile.am @@ -1,6 +1,6 @@ pkglibdir = @ALSA_PLUGIN_DIR@/smixer pythonlibs = @PYTHON_LIBS@ -pythonincdir = @PYTHON_INCDIR@ +pythonincludes = @PYTHON_INCLUDES@ AM_CFLAGS = -g -O2 -W -Wall @@ -31,6 +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 = $(pythonincdir) +smixer_python_la_CFLAGS = $(pythonincludes) smixer_python_la_LIBADD = ../../../src/libasound.la endif |