diff options
| author | David Schleef <ds@schleef.org> | 2010-06-09 12:35:40 -0700 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2010-06-09 12:41:00 -0700 |
| commit | 5ad2066f93f529eedb4dda7d30bf2a38fb78124d (patch) | |
| tree | d43976dee8ad43989e2e4f438008e422815548eb | |
| parent | fc8845702885a29ab90aa2be843612b0c6eeb030 (diff) | |
Use the Orc m4 macro
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index c43f963b0..c5267ef2b 100644 --- a/configure.ac +++ b/configure.ac @@ -252,33 +252,7 @@ dnl *** checks for dependency libraries *** dnl GLib is required AG_GST_GLIB_CHECK([2.20]) -dnl Orc -AC_ARG_ENABLE(orc, -AC_HELP_STRING([--enable-orc],[use Orc if installed]), -[case "${enableval}" in - yes) enable_orc=yes ;; - no) enable_orc=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-orc) ;; -esac -], -[enable_orc=yes]) dnl Default value - -ORC_REQ=0.4.5 -if test "x$enable_orc" = "xyes" ; then - PKG_CHECK_MODULES(ORC, orc-0.4 >= $ORC_REQ, [ - AC_DEFINE(HAVE_ORC, 1, [Use Orc]) - ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` - AC_SUBST(ORCC) - HAVE_ORC=yes - ], [ - AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) - HAVE_ORC=no - ]) -else - AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) - HAVE_ORC=no -fi -AM_CONDITIONAL(HAVE_ORC, test "x$HAVE_ORC" = "xyes") +ORC_CHECK([0.4.5]) dnl checks for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) @@ -1035,3 +1009,5 @@ sed \ AC_OUTPUT AG_GST_OUTPUT_PLUGINS +ORC_OUTPUT + |