diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-05-21 11:12:23 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-05-21 11:12:23 +0200 |
commit | 50f12103f5a136f45bd274ac6a99006a3db5ca4d (patch) | |
tree | cb44f58b9f1cc9256a83b87d28d6cdaf10b2c4b4 /common | |
parent | 54399760aad93cb3ec36162ced7649c8cd8286db (diff) |
Imported Upstream version 0.11.91upstream/0.11.91
Diffstat (limited to 'common')
-rw-r--r-- | common/Makefile.in | 2 | ||||
-rw-r--r-- | common/gst-autogen.sh | 32 | ||||
-rw-r--r-- | common/m4/Makefile.in | 2 | ||||
-rw-r--r-- | common/m4/as-libtool.m4 | 3 | ||||
-rw-r--r-- | common/release.mak | 6 |
5 files changed, 5 insertions, 40 deletions
diff --git a/common/Makefile.in b/common/Makefile.in index e45e7cd..db3ce35 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/common/gst-autogen.sh b/common/gst-autogen.sh index f05e021..e54dbcf 100644 --- a/common/gst-autogen.sh +++ b/common/gst-autogen.sh @@ -216,38 +216,6 @@ autoheader_check () } -autoconf_2_52d_check () -{ - # autoconf 2.52d has a weird issue involving a yes:no error - # so don't allow it's use - test -z "$NOCHECK" && { - ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-Z\.\ ()]*//;s/ .*$//'` - if test "$ac_version" = "2.52d"; then - echo "autoconf 2.52d has an issue with our current build." - echo "We don't know who's to blame however. So until we do, get a" - echo "regular version. RPM's of a working version are on the gstreamer site." - exit 1 - fi - } - return 0 -} -libtool_2_2_gettext_check () -{ - # libtool 2.2 needs autopoint 0.17 or higher - version_compare LIBTOOLIZE 2 2 0 - if test $? -eq 0 - then - version_compare AUTOPOINT 0 17 0 - if test $? -ne 0 - then - echo "libtool 2.2 requires autopoint 0.17 or higher" - return 1 - fi - fi - return 0 -} - - die_check () { # call with $DIE diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in index 999f436..8767f43 100644 --- a/common/m4/Makefile.in +++ b/common/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/common/m4/as-libtool.m4 b/common/m4/as-libtool.m4 index 25de9d1..3b16095 100644 --- a/common/m4/as-libtool.m4 +++ b/common/m4/as-libtool.m4 @@ -41,5 +41,6 @@ AC_DEFUN([AS_LIBTOOL], fi AC_SUBST([$1]_LT_LDFLAGS) - AC_LIBTOOL_DLOPEN + LT_PREREQ([2.2.6]) + LT_INIT([dlopen win32-dll disable-static]) ]) diff --git a/common/release.mak b/common/release.mak index 4a9b7d5..7fbf4ca 100644 --- a/common/release.mak +++ b/common/release.mak @@ -1,12 +1,8 @@ # include this snippet to add a common release: target by using # include $(top_srcdir)/common/release.mak -# make bz2 as well -AUTOMAKE_OPTIONS = dist-bzip2 - release: dist - $(MAKE) $(PACKAGE)-$(VERSION).tar.gz.md5 - $(MAKE) $(PACKAGE)-$(VERSION).tar.bz2.md5 + $(MAKE) $(PACKAGE)-$(VERSION).tar.xz.md5 # generate md5 sum files %.md5: % |