diff options
| author | Philip Balister <philip@balister.org> | 2008-02-12 13:42:34 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2008-02-12 13:42:34 +0000 |
| commit | 64efb6d640ada9fffcb4c98a1e4ae4f8d2bd0e9c (patch) | |
| tree | c5581b96374be871d59809b2934aa791ccc5bfdf /packages/python/python-gst | |
| parent | 73c9713cacf49f300e034bbb6b47df17caf29d4f (diff) | |
| parent | 3168ff71a18d3bfa339f0ccdace03878ab2094f2 (diff) | |
merge of '967336334b2d3b22623c9851eb0ab8a2f5ad19c2'
and 'f1ce41fae2ee4dc6bfc75fb8d991a37869ef24d8'
Diffstat (limited to 'packages/python/python-gst')
| -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" |