+2007-02-28 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * m4/gst.m4:
+ Add
+ * m4/gst-arch.m4:
+ * m4/gst-args.m4:
+ * m4/gst-check.m4:
+ * m4/gst-debuginfo.m4:
+ * m4/gst-default.m4:
+ * m4/gst-doc.m4:
+ * m4/gst-error.m4:
+ * m4/gst-feature.m4:
+ * m4/gst-function.m4:
+ * m4/gst-gettext.m4:
+ * m4/gst-glib2.m4:
+ * m4/gst-libxml2.m4:
+ * m4/gst-parser.m4:
+ * m4/gst-plugin-docs.m4:
+ * m4/gst-plugindir.m4:
+ * m4/gst-valgrind.m4:
+ * m4/gst-x11.m4:
+ Convert all macros to use AG_GST style so we can properly warn
+ when they're missing if configure.ac calls AG_GST_INIT
+ Will require update in all GStreamer modules.
+
2007-02-11 Stefan Kost <ensonic@users.sf.net>
* m4/gst-args.m4:
- Remove 'enable' from configure swicth description as this leads to
+ Remove 'enable' from configure switch description as this leads to
confusing lines like "disable enable builing ...".
* m4/gst-feature.m4:
- Fix comment to sounds less horrible.
+ Fix comment to sound less horrible.
2007-02-07 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Frederic Peters <fpeters@entrouvert.com>
* m4/gst-parser.m4:
- Fix bison detection (#348354)
+ Fix bison detection (#348354)
2006-07-21 Stefan Kost <ensonic@users.sf.net>
-dnl GST_ARCH
+dnl AG_GST_ARCH
dnl sets up defines and automake conditionals for host architecture
dnl checks endianness
dnl defines HOST_CPU
-AC_DEFUN([GST_ARCH],
+AC_DEFUN([AG_GST_ARCH],
[
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables
])
dnl check if unaligned memory access works correctly
-AC_DEFUN([GST_UNALIGNED_ACCESS], [
+AC_DEFUN([AG_GST_UNALIGNED_ACCESS], [
AC_MSG_CHECKING([if unaligned memory access works correctly])
if test x"$as_cv_unaligned_access" = x ; then
case $host in
dnl configure-time options shared among gstreamer modules
-dnl GST_ARG_DEBUG
-dnl GST_ARG_PROFILING
-dnl GST_ARG_VALGRIND
-dnl GST_ARG_GCOV
+dnl AG_GST_ARG_DEBUG
+dnl AG_GST_ARG_PROFILING
+dnl AG_GST_ARG_VALGRIND
+dnl AG_GST_ARG_GCOV
-dnl GST_ARG_EXAMPLES
+dnl AG_GST_ARG_EXAMPLES
-dnl GST_ARG_WITH_PKG_CONFIG_PATH
+dnl AG_GST_ARG_WITH_PKG_CONFIG_PATH
dnl GST_ARG_PACKAGE_NAME
dnl GST_ARG_PACKAGE_ORIGIN
-dnl GST_ARG_WITH_PLUGINS
+dnl AG_GST_ARG_WITH_PLUGINS
-dnl GST_ARG_ENABLE_EXTERNAL
-dnl GST_ARG_ENABLE_EXPERIMENTAL
-dnl GST_ARG_ENABLE_BROKEN
+dnl AG_GST_ARG_ENABLE_EXTERNAL
+dnl AG_GST_ARG_ENABLE_EXPERIMENTAL
+dnl AG_GST_ARG_ENABLE_BROKEN
-AC_DEFUN([GST_ARG_DEBUG],
+AC_DEFUN([AG_GST_ARG_DEBUG],
[
dnl debugging stuff
AC_ARG_ENABLE(debug,
[USE_DEBUG=yes]) dnl Default value
])
-AC_DEFUN([GST_ARG_PROFILING],
+AC_DEFUN([AG_GST_ARG_PROFILING],
[
AC_ARG_ENABLE(profiling,
AC_HELP_STRING([--enable-profiling],
[USE_PROFILING=no]) dnl Default value
])
-AC_DEFUN([GST_ARG_VALGRIND],
+AC_DEFUN([AG_GST_ARG_VALGRIND],
[
dnl valgrind inclusion
AC_ARG_ENABLE(valgrind,
fi
])
-AC_DEFUN([GST_ARG_GCOV],
+AC_DEFUN([AG_GST_ARG_GCOV],
[
AC_ARG_ENABLE(gcov,
AC_HELP_STRING([--enable-gcov],
AM_CONDITIONAL(GST_GCOV_ENABLED, test x$enable_gcov = xyes)
])
-AC_DEFUN([GST_ARG_EXAMPLES],
+AC_DEFUN([AG_GST_ARG_EXAMPLES],
[
AC_ARG_ENABLE(examples,
AC_HELP_STRING([--disable-examples], [disable building examples]),
AM_CONDITIONAL(BUILD_EXAMPLES, test "x$BUILD_EXAMPLES" = "xyes")
])
-AC_DEFUN([GST_ARG_WITH_PKG_CONFIG_PATH],
+AC_DEFUN([AG_GST_ARG_WITH_PKG_CONFIG_PATH],
[
dnl possibly modify pkg-config path
AC_ARG_WITH(pkg-config-path,
])
-AC_DEFUN([GST_ARG_WITH_PACKAGE_NAME],
+AC_DEFUN([AG_GST_ARG_WITH_PACKAGE_NAME],
[
dnl package name in plugins
AC_ARG_WITH(package-name,
AC_SUBST(GST_PACKAGE_NAME)
])
-AC_DEFUN([GST_ARG_WITH_PACKAGE_ORIGIN],
+AC_DEFUN([AG_GST_ARG_WITH_PACKAGE_ORIGIN],
[
dnl package origin URL
AC_ARG_WITH(package-origin,
dnl sets GST_PLUGINS_SELECTED to the list given as an argument, or to
dnl GST_PLUGINS_ALL
-AC_DEFUN([GST_ARG_WITH_PLUGINS],
+AC_DEFUN([AG_GST_ARG_WITH_PLUGINS],
[
AC_ARG_WITH(plugins,
AC_HELP_STRING([--with-plugins],
[GST_PLUGINS_SELECTED=$GST_PLUGINS_ALL])
])
-AC_DEFUN([GST_ARG_ENABLE_EXTERNAL],
+AC_DEFUN([AG_GST_ARG_ENABLE_EXTERNAL],
[
- GST_CHECK_FEATURE(EXTERNAL, [enable building of plug-ins with external deps],,
+ AG_GST_CHECK_FEATURE(EXTERNAL, [enable building of plug-ins with external deps],,
HAVE_EXTERNAL=yes, enabled,
[
AC_MSG_NOTICE(building external plug-ins)
dnl experimental plug-ins; stuff that hasn't had the dust settle yet
dnl read 'builds, but might not work'
-AC_DEFUN([GST_ARG_ENABLE_EXPERIMENTAL],
+AC_DEFUN([AG_GST_ARG_ENABLE_EXPERIMENTAL],
[
- GST_CHECK_FEATURE(EXPERIMENTAL,
+ AG_GST_CHECK_FEATURE(EXPERIMENTAL,
[building of experimental plug-ins],,
HAVE_EXPERIMENTAL=yes, enabled,
[
])
dnl broken plug-ins; stuff that doesn't seem to build at the moment
-AC_DEFUN([GST_ARG_ENABLE_BROKEN],
+AC_DEFUN([AG_GST_ARG_ENABLE_BROKEN],
[
- GST_CHECK_FEATURE(BROKEN, [enable building of broken plug-ins],,
+ AG_GST_CHECK_FEATURE(BROKEN, [enable building of broken plug-ins],,
HAVE_BROKEN=yes, disabled,
[
AC_MSG_WARN([building broken plug-ins -- no bug reports on these, only patches ...])
dnl pkg-config-based checks for GStreamer modules and dependency modules
dnl generic:
-dnl GST_PKG_CHECK_MODULES([PREFIX], [WHICH], [REQUIRED])
+dnl AG_GST_PKG_CHECK_MODULES([PREFIX], [WHICH], [REQUIRED])
dnl sets HAVE_[$PREFIX], [$PREFIX]_*
-dnl GST_CHECK_MODULES([PREFIX], [MODULE], [MINVER], [NAME], [REQUIRED])
+dnl AG_GST_CHECK_MODULES([PREFIX], [MODULE], [MINVER], [NAME], [REQUIRED])
dnl sets HAVE_[$PREFIX], [$PREFIX]_*
dnl specific:
-dnl GST_CHECK_GST([MAJMIN], [MINVER], [REQUIRED])
+dnl AG_GST_CHECK_GST([MAJMIN], [MINVER], [REQUIRED])
dnl also sets/ACSUBSTs GST_TOOLS_DIR and GST_PLUGINS_DIR
-dnl GST_CHECK_GST_BASE([MAJMIN], [MINVER], [REQUIRED])
-dnl GST_CHECK_GST_GDP([MAJMIN], [MINVER], [REQUIRED])
-dnl GST_CHECK_GST_CONTROLLER([MAJMIN], [MINVER], [REQUIRED])
-dnl GST_CHECK_GST_CHECK([MAJMIN], [MINVER], [REQUIRED])
-dnl GST_CHECK_GST_PLUGINS_BASE([MAJMIN], [MINVER], [REQUIRED])
+dnl AG_GST_CHECK_GST_BASE([MAJMIN], [MINVER], [REQUIRED])
+dnl AG_GST_CHECK_GST_GDP([MAJMIN], [MINVER], [REQUIRED])
+dnl AG_GST_CHECK_GST_CONTROLLER([MAJMIN], [MINVER], [REQUIRED])
+dnl AG_GST_CHECK_GST_CHECK([MAJMIN], [MINVER], [REQUIRED])
+dnl AG_GST_CHECK_GST_PLUGINS_BASE([MAJMIN], [MINVER], [REQUIRED])
dnl also sets/ACSUBSTs GSTPB_PLUGINS_DIR
-AC_DEFUN([GST_PKG_CHECK_MODULES],
+AC_DEFUN([AG_GST_PKG_CHECK_MODULES],
[
which="[$2]"
dnl not required by default, since we use this mostly for plugin deps
dnl It gets done automatically in automake >= 1.7, which we now require
]))
-AC_DEFUN([GST_CHECK_MODULES],
+AC_DEFUN([AG_GST_CHECK_MODULES],
[
module=[$2]
minver=[$3]
dnl It gets done automatically in automake >= 1.7, which we now require
]))
-AC_DEFUN([GST_CHECK_GST],
+AC_DEFUN([AG_GST_CHECK_GST],
[
- GST_CHECK_MODULES(GST, gstreamer-[$1], [$2], [GStreamer], [$3])
+ AG_GST_CHECK_MODULES(GST, gstreamer-[$1], [$2], [GStreamer], [$3])
GST_TOOLS_DIR=`$PKG_CONFIG --variable=toolsdir gstreamer-[$1]`
if test -z $GST_TOOLS_DIR; then
AC_MSG_ERROR(
AC_SUBST(GST_PLUGINS_DIR)
])
-AC_DEFUN([GST_CHECK_GST_BASE],
+AC_DEFUN([AG_GST_CHECK_GST_BASE],
[
- GST_CHECK_MODULES(GST_BASE, gstreamer-base-[$1], [$2],
+ AG_GST_CHECK_MODULES(GST_BASE, gstreamer-base-[$1], [$2],
[GStreamer Base Libraries], [$3])
])
-AC_DEFUN([GST_CHECK_GST_GDP],
+AC_DEFUN([AG_GST_CHECK_GST_GDP],
[
- GST_CHECK_MODULES(GST_GDP, gstreamer-dataprotocol-[$1], [$2],
+ AG_GST_CHECK_MODULES(GST_GDP, gstreamer-dataprotocol-[$1], [$2],
[GStreamer Data Protocol Library], [$3])
])
-AC_DEFUN([GST_CHECK_GST_CONTROLLER],
+AC_DEFUN([AG_GST_CHECK_GST_CONTROLLER],
[
- GST_CHECK_MODULES(GST_CONTROLLER, gstreamer-controller-[$1], [$2],
+ AG_GST_CHECK_MODULES(GST_CONTROLLER, gstreamer-controller-[$1], [$2],
[GStreamer Controller Library], [$3])
])
-AC_DEFUN([GST_CHECK_GST_CHECK],
+AC_DEFUN([AG_GST_CHECK_GST_CHECK],
[
- GST_CHECK_MODULES(GST_CHECK, gstreamer-check-[$1], [$2],
+ AG_GST_CHECK_MODULES(GST_CHECK, gstreamer-check-[$1], [$2],
[GStreamer Check unittest Library], [$3])
])
-AC_DEFUN([GST_CHECK_GST_PLUGINS_BASE],
+AC_DEFUN([AG_GST_CHECK_GST_PLUGINS_BASE],
[
- GST_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-[$1], [$2],
+ AG_GST_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-[$1], [$2],
[GStreamer Base Plug-ins Library], [$3])
dnl check for where base plug-ins got installed
-AC_DEFUN([GST_DEBUGINFO], [
+AC_DEFUN([AG_GST_DEBUGINFO], [
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--disable-debug],[disable addition of -g debugging info]),
[case "${enableval}" in
dnl default elements used for tests and such
-dnl GST_DEFAULT_ELEMENTS
+dnl AG_GST_DEFAULT_ELEMENTS
-AC_DEFUN([GST_DEFAULT_ELEMENTS],
+AC_DEFUN([AG_GST_DEFAULT_ELEMENTS],
[
dnl decide on default elements
dnl FIXME: provide configure-time options for this
-AC_DEFUN([GST_DOCBOOK_CHECK],
+AC_DEFUN([AG_GST_DOCBOOK_CHECK],
[
dnl choose a location to install docbook docs in
if test "x$PACKAGE_TARNAME" = "x"
dnl Last modification: 2005-10-16
-dnl GST_SET_ERROR_CFLAGS([ADD-WERROR])
-dnl GST_SET_LEVEL_DEFAULT([IS-CVS-VERSION])
+dnl AG_GST_SET_ERROR_CFLAGS([ADD-WERROR])
+dnl AG_GST_SET_LEVEL_DEFAULT([IS-CVS-VERSION])
dnl Sets ERROR_CFLAGS to something the compiler will accept.
dnl These flags can be overridden at make time:
dnl make ERROR_CFLAGS=
-AC_DEFUN([GST_SET_ERROR_CFLAGS],
+AC_DEFUN([AG_GST_SET_ERROR_CFLAGS],
[
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AS_COMPILER_FLAG])
])
dnl Sets the default error level for debugging messages
-AC_DEFUN([GST_SET_LEVEL_DEFAULT],
+AC_DEFUN([AG_GST_SET_LEVEL_DEFAULT],
[
dnl define correct errorlevel for debugging messages. We want to have
dnl GST_ERROR messages printed when running cvs builds
dnl Richard Boulton <richard-alsa@tartarus.org>
dnl Thomas Vander Stichele <thomas@apestaart.org> added useful stuff
dnl Last modification: 25/06/2001
-dnl GST_CHECK_FEATURE(FEATURE-NAME, FEATURE-DESCRIPTION,
+dnl AG_GST_CHECK_FEATURE(FEATURE-NAME, FEATURE-DESCRIPTION,
dnl DEPENDENT-PLUGINS, TEST-FOR-FEATURE,
dnl DISABLE-BY-DEFAULT, ACTION-IF-USE, ACTION-IF-NOTUSE)
dnl
dnl thomas :
dnl we also added a history.
dnl GST_PLUGINS_YES will contain all plugins to be built
-dnl that were checked through GST_CHECK_FEATURE
+dnl that were checked through AG_GST_CHECK_FEATURE
dnl GST_PLUGINS_NO will contain those that won't be built
-AC_DEFUN([GST_CHECK_FEATURE],
+AC_DEFUN([AG_GST_CHECK_FEATURE],
echo
AC_MSG_NOTICE(*** checking feature: [$2] ***)
if test "x[$3]" != "x"
dnl to set *_CFLAGS and *_LIBS and check existence of a feature.
dnl Richard Boulton <richard-alsa@tartarus.org>
dnl Last modification: 26/06/2001
-dnl GST_CHECK_CONFIGPROG(FEATURE-NAME, CONFIG-PROG-FILENAME, MODULES)
+dnl AG_GST_CHECK_CONFIGPROG(FEATURE-NAME, CONFIG-PROG-FILENAME, MODULES)
dnl
dnl This check was written for GStreamer: it should be renamed and checked
dnl for portability if you decide to use it elsewhere.
dnl
-AC_DEFUN([GST_CHECK_CONFIGPROG],
+AC_DEFUN([AG_GST_CHECK_CONFIGPROG],
[
AC_PATH_PROG([$1]_CONFIG, [$2], no)
if test x$[$1]_CONFIG = xno; then
dnl sets HAVE_module if we have it
dnl Richard Boulton <richard-alsa@tartarus.org>
dnl Last modification: 26/06/2001
-dnl GST_CHECK_LIBHEADER(FEATURE-NAME, LIB NAME, LIB FUNCTION, EXTRA LD FLAGS,
+dnl AG_GST_CHECK_LIBHEADER(FEATURE-NAME, LIB NAME, LIB FUNCTION, EXTRA LD FLAGS,
dnl HEADER NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
dnl
dnl This check was written for GStreamer: it should be renamed and checked
dnl for portability if you decide to use it elsewhere.
dnl
-AC_DEFUN([GST_CHECK_LIBHEADER],
+AC_DEFUN([AG_GST_CHECK_LIBHEADER],
[
AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no,[$4])
if test "x$HAVE_[$1]" = "xyes"; then
dnl
dnl Add a subsystem --disable flag and all the necessary symbols and substitions
dnl
-dnl GST_CHECK_SUBSYSTEM_DISABLE(SYSNAME, [subsystem name])
+dnl AG_GST_CHECK_SUBSYSTEM_DISABLE(SYSNAME, [subsystem name])
dnl
-AC_DEFUN([GST_CHECK_SUBSYSTEM_DISABLE],
+AC_DEFUN([AG_GST_CHECK_SUBSYSTEM_DISABLE],
[
dnl this define will replace each literal subsys_def occurrence with
dnl the lowercase hyphen-separated subsystem
dnl relies on GST_PLUGINS_ALL, GST_PLUGINS_SELECTED, GST_PLUGINS_YES,
dnl GST_PLUGINS_NO, and BUILD_EXTERNAL
-AC_DEFUN([GST_OUTPUT_PLUGINS], [
+AC_DEFUN([AG_GST_OUTPUT_PLUGINS], [
echo "configure: *** Plug-ins without external dependencies that will be built:"
( for i in $GST_PLUGINS_SELECTED; do echo -e '\t'$i; done ) | sort
dnl Check for compiler mechanism to show functions in debugging
dnl copied from an Ali patch floating on the internet
dnl
-AC_DEFUN([GST_CHECK_FUNCTION],[
+AC_DEFUN([AG_GST_CHECK_FUNCTION],[
dnl #1: __PRETTY_FUNCTION__
AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__)
AC_CACHE_VAL(have_pretty_function,[
dnl gettext setup
-dnl GST_GETTEXT([gettext-package])
+dnl AG_GST_GETTEXT([gettext-package])
dnl defines GETTEXT_PACKAGE and LOCALEDIR
-AC_DEFUN([GST_GETTEXT],
+AC_DEFUN([AG_GST_GETTEXT],
[
GETTEXT_PACKAGE=[$1]
AC_SUBST(GETTEXT_PACKAGE)
dnl check for a minimum version of GLib
-dnl GST_GLIB_CHECK([minimum-version-required])
+dnl AG_GST_GLIB_CHECK([minimum-version-required])
-AC_DEFUN([GST_GLIB_CHECK],
+AC_DEFUN([AG_GST_GLIB_CHECK],
[
dnl Minimum required version of GLib
GLIB_REQ=[$1]
if test "x$GLIB_REQ" = "x"
then
- AC_MSG_ERROR([Please specify a required version for [GST_GLIB_CHECK]])
+ AC_MSG_ERROR([Please specify a required version for GLib 2.0])
fi
AC_SUBST(GLIB_REQ)
dnl this macro sets and AC_SUBSTs XML_CFLAGS and XML_LIBS
dnl it also sets LIBXML_PKG, used for the pkg-config file
-AC_DEFUN([GST_LIBXML2_CHECK],
+AC_DEFUN([AG_GST_LIBXML2_CHECK],
[
dnl Minimum required version of libxml2
dnl default to 2.4.9 if not specified
-AC_DEFUN([GST_BISON_CHECK],
+AC_DEFUN([AG_GST_BISON_CHECK],
[
dnl FIXME: check if AC_PROG_YACC is suitable here
dnl FIXME: make precious
fi
])
-AC_DEFUN([GST_FLEX_CHECK],
+AC_DEFUN([AG_GST_FLEX_CHECK],
[
dnl we require flex for building the parser
dnl FIXME: check if AC_PROG_LEX is suitable here
-dnl GST_PYXML_CHECK([MINIMUM-PYTHON-VERSION])
+dnl AG_GST_PYXML_CHECK([MINIMUM-PYTHON-VERSION])
-AC_DEFUN([GST_PYXML_CHECK],
+AC_DEFUN([AG_GST_PYXML_CHECK],
[
AC_BEFORE([AS_PATH_PYTHON],[$0])dnl find python first
fi
])
-dnl GST_PLUGIN_DOCS([MINIMUM-GTK-DOC-VERSION],[MINIMUM-PYTHON-VERSION])
+dnl AG_GST_PLUGIN_DOCS([MINIMUM-GTK-DOC-VERSION],[MINIMUM-PYTHON-VERSION])
dnl
dnl checks for prerequisites for the common/mangle-tmpl.py script
-dnl used when building the plugin documenatation
+dnl used when building the plugin documentation
-AC_DEFUN([GST_PLUGIN_DOCS],
+AC_DEFUN([AG_GST_PLUGIN_DOCS],
[
AC_BEFORE([GTK_DOC_CHECK],[$0])dnl check for gtk-doc first
if test x$enable_gtk_doc = xyes -a x$have_gtk_doc = xyes; then
- GST_PYXML_CHECK([$1])
+ AG_GST_PYXML_CHECK([$1])
fi
build_plugin_docs=no
-dnl GST_SET_PLUGINDIR
+dnl AG_GST_SET_PLUGINDIR
dnl AC_DEFINE PLUGINDIR to the full location where plug-ins will be installed
dnl AC_SUBST plugindir, to be used in Makefile.am's
-AC_DEFUN([GST_SET_PLUGINDIR],
+AC_DEFUN([AG_GST_SET_PLUGINDIR],
[
dnl define location of plugin directory
AS_AC_EXPAND(PLUGINDIR, ${libdir}/gstreamer-$GST_MAJORMINOR)
-AC_DEFUN([GST_VALGRIND_CHECK],
+AC_DEFUN([AG_GST_VALGRIND_CHECK],
[
dnl valgrind inclusion
AC_ARG_ENABLE(valgrind,
dnl macros for X-related detections
dnl AC_SUBST's HAVE_X, X_CFLAGS, X_LIBS
-AC_DEFUN([GST_CHECK_X],
+AC_DEFUN([AG_GST_CHECK_X],
[
AC_PATH_XTRA
ac_cflags_save="$CFLAGS"
dnl non-PIC libXv, if not then don not use Xv.
dnl FIXME: perhaps warn user if they have a shared libXv since
dnl this is an error until XFree86 starts shipping one
-AC_DEFUN([GST_CHECK_XV],
+AC_DEFUN([AG_GST_CHECK_XV],
[
if test x$HAVE_X = xyes; then
AC_CHECK_LIB(Xv_pic, XvQueryExtension,
--- /dev/null
+dnl AG_GST_INIT
+dnl sets up use of GStreamer configure.ac macros
+dnl all GStreamer autoconf macros are prefixed
+dnl with AG_GST_ for public macros
+dnl with _AG_GST_ for private macros
+
+AC_DEFUN([AG_GST_INIT],
+[
+ m4_pattern_forbid(^_?AG_GST_)
+])