diff options
| author | David Schleef <ds@schleef.org> | 2008-03-24 20:26:29 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2008-03-24 20:26:29 +0000 |
| commit | e0e5089daa138a48c01e1b4c37f2aedf3540a5cd (patch) | |
| tree | 295b949f606445e63f0428aa3a0687ce13708f5b | |
| parent | 50ed01ec2a49e1774e6b3c0be0143f59d442a3f9 (diff) | |
* Makefile.am:
* configure.ac: Fix build system for recent changes in m4
files. Fixed problem building gst/gl/
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 16 |
3 files changed, 11 insertions, 19 deletions
@@ -1,3 +1,9 @@ +2008-03-24 David Schleef <ds@schleef.org> + + * Makefile.am: + * configure.ac: Fix build system for recent changes in m4 + files. Fixed problem building gst/gl/ + 2008-02-23 Tim-Philipp Müller <tim at centricular dot net> * gst-libs/gst/gl/gstglbuffer.c: diff --git a/Makefile.am b/Makefile.am index 6d31913..e5ab0c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,8 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc -if BUILD_EXTERNAL -SUBDIRS_EXT = ext -else -SUBDIRS_EXT = -endif - SUBDIRS = \ gst-libs \ - gst sys $(SUBDIRS_EXT) \ + gst sys ext \ tools \ tests \ docs \ diff --git a/configure.ac b/configure.ac index 204323d..574b3f8 100644 --- a/configure.ac +++ b/configure.ac @@ -84,18 +84,6 @@ AG_GST_ARG_WITH_PKG_CONFIG_PATH AG_GST_ARG_WITH_PACKAGE_NAME AG_GST_ARG_WITH_PACKAGE_ORIGIN -dnl these are all the gst plug-ins, compilable without additional libs -GST_PLUGINS_ALL="\ - gl \ - " -AC_SUBST(GST_PLUGINS_ALL) - -GST_PLUGINS_SELECTED="" -AG_GST_ARG_WITH_PLUGINS -AC_SUBST(GST_PLUGINS_SELECTED) - -AG_GST_ARG_ENABLE_EXTERNAL - dnl *** checks for platform *** dnl * hardware/architecture * @@ -255,6 +243,10 @@ AG_GST_SET_LEVEL_DEFAULT($GST_CVS) dnl used in examples AG_GST_DEFAULT_ELEMENTS +dnl *** plugins to includes *** + +AG_GST_CHECK_PLUGIN(gl) + dnl *** sys plug-ins *** echo |