mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

pkg-config related fixes note that a relative path in your PKG_CONFIG_PATH will show up as ${pcfiledir}, unfortunately

Browse source 
Original commit message from CVS:
pkg-config related fixes
note that a relative path in your PKG_CONFIG_PATH will show up as ${pcfiledir},
unfortunately
This commit is contained in:
Andy Wingo 2001-12-23 03:24:17 +00:00
parent af1edc5413
commit 7aa5885df5
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -285,7 +285,7 @@ if test x$USE_GLIB2 = xno; then
GLIB_LIBS="$GLIB_LIBS $GTK_LIBS" GLIB_LIBS="$GLIB_LIBS $GTK_LIBS"
GLIB_CFLAGS="$GLIB_CFLAGS $GTK_CFLAGS" GLIB_CFLAGS="$GLIB_CFLAGS $GTK_CFLAGS"
else else
GST_PKG_DEPS="glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0" GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0"
PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no) PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
@ -311,7 +311,7 @@ AC_SUBST(GTK_CFLAGS)
dnl Check for libxml dnl Check for libxml
if test x$USE_GLIB2 = xno; then if test x$USE_GLIB2 = xno; then
LIBXML_PKG='libxml >= 1.8.1' LIBXML_PKG=', libxml >= 1.8.1'
AC_PATH_PROG(XML_CONFIG, xml-config, no) AC_PATH_PROG(XML_CONFIG, xml-config, no)
if test x$XML_CONFIG = xno; then if test x$XML_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find $LIBXML_PKG) AC_MSG_ERROR(Couldn't find $LIBXML_PKG)
@ -322,7 +322,7 @@ if test x$USE_GLIB2 = xno; then
[ AC_MSG_ERROR(Need version 1.8.1 or better of libxml) ], [ AC_MSG_ERROR(Need version 1.8.1 or better of libxml) ],
$XML_LIBS) $XML_LIBS)
else else
LIBXML_PKG='libxml-2.0' LIBXML_PKG=', libxml-2.0'
PKG_CHECK_MODULES(XML, $LIBXML_PKG, XML_CONFIG=yes, XML_CONFIG=no) PKG_CHECK_MODULES(XML, $LIBXML_PKG, XML_CONFIG=yes, XML_CONFIG=no)
AC_PATH_PROG(XML_CONFIG, xml-config, no) AC_PATH_PROG(XML_CONFIG, xml-config, no)
AC_DEFINE(HAVE_LIBXML2) AC_DEFINE(HAVE_LIBXML2)
@ -875,6 +875,9 @@ GST_SUBSYSTEM_DISABLE(REGISTRY,[plugin registry])
GST_CFLAGS="$GST_CFLAGS $GST_SUBSYSTEM_DISABLE_DEFINES" GST_CFLAGS="$GST_CFLAGS $GST_SUBSYSTEM_DISABLE_DEFINES"
dnl for pkg-config
GST_PKG_CFLAGS=$GST_CFLAGS
AC_SUBST(GST_PKG_CFLAGS)
dnl ################################################ dnl ################################################
dnl # Set defines according to variables set above # dnl # Set defines according to variables set above #
@ -1124,7 +1127,7 @@ gst/autoplug/Makefile
gst/schedulers/Makefile gst/schedulers/Makefile
libs/Makefile libs/Makefile
libs/gst/Makefile libs/gst/Makefile
libs/gst/bytestream/makefile libs/gst/bytestream/Makefile
libs/riff/Makefile libs/riff/Makefile
libs/getbits/Makefile libs/getbits/Makefile
libs/putbits/Makefile libs/putbits/Makefile

9
gstreamer-uninstalled.pc.in
View file

@ -1,12 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: GStreamer Uninstalled Name: GStreamer Uninstalled
Description: Streaming-media framework, Not Installed Description: Streaming-media framework, Not Installed
Version: @VERSION@ Version: @VERSION@
Requires: @GST_PKG_DEPS@, libxml >= 1.8.1 Requires: @GST_PKG_DEPS@@LIBXML_PKG@
Libs: -L${pcfiledir}/gst -lgst Libs: -L${pcfiledir}/gst -lgst
Cflags: -I${pcfiledir} @GST_CFLAGS@ Cflags: -I${pcfiledir} @GST_PKG_CFLAGS@