mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-21 17:21:13 +00:00
Changed Makefiles to: detect xaudio (check header xaudio/decoder.h) detect mmx.h need something better.
Original commit message from CVS: Changed Makefiles to: detect xaudio (check header xaudio/decoder.h) detect mmx.h detect CSS (check if css.c is in plugins/dvdsrc), need something better. some LDFLAGS had *.la dependencies which failed for libtool The build is now 100% on my system.
This commit is contained in:
parent
0ec400890c
commit
b8a3a19774
7 changed files with 33 additions and 9 deletions
|
@ -5,6 +5,7 @@
|
|||
#undef HAVE_LIBGHTTP
|
||||
#undef HAVE_LIBXML
|
||||
#undef HAVE_LIBMMX
|
||||
#undef HAVE_XAUDIO
|
||||
|
||||
#undef HAVE_ATOMIC_H
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#undef HAVE_LIBGHTTP
|
||||
#undef HAVE_LIBXML
|
||||
#undef HAVE_LIBMMX
|
||||
#undef HAVE_XAUDIO
|
||||
|
||||
#undef HAVE_ATOMIC_H
|
||||
|
||||
|
|
28
configure.in
28
configure.in
|
@ -65,10 +65,21 @@ AC_DEFINE(HAVE_LIBXML)
|
|||
AM_CONDITIONAL(HAVE_LIBXML, test "x$HAVE_LIBXML" = "xyes")
|
||||
|
||||
|
||||
AC_CHECK_HEADER(mmx.h,[HAVE_LIBMMX=yes],)
|
||||
AC_DEFINE(HAVE_LIBMMX)
|
||||
AC_CHECK_HEADER(mmx.h,[
|
||||
AC_DEFINE(HAVE_LIBMMX), []])
|
||||
AM_CONDITIONAL(HAVE_LIBMMX, test "x$HAVE_LIBMMX" = "xyes")
|
||||
|
||||
AC_CHECK_HEADER(xaudio/decoder.h,[
|
||||
AC_DEFINE(HAVE_XAUDIO)
|
||||
HAVE_XAUDIO="yes", []
|
||||
])
|
||||
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
|
||||
|
||||
AC_CHECK_HEADER(xaudio/decoder.h,[
|
||||
AC_DEFINE(HAVE_XAUDIO)
|
||||
HAVE_XAUDIO="yes", []
|
||||
])
|
||||
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
|
||||
|
||||
PLUGINS_DIR=${libdir}/plugins
|
||||
AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
|
||||
|
@ -92,6 +103,19 @@ AC_ARG_ENABLE(profiling,
|
|||
[ --enable-profiling adds -pg to compiler commandline, for profiling],
|
||||
[CFLAGS="$CFLAGS -pg"])
|
||||
|
||||
AC_MSG_CHECKING(DVD CSS code)
|
||||
|
||||
dnl check if css.c exists (FIXME)
|
||||
if test -f plugins/dvdsrc/css.c
|
||||
then
|
||||
AC_MSG_RESULT(yes)
|
||||
HAVE_DECSS="yes"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
HAVE_DECSS="no"
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_DECSS, test "x$HAVE_DECSS" = "xyes")
|
||||
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la \
|
||||
$(shell gnome-config --libs gnomeui)
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
LDFLAGS = $(shell gnome-config --libs gnomeui)
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/gst \
|
||||
$(shell gnome-config --cflags gnomeui)
|
||||
|
||||
|
|
|
@ -30,6 +30,5 @@ noinst_HEADERS = \
|
|||
gstqueue.h \
|
||||
gstsinesrc.h
|
||||
|
||||
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) \
|
||||
$(top_srcdir)/gst/libgst.la
|
||||
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)
|
||||
|
|
|
@ -6,5 +6,5 @@ libgsttypes_la_SOURCES = \
|
|||
|
||||
#noinst_HEADERS =
|
||||
|
||||
libgsttypes_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
libgsttypes_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
|
||||
libgsttypes_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)
|
||||
|
|
|
@ -30,6 +30,5 @@ noinst_HEADERS = \
|
|||
gstqueue.h \
|
||||
gstsinesrc.h
|
||||
|
||||
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) \
|
||||
$(top_srcdir)/gst/libgst.la
|
||||
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
|
||||
libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)
|
||||
|
|
Loading…
Reference in a new issue