diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2002-03-05 12:31:13 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2002-03-05 12:31:13 +0000 |
| commit | c09d4144ba916bb461feb85fd8e4638ee5761ab6 (patch) | |
| tree | 4ef671c656aec88208f58fd557fc00e1eecdc972 | |
| parent | e1347f297418b49b0ed71786200fd9107032ae00 (diff) | |
no good reason to require glib 1.3.15 so back to 1.3.12 put version checking for glib and libxml in configure.ac subs...
Original commit message from CVS:
* no good reason to require glib 1.3.15 so back to 1.3.12
* put version checking for glib and libxml in configure.ac
* subst'd these minimum required versions so they can be used in spec file
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | gstreamer.spec.in | 29 |
3 files changed, 31 insertions, 13 deletions
diff --git a/common b/common -Subproject 2adced54d821c7870fd4d9e5e19482418a64c93 +Subproject de68be0c16181a66f42fad60319e273097f6024 diff --git a/configure.ac b/configure.ac index 9795e9318d..3e3a3a08a1 100644 --- a/configure.ac +++ b/configure.ac @@ -91,8 +91,13 @@ AC_MSG_RESULT(no) dnl Check for essential libraries first: dnl ==================================== +dnl === GLib 2 === +dnl Minimum required version of GLib2 +GLIB2_REQ="1.3.12" +AC_SUBST(GLIB2_REQ) + dnl Check for glib2 -PKG_CHECK_MODULES(GLIB2, glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0, +PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0, HAVE_GLIB2=yes,HAVE_GLIB2=no) GLIB_LIBS=$GLIB2_LIBS GLIB_CFLAGS=$GLIB2_CFLAGS @@ -106,8 +111,14 @@ fi GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0" AC_SUBST(GST_PKG_DEPS) +dnl === libxml 2 === +dnl Minimum required version of libxml2 +LIBXML2_REQ="2.4.0" +AC_SUBST(LIBXML2_REQ) + +dnl check for libxml2 LIBXML_PKG=', libxml-2.0' -PKG_CHECK_MODULES(XML, libxml-2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) +PKG_CHECK_MODULES(XML, libxml-2.0 >= $LIBXML2_REQ, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) if test "x$HAVE_LIBXML2" = "xyes"; then AC_DEFINE(HAVE_LIBXML2) else diff --git a/gstreamer.spec.in b/gstreamer.spec.in index 8a5f095aaf..d7c6add983 100644 --- a/gstreamer.spec.in +++ b/gstreamer.spec.in @@ -1,16 +1,23 @@ # File generated by dobey, DO NOT EDIT -Summary: GStreamer Streaming-media framework runtime -Name: gstreamer -Version: @VERSION@ -Release: @GST_VERSION_RELEASE@ -Copyright: LGPL -Group: Libraries/Multimedia -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: glib2 >= 1.3.15 -Requires: libxml2 >= 2.4.0 -BuildRequires: nasm => 0.90 +Summary: GStreamer Streaming-media framework runtime +Name: gstreamer +Version: @VERSION@ +Release: @GST_VERSION_RELEASE@ + +Copyright: LGPL +Group: Libraries/Multimedia +Source: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%define _glib2 @GLIB2_REQ@ +%define _libxml2 @LIBXML2_REQ@ + +Requires: glib2 >= %_glib2 +Requires: libxml2 >= %_libxml2 +BuildRequires: glib2-devel >= %_glib2 +BuildRequires: libxml2 >= %_libxml2 +BuildRequires: nasm => 0.90 %description GStreamer is a streaming-media framework, based on graphs of filters which |