diff options
| author | Andy Wingo <wingo@oblong.com> | 2010-12-13 16:38:09 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@oblong.com> | 2010-12-13 16:38:09 +0100 |
| commit | a7d6578a80bd748e743b14f7c9a30ec4161cbf3f (patch) | |
| tree | ebb8345a3334ab59efd80b847f4ad3fe25f15144 | |
| parent | ca76a73ca0a25c87bca4ee339150ea4bf414d7aa (diff) | |
python an optional dependency
* configure.ac: Move up valgrind and g-i checks. Make the python
dependency optional, as it was before.
| -rw-r--r-- | configure.ac | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 3c225d0..f83f35d 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,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 +99,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) 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) +AC_SUBST(PYGOBJECT_REQ, 2.11.2) 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" |