mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 09:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

Changed Makefiles to: detect xaudio (check header xaudio/decoder.h) detect mmx.h need something better.

Browse source 
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:
Wim Taymans 2000-01-30 22:50:27 +00:00
parent 0ec400890c
commit b8a3a19774
7 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
acconfig.h
View file

@ -5,6 +5,7 @@
#undef HAVE_LIBGHTTP #undef HAVE_LIBGHTTP
#undef HAVE_LIBXML #undef HAVE_LIBXML
#undef HAVE_LIBMMX #undef HAVE_LIBMMX
#undef HAVE_XAUDIO
#undef HAVE_ATOMIC_H #undef HAVE_ATOMIC_H

1
config.h.in
View file

@ -13,6 +13,7 @@
#undef HAVE_LIBGHTTP #undef HAVE_LIBGHTTP
#undef HAVE_LIBXML #undef HAVE_LIBXML
#undef HAVE_LIBMMX #undef HAVE_LIBMMX
#undef HAVE_XAUDIO
#undef HAVE_ATOMIC_H #undef HAVE_ATOMIC_H

28
configure.in
View file

@ -65,10 +65,21 @@ AC_DEFINE(HAVE_LIBXML)
AM_CONDITIONAL(HAVE_LIBXML, test "x$HAVE_LIBXML" = "xyes") AM_CONDITIONAL(HAVE_LIBXML, test "x$HAVE_LIBXML" = "xyes")
AC_CHECK_HEADER(mmx.h,[HAVE_LIBMMX=yes],) AC_CHECK_HEADER(mmx.h,[
AC_DEFINE(HAVE_LIBMMX) AC_DEFINE(HAVE_LIBMMX), []])
AM_CONDITIONAL(HAVE_LIBMMX, test "x$HAVE_LIBMMX" = "xyes") 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 PLUGINS_DIR=${libdir}/plugins
AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR") AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
@ -92,6 +103,19 @@ AC_ARG_ENABLE(profiling,
[ --enable-profiling adds -pg to compiler commandline, for profiling], [ --enable-profiling adds -pg to compiler commandline, for profiling],
[CFLAGS="$CFLAGS -pg"]) [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(CFLAGS)
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)

4
editor/Makefile.am
View file

@ -1,5 +1,5 @@
LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la \ LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
$(shell gnome-config --libs gnomeui) LDFLAGS = $(shell gnome-config --libs gnomeui)
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/gst \ INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/gst \
$(shell gnome-config --cflags gnomeui) $(shell gnome-config --cflags gnomeui)

3
gst/elements/Makefile.am
View file

@ -30,6 +30,5 @@ noinst_HEADERS = \
gstqueue.h \ gstqueue.h \
gstsinesrc.h gstsinesrc.h
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) \ libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
$(top_srcdir)/gst/libgst.la
libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE) libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)

2
gst/types/Makefile.am
View file

@ -6,5 +6,5 @@ libgsttypes_la_SOURCES = \
#noinst_HEADERS = #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) libgsttypes_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)

3
plugins/elements/Makefile.am
View file

@ -30,6 +30,5 @@ noinst_HEADERS = \
gstqueue.h \ gstqueue.h \
gstsinesrc.h gstsinesrc.h
libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) \ libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS)
$(top_srcdir)/gst/libgst.la
libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE) libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)