diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-06-09 17:38:20 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-06-09 17:38:20 +0000 |
| commit | a916520e6c55ec09d49e03f12e09bfe7ebf39800 (patch) | |
| tree | 967946b0ef0b1073b2c9979371336d0b5731fba1 | |
| parent | 02591e63a550c2d0a04542f9d8e38e5ae1fb4570 (diff) | |
| download | gst-plugins-bad-a916520e6c55ec09d49e03f12e09bfe7ebf39800.tar.gz gst-plugins-bad-a916520e6c55ec09d49e03f12e09bfe7ebf39800.tar.bz2 gst-plugins-bad-a916520e6c55ec09d49e03f12e09bfe7ebf39800.zip | |
configure.ac: Check for X before using X_CFLAGS in the check for opengl (#343866).
Original commit message from CVS:
* configure.ac:
Check for X before using X_CFLAGS in the check for opengl (#343866).
* ext/musepack/Makefile.am:
* ext/wavpack/Makefile.am:
* gst/speed/Makefile.am:
Add missing GST_LIBS, fixes build on cygwin (#343866).
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ext/musepack/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/wavpack/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/speed/Makefile.am | 2 |
5 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2006-06-09 Tim-Philipp Müller <tim at centricular dot net> + + * configure.ac: + Check for X before using X_CFLAGS in the check for opengl (#343866). + + * ext/musepack/Makefile.am: + * ext/wavpack/Makefile.am: + * gst/speed/Makefile.am: + Add missing GST_LIBS, fixes build on cygwin (#343866). + 2006-06-06 Thomas Vander Stichele <thomas at apestaart dot org> * configure.ac: diff --git a/configure.ac b/configure.ac index 81972668..cc1f90b2 100644 --- a/configure.ac +++ b/configure.ac @@ -222,6 +222,7 @@ dnl *** sys plug-ins *** dnl OpenGL translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true) +GST_CHECK_X save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" diff --git a/ext/musepack/Makefile.am b/ext/musepack/Makefile.am index 21cd31e8..597c4a38 100644 --- a/ext/musepack/Makefile.am +++ b/ext/musepack/Makefile.am @@ -4,7 +4,7 @@ libgstmusepack_la_SOURCES = \ gstmusepackdec.c \ gstmusepackreader.c libgstmusepack_la_CFLAGS = $(MUSEPACK_CFLAGS) $(GST_CFLAGS) -libgstmusepack_la_LIBADD = $(MUSEPACK_LIBS) +libgstmusepack_la_LIBADD = $(MUSEPACK_LIBS) $(GST_LIBS) libgstmusepack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am index 6660a726..3a3fae3b 100644 --- a/ext/wavpack/Makefile.am +++ b/ext/wavpack/Makefile.am @@ -7,7 +7,7 @@ libgstwavpack_la_SOURCES = gstwavpack.c \ gstwavpackdec.c libgstwavpack_la_CFLAGS = $(GST_CFLAGS) $(WAVPACK_CFLAGS) -libgstwavpack_la_LIBADD = $(WAVPACK_LIBS) +libgstwavpack_la_LIBADD = $(GST_LIBS) $(WAVPACK_LIBS) libgstwavpack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstwavpackparse.h gstwavpackdec.h gstwavpackcommon.h diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am index d2b75725..00846d28 100644 --- a/gst/speed/Makefile.am +++ b/gst/speed/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstspeed.la libgstspeed_la_SOURCES = gstspeed.c libgstspeed_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstspeed_la_LIBADD = +libgstspeed_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) libgstspeed_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstspeed.h |