summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2018-09-19 13:31:49 +0200
committerOlivier CrĂȘte <olivier.crete@collabora.com>2018-09-19 13:31:49 +0200
commit73891c28fa27d5e65a71762e826f13747d743588 (patch)
tree12f2391aa9060b404cfb9d34fb3f079e6e78526a
parent5bcf5578a70f16f87c595560b0793e208b823c6c (diff)
downloadfarstream-73891c28fa27d5e65a71762e826f13747d743588.tar.gz
Remove Python dependency
Farstream 0.2 never depended on Python directly
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
-rw-r--r--m4/Makefile.am2
-rw-r--r--m4/as-check-python-headers.m430
4 files changed, 1 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index f81f6885..0bf9e861 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ SUBDIRS = \
docs \
common \
common-modified \
- m4 \
examples
# pkgconfig
@@ -22,7 +21,6 @@ DIST_SUBDIRS = \
docs \
common \
common-modified \
- m4 \
examples
# pkgconfig
@@ -30,7 +28,7 @@ EXTRA_DIST = \
AUTHORS COPYING NEWS README ChangeLog autogen.sh \
$(pcinfiles)
-ACLOCAL_AMFLAGS = -I m4 -I common/m4
+ACLOCAL_AMFLAGS = -I common/m4
check-valgrind:
cd tests/check && make check-valgrind
diff --git a/configure.ac b/configure.ac
index 38c49807..c0747192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,6 @@ GOBJECT_INTROSPECTION_CHECK([0.10.1])
dnl check for documentation tools
GTK_DOC_CHECK([1.18])
-AS_PATH_PYTHON([2.1])
AG_GST_PLUGIN_DOCS([1.8],[2.1])
dnl Make automake happy with per-target flags
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index ad0c1aec..00000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- as-check-python-headers.m4
diff --git a/m4/as-check-python-headers.m4 b/m4/as-check-python-headers.m4
deleted file mode 100644
index 585455fd..00000000
--- a/m4/as-check-python-headers.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl Copy pasted from gst-python's acinclude.m4 file
-
-dnl a macro to check for ability to create python extensions
-dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-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`
-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
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])