diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-12 15:14:08 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-12 15:14:08 +0000 |
| commit | f5201f61e5ef7c839f1deb992fa89c579f27e588 (patch) | |
| tree | cd8a86687142a7ee1b08210ee6dcd104933e48b5 /packages/python/python-gst/python-path.patch | |
| parent | 5e20762710bc6192195a5a771d4fae5a32339f3b (diff) | |
| parent | 4337f518ff1eef5452e10b7ee9f4dc48010048f1 (diff) | |
merge of '9a8a930122d29384549135ea3382884efdb4000e'
and 'a0976fae9659c5e0c23233eaa6f5a6e777a1a044'
Diffstat (limited to 'packages/python/python-gst/python-path.patch')
| -rw-r--r-- | packages/python/python-gst/python-path.patch | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/packages/python/python-gst/python-path.patch b/packages/python/python-gst/python-path.patch index 465d5b180a..6cbad8cc5f 100644 --- a/packages/python/python-gst/python-path.patch +++ b/packages/python/python-gst/python-path.patch @@ -1,24 +1,33 @@ -Index: gst-python-0.10.7/acinclude.m4 +Index: gst-python-0.10.10/acinclude.m4 =================================================================== ---- gst-python-0.10.7.orig/acinclude.m4 2007-03-02 14:10:28.652128590 +0100 -+++ gst-python-0.10.7/acinclude.m4 2007-03-02 14:41:00.106728708 +0100 -@@ -43,12 +43,19 @@ +--- gst-python-0.10.10.orig/acinclude.m4 ++++ gst-python-0.10.10/acinclude.m4 +@@ -43,16 +43,20 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES +-py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +-if $PYTHON-config --help 2>/dev/null; then +- PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` + +AC_ARG_WITH(python-includes, -+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) ++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) +if test x$py_exec_prefix != x; then -+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" -+else - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` - PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++ PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" + else +- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +- if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +- fi ++ py_prefix=`$PYTHON -c "import sys; print sys.prefix"` ++ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` ++ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" ++if test "$py_prefix" != "$py_exec_prefix"; then ++ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++ fi fi -+fi ++ AC_SUBST(PYTHON_INCLUDES) dnl check if the headers exist: save_CPPFLAGS="$CPPFLAGS" |