changed python-incdir to python-includes for configure.in
authorJaroslav Kysela <perex@perex.cz>
Wed, 12 Sep 2007 13:02:03 +0000 (15:02 +0200)
committerJaroslav Kysela <perex@perex.cz>
Wed, 12 Sep 2007 13:02:03 +0000 (15:02 +0200)
configure.in
modules/mixer/simple/Makefile.am

index 98e7790..fc4c1f8 100644 (file)
@@ -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"
index 1ab8c2e..7e49e07 100644 (file)
@@ -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