From 46333092307654c2856dd8d6ed1ba2bc94e94566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 25 Sep 2007 08:51:36 +0000 Subject: [PATCH] configure.ac: Use AG_GST_ARG_WITH_PLUGINS, AG_GST_ARG_ENABLE_EXTERNAL and Original commit message from CVS: * configure.ac: Use AG_GST_ARG_WITH_PLUGINS, AG_GST_ARG_ENABLE_EXTERNAL and AG_GST_ARG_ENABLE_EXPERIMENTAL instead of duplicating those macros in configure.ac. --- ChangeLog | 7 +++++++ configure.ac | 42 +++++++----------------------------------- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75665cf1ce..3595617c42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-25 Sebastian Dröge + + * configure.ac: + Use AG_GST_ARG_WITH_PLUGINS, AG_GST_ARG_ENABLE_EXTERNAL and + AG_GST_ARG_ENABLE_EXPERIMENTAL instead of duplicating those macros + in configure.ac. + 2007-09-25 Sebastian Dröge Patch by: diff --git a/configure.ac b/configure.ac index 02229d5e30..ba321edb14 100644 --- a/configure.ac +++ b/configure.ac @@ -112,19 +112,7 @@ GST_PLUGINS_ALL="\ AC_SUBST(GST_PLUGINS_ALL) GST_PLUGINS_SELECTED="" - -AC_ARG_WITH(plugins, - AC_HELP_STRING([--with-plugins], - [comma-separated list of plug-ins to compile]), - [for i in `echo $withval | tr , ' '`; do - if echo $GST_PLUGINS_ALL | grep $i > /dev/null - then - GST_PLUGINS_SELECTED="$GST_PLUGINS_SELECTED $i" - else - echo "plug-in $i not recognized, ignoring..." - fi - done], - [GST_PLUGINS_SELECTED=$GST_PLUGINS_ALL]) +AG_GST_ARG_WITH_PLUGINS dnl disable gst plugins we might not be able to build on this dnl platform: udp and rtsp (ugly but minimally invasive) @@ -142,29 +130,13 @@ if test "x$HAVE_WINSOCK2_H" = "xyes"; then AC_SUBST(WIN32_LIBS) fi -dnl ext plug-ins; plug-ins that have external dependencies -AG_GST_CHECK_FEATURE(EXTERNAL, [building of plug-ins with external deps],, - [HAVE_EXTERNAL=yes], enabled, - [ - AC_MSG_NOTICE(building external plug-ins) - BUILD_EXTERNAL="yes" - ],[ - AC_MSG_NOTICE(all plug-ins with external dependencies will not be built) - BUILD_EXTERNAL="no" - ]) -AM_CONDITIONAL(BUILD_EXTERNAL, test "x$BUILD_EXTERNAL" = "xyes") +AG_GST_ARG_ENABLE_EXTERNAL -dnl experimental plug-ins; stuff that hasn't had the dust settle yet -AG_GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plug-ins],, -[HAVE_EXPERIMENTAL=yes],disabled, -[ - AC_MSG_WARN(building experimental plug-ins) - USE_GST_V4L2="yes" -],[ - AC_MSG_NOTICE(not building experimental plug-ins) - USE_GST_V4L2="no" - GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/monoscope//` -]) +AG_GST_ARG_ENABLE_EXPERIMENTAL +USE_GST_V4L2=$BUILD_EXPERIMENTAL +if test "x$BUILD_EXPERIMENTAL" != "xyes"; then + GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/monoscope//` +fi AC_SUBST(GST_PLUGINS_SELECTED)