mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-11 03:41:33 +00:00
configure.base: changed to 0.2.1, reworked the -D gathering for cflags gstreamer-config.in, gstreamer.pc.in, gstreame...
Original commit message from CVS: configure.base: changed to 0.2.1, reworked the -D gathering for cflags gstreamer-config.in, gstreamer.pc.in, gstreamer-uninstalled.pc.in: reworked -D gathering for cflags
This commit is contained in:
parent
62a0dd6b1c
commit
b562614242
4 changed files with 7 additions and 4 deletions
|
@ -191,6 +191,7 @@ if test x$USE_GLIB2 = xyes; then
|
||||||
AC_SUBST(GLIB2_CFLAGS)
|
AC_SUBST(GLIB2_CFLAGS)
|
||||||
|
|
||||||
AC_DEFINE(USE_GLIB2)
|
AC_DEFINE(USE_GLIB2)
|
||||||
|
GST_DEFINE_CFLAGS="$GST_DEFINE_CFLAGS -DUSE_GLIB2"
|
||||||
|
|
||||||
HAVE_OBJECT_MODEL=yes
|
HAVE_OBJECT_MODEL=yes
|
||||||
else
|
else
|
||||||
|
@ -843,7 +844,8 @@ GST_SUBSYSTEM_DISABLE(TYPEFIND,[typefind plugin],)
|
||||||
GST_SUBSYSTEM_DISABLE(AUTOPLUG,[autoplugger subsystem])
|
GST_SUBSYSTEM_DISABLE(AUTOPLUG,[autoplugger subsystem])
|
||||||
GST_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
|
GST_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
|
||||||
GST_SUBSYSTEM_DISABLE(TRACE,[tracing subsystem])
|
GST_SUBSYSTEM_DISABLE(TRACE,[tracing subsystem])
|
||||||
AC_SUBST(GST_SUBSYSTEM_DISABLE_DEFINES)
|
|
||||||
|
GST_DEFINE_CFLAGS="$GST_DEFINE_CFLAGS $GST_SUBSYSTEM_DISABLE_DEFINES"
|
||||||
|
|
||||||
|
|
||||||
dnl ################################################
|
dnl ################################################
|
||||||
|
@ -1055,6 +1057,7 @@ AC_SUBST(LDFLAGS)
|
||||||
AC_SUBST(AS)
|
AC_SUBST(AS)
|
||||||
AC_SUBST(ASFLAGS)
|
AC_SUBST(ASFLAGS)
|
||||||
|
|
||||||
|
AC_SUBST(GST_DEFINE_CFLAGS)
|
||||||
|
|
||||||
dnl #############################
|
dnl #############################
|
||||||
dnl # Configure the subpackages #
|
dnl # Configure the subpackages #
|
||||||
|
|
|
@ -47,7 +47,7 @@ while test $# -gt 0; do
|
||||||
elif test @includedir@ != /usr/include ; then
|
elif test @includedir@ != /usr/include ; then
|
||||||
includes=-I@includedir@
|
includes=-I@includedir@
|
||||||
fi
|
fi
|
||||||
echo $includes @CORE_CFLAGS@
|
echo $includes @CORE_CFLAGS@ @GST_DEFINE_CFLAGS@
|
||||||
;;
|
;;
|
||||||
--libs)
|
--libs)
|
||||||
if test $prefix -ef @builddir@ ; then
|
if test $prefix -ef @builddir@ ; then
|
||||||
|
|
|
@ -8,4 +8,4 @@ Description: Streaming-media framework, Not Installed
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
|
Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
|
||||||
Libs: ${pcbuilddir}/${pcfiledir}/gst/libgst.la
|
Libs: ${pcbuilddir}/${pcfiledir}/gst/libgst.la
|
||||||
Cflags: -I${pcbuilddir}/${pcfiledir}
|
Cflags: -I${pcbuilddir}/${pcfiledir} @GST_DEFINE_CFLAGS@
|
||||||
|
|
|
@ -8,4 +8,4 @@ Description: Streaming-media framework
|
||||||
Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
|
Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -lgst
|
Libs: -L${libdir} -lgst
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir} @GST_DEFINE_CFLAGS@
|
||||||
|
|
Loading…
Reference in a new issue