summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2011-04-26 19:07:13 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2011-04-26 19:07:13 +0200
commit6959ebd8e8d6a6b2c05aa3b4da8becf1599264d3 (patch)
tree809374aa69bf340ce42bc5cbb6fb81c15f283a2c /configure.ac
parentfc12ade012a19f321de4a643c4068e9faca7cf39 (diff)
parentde30ca60c40faa48e52a5e4c514cf13b355f2c76 (diff)
Merge branch 'master' into 0.11
Conflicts: common configure.ac
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac51
1 files changed, 24 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac
index e5c5928..8231966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ AS_AUTOTOOLS_ALTERNATE
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
+AC_CONFIG_MACRO_DIR([m4])
dnl set up gettext
dnl the version check needs to stay here because autopoint greps for it
@@ -67,6 +68,8 @@ AG_GST_ARG_GCOV
AG_GST_ARG_WITH_PACKAGE_NAME
AG_GST_ARG_WITH_PACKAGE_ORIGIN
+AG_GST_PKG_CONFIG_PATH
+
dnl *** checks for platform ***
dnl * hardware/architecture *
@@ -77,6 +80,16 @@ dnl find a compiler
AC_PROG_CC
AM_PROG_CC_C_O
+AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
+AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
+
+dnl check for gobject-introspection
+GOBJECT_INTROSPECTION_CHECK([0.6.3])
+
+dnl check for documentation tools
+AG_GST_DOCBOOK_CHECK
+GTK_DOC_CHECK([1.3])
+
dnl check for python
AM_PATH_PYTHON
AC_MSG_CHECKING(for python >= 2.3)
@@ -89,49 +102,33 @@ sys.exit(0)"
if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
then
+ HAVE_PYTHON=yes
AC_MSG_RESULT(okay)
else
- AC_MSG_ERROR(too old)
+ HAVE_PYTHON=no
+ AC_MSG_RESULT(no python)
fi
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
-AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
-
-dnl check for gobject-introspection
-GOBJECT_INTROSPECTION_CHECK([0.6.3])
-
-dnl check for documentation tools
-AG_GST_DOCBOOK_CHECK
-GTK_DOC_CHECK([1.3])
-
-AC_SUBST(PYGOBJECT_REQ, 2.11.2)
+AM_CHECK_PYTHON_HEADERS([HAVE_PYTHON_HEADERS=yes],[HAVE_PYTHON_HEADERS=no])
dnl check for pygobject (optional, used in the bindings)
+PYGOBJECT_REQ=2.11.2
PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= $PYGOBJECT_REQ,
- [
- HAVE_PYGOBJECT="yes"
- ],
- [
- HAVE_PYGOBJECT="no"
- ])
+ [HAVE_PYGOBJECT="yes"], [HAVE_PYGOBJECT="no"])
AC_SUBST(PYGOBJECT_CFLAGS)
dnl check for gst-python
PKG_CHECK_MODULES(PYGST, gst-python-0.10,
- [
- HAVE_PYGST="yes"
- ],
- [
- HAVE_PYGST="no"
- ])
+ [HAVE_PYGST="yes"], [HAVE_PYGST="no"])
if test "x$HAVE_PYGST" = "xyes"; then
PYGST_DEFSDIR=`pkg-config gst-python-0.10 --variable=defsdir`
fi
AC_SUBST(PYGST_DEFSDIR, $PYGST_DEFSDIR)
-if test "x$HAVE_PYTHON_HEADERS" = "xyes" -a \
+if test \
+ "x$HAVE_PYTHON" = "xyes" -a \
+ "x$HAVE_PYTHON_HEADERS" = "xyes" -a \
"x$HAVE_PYGOBJECT" = "xyes" -a \
"x$HAVE_PYGST" = "xyes"; then
HAVE_PYTHON_BINDINGS="yes"
@@ -286,10 +283,10 @@ Makefile
gst-rtsp.spec
common/Makefile
common/m4/Makefile
-m4/Makefile
gst/Makefile
gst/rtsp-server/Makefile
examples/Makefile
+tests/Makefile
bindings/Makefile
bindings/python/Makefile
bindings/python/codegen/Makefile