Skip to content

GitLab

Commit f3d3912f authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to... 

Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to pkg-config/, .m4 file moved from plugins to core)

Original commit message from CVS:
Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to pkg-config/, .m4 file moved from plugins to core)
parent 3ec7ab1f
Hide whitespace changes
Inline Side-by-side
Makefile.am
View file @ f3d3912f
......@@ -16,34 +16,23 @@ else
EXAMPLES_DIR=
endif
all-local: gstreamer-libs-@GST_MAJORMINOR@.pc gstreamer-play-@GST_MAJORMINOR@.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc gst-element-check-@GST_MAJORMINOR@.m4
gstreamer-libs-@GST_MAJORMINOR@.pc: gstreamer-libs.pc gstreamer-libs.pc.in
cp gstreamer-libs.pc gstreamer-libs-@GST_MAJORMINOR@.pc
gstreamer-play-@GST_MAJORMINOR@.pc: gstreamer-play.pc gstreamer-play.pc.in
cp gstreamer-play.pc gstreamer-play-@GST_MAJORMINOR@.pc
gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-libs-uninstalled.pc gstreamer-libs-uninstalled.pc.in
cp gstreamer-libs-uninstalled.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc
gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-play-uninstalled.pc gstreamer-play-uninstalled.pc.in
cp gstreamer-play-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
gstreamer-libs-@GST_MAJORMINOR@.pc \
gstreamer-play-@GST_MAJORMINOR@.pc
aclocaldir = $(datadir)/aclocal
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
SUBDIRS=gst-libs gst sys $(EXT_DIR) $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite
DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf testsuite
EXTRA_DIST=gst-plugins.spec depcomp gst-element-check.m4 \
gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in \
SUBDIRS=gst-libs \
gst sys $(EXT_DIR) \
$(EXAMPLES_DIR) \
tools \
$(GCONF_DIR) \
testsuite \
pkgconfig
DIST_SUBDIRS=gst-libs \
gst sys ext \
examples \
tools \
gconf \
testsuite \
pkgconfig
EXTRA_DIST=gst-plugins.spec depcomp \
AUTHORS COPYING README RELEASE REQUIREMENTS \
ChangeLog autogen.sh common m4
......
configure.ac
View file @ f3d3912f
......@@ -157,10 +157,17 @@ if test -z $GST_TOOLS_DIR; then
fi
AC_SUBST(GST_TOOLS_DIR)
dnl additional gstcontrol libs
GST_CONTROL_LIBS=`pkg-config --variable=gstcontrol_libs gstreamer-$GST_MAJORMINOR`
dnl check for gstreamer-control; uninstalled is selected preferentially
PKG_CHECK_MODULES(GST_CONTROL, gstreamer-control-$GST_MAJORMINOR >= $GST_PLUGINS_VERSION_MAJOR.$GST_PLUGINS_VERSION_MINOR.$GST_PLUGINS_VERSION_MICRO,
HAVE_GST_CONTROL="yes", HAVE_GST_CONTROL="no")
if test "x$HAVE_GST_CONTROL" = "xno"; then
AC_MSG_ERROR(no GStreamer Control Libs found)
fi
AC_SUBST(GST_CONTROL_LIBS)
dnl Set up conditionals for (target) architecture:
dnl ==============================================
......@@ -1015,10 +1022,12 @@ dnl #########################
AC_CONFIG_FILES(
Makefile
gstreamer-libs.pc
gstreamer-libs-uninstalled.pc
gstreamer-play.pc
gstreamer-play-uninstalled.pc
pkgconfig/gstreamer-libs.pc
pkgconfig/gstreamer-libs-uninstalled.pc
pkgconfig/gstreamer-play.pc
pkgconfig/gstreamer-play-uninstalled.pc
gst-libs/gst/gconf/gstreamer-gconf.pc
gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
gst-plugins.spec
gst/Makefile
gst/ac3parse/Makefile
......@@ -1159,6 +1168,7 @@ testsuite/alsa/Makefile
testsuite/Makefile
tools/Makefile
gconf/Makefile
pkgconfig/Makefile
)
AC_OUTPUT
......
gst-element-check.m4 deleted 100644 → 0
View file @ 3ec7ab1f
dnl Perform a check for a GStreamer element using gst-inspect
dnl Thomas Vander Stichele <thomas at apestaart dot org>
dnl Last modification: 23/10/2002
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN(AM_GST_ELEMENT_CHECK,
[
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
if test "x$GST_INSPECT" != "x"; then
AC_MSG_CHECKING(GStreamer element $1)
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
AC_MSG_RESULT(found.)
$2
else
AC_MSG_RESULT(not found.)
$3
fi
fi
])
gst-libs/gst/gconf/Makefile.am
View file @ f3d3912f
......@@ -15,3 +15,5 @@ test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS) $(GST_LIBS)
libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
EXTRA_DIST = gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in
pkgconfig/Makefile.am 0 → 100644
View file @ f3d3912f
if USE_GCONF
GCONF_PC=gstreamer-gconf-@GST_MAJORMINOR@.pc
GCONF_PC_UNINSTALLED=gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc
else
GCONF_PC=
GCONF_PC_UNINSTALLED=
endif
### all of the standard pc files we need to generate
pcfiles = \
gstreamer-libs-@GST_MAJORMINOR@.pc \
gstreamer-play-@GST_MAJORMINOR@.pc
pcfiles_uninstalled = \
gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \
gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
all-local: $(pcfiles) $(pcfiles_uninstalled) \
$(GCONF_PC) \
$(GCONF_PC_UNINSTALLED)
### how to generate pc files
$(pcfiles): %-@GST_MAJORMINOR@.pc: %.pc
cp $< $@
$(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
cp $< $@
gstreamer-gconf-@GST_MAJORMINOR@.pc: \
$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf.pc
cp $< $@
gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc: \
$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
cp $< $@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
$(GCONF_PC) \
gstreamer-libs-@GST_MAJORMINOR@.pc \
gstreamer-play-@GST_MAJORMINOR@.pc
EXTRA_DIST= \
gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in
pkgconfig/gstreamer-gconf-uninstalled.pc.in 0 → 100644
View file @ f3d3912f
# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
libdir=${pcfiledir}
includedir=${pcfiledir}
Name: GStreamer GConf Library, uninstalled
Description: Streaming media framework, GConf support library, not installed
Requires: gstreamer >= @VERSION@
Version: @VERSION@
Libs: ${pcfiledir}/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
Cflags: -I${pcfiledir}/gst-libs
pkgconfig/gstreamer-gconf.pc.in 0 → 100644
View file @ f3d3912f
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
Name: GStreamer GConf Library
Description: Streaming media framework, GConf support library
Requires: gstreamer-@GST_MAJORMINOR@
Version: @VERSION@
Libs: -L${libdir} -lgstgconf-@GST_MAJORMINOR@
Cflags: -I${includedir}
gstreamer-libs-uninstalled.pc.in → pkgconfig/gstreamer-libs-uninstalled.pc.in
View file @ f3d3912f
......@@ -2,8 +2,4 @@ Name: GStreamer Uninstalled Media-Specific Libraries
Description: Streaming-media framework media-specific libraries, not installed
Version: @VERSION@
Requires: gstreamer = @VERSION@
Libs: -L${pcfiledir}/gst-libs/gst/gconf \
-L${pcfiledir}/gst-libs/gst/audio \
-L${pcfiledir}/gst-libs/gst/video \
-L${pcfiledir}/gst-libs/gst/play
Cflags: -I${pcfiledir}/gst-libs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment