projects
/
platform
/
upstream
/
gst-plugins-good.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
interleave: set output caps layout to interleaved
[platform/upstream/gst-plugins-good.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
b31be2a
..
5a84fe4
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-5,7
+5,7
@@
dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, git and prerelease does -Werror too
dnl use a three digit version number for releases, and four for git/pre
dnl initialize autoconf
dnl releases only do -Wall, git and prerelease does -Werror too
dnl use a three digit version number for releases, and four for git/pre
-AC_INIT([GStreamer Good Plug-ins],[1.
3
.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-good])
+AC_INIT([GStreamer Good Plug-ins],[1.
5.0
.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-good])
AG_GST_INIT
AG_GST_INIT
@@
-43,11
+43,11
@@
AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
[GStreamer API Version])
AG_GST_LIBTOOL_PREPARE
[GStreamer API Version])
AG_GST_LIBTOOL_PREPARE
-AS_LIBTOOL(GST,
301, 0, 3
01)
+AS_LIBTOOL(GST,
501, 0, 5
01)
dnl *** required versions of GStreamer stuff ***
dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.
3
.1
-GSTPB_REQ=1.
3
.1
+GST_REQ=1.
5.0
.1
+GSTPB_REQ=1.
5.0
.1
dnl *** autotools stuff ****
dnl *** autotools stuff ****
@@
-554,27
+554,10
@@
dnl Check for X11
translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesrc], [
translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesrc], [
- A
C_PATH_XTRA
+ A
G_GST_CHECK_X
- dnl now try to find the HEADER
- ac_cflags_save="$CFLAGS"
- ac_cppflags_save="$CPPFLAGS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
-
- if test "x$HAVE_X" = "xno"
+ if test "x$HAVE_X" = "xyes"
then
then
- AC_MSG_NOTICE([cannot find X11 development files])
- else
- dnl this is much more than we want
- X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
- dnl AC_PATH_XTRA only defines the path needed to find the X libs,
- dnl it does not add the libs; therefore we add them here
- X_LIBS="$X_LIBS -lX11"
- AC_SUBST(X_CFLAGS)
- AC_SUBST(X_LIBS)
-
dnl check for Xfixes
PKG_CHECK_MODULES(XFIXES, xfixes, HAVE_XFIXES="yes", HAVE_XFIXES="no")
if test "x$HAVE_XFIXES" = "xyes"
dnl check for Xfixes
PKG_CHECK_MODULES(XFIXES, xfixes, HAVE_XFIXES="yes", HAVE_XFIXES="no")
if test "x$HAVE_XFIXES" = "xyes"
@@
-593,9
+576,6
@@
AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
AC_SUBST(XDAMAGE_LIBS)
AC_SUBST(XDAMAGE_CFLAGS)
fi
AC_SUBST(XDAMAGE_LIBS)
AC_SUBST(XDAMAGE_CFLAGS)
fi
- AC_SUBST(HAVE_X)
- CFLAGS="$ac_cflags_save"
- CPPFLAGS="$ac_cppflags_save"
])
dnl FIXME: this should be rolled into the test above, it's just an additional
])
dnl FIXME: this should be rolled into the test above, it's just an additional