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).
This commit is contained in:
Tim-Philipp Müller 2006-06-09 17:38:20 +00:00
parent 02591e63a5
commit a916520e6c
5 changed files with 14 additions and 3 deletions

View file

@ -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:

View file

@ -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"

View file

@ -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 = \

View file

@ -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

View file

@ -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