Hello community, here is the log from the commit of package mate-common for openSUSE:Factory checked in at 2014-03-22 14:44:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-common (Old) and /work/SRC/openSUSE:Factory/.mate-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-common" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-common/mate-common.changes 2013-12-18 19:23:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-common.new/mate-common.changes 2014-03-22 18:01:27.000000000 +0100 @@ -1,0 +2,56 @@ +Wed Mar 5 10:08:50 UTC 2014 - [email protected] + +- Update to version 1.8.0 + + no changes since version 1.7.90 + +------------------------------------------------------------------- +Sat Feb 15 17:28:58 UTC 2014 - [email protected] + +- Update to version 1.7.90 (unstable) + + configure: Add check-news +- Use download Url as source +- Remove useless xz require + +------------------------------------------------------------------- +Mon Feb 10 14:28:28 UTC 2014 - [email protected] + +- Update to version 1.7.3 (unstable) + + fix tty detection for terminal codes. + +------------------------------------------------------------------- +Sun Jan 19 16:47:14 UTC 2014 - [email protected] + +- Update to version 1.7.2 (unstable) + + many fixes from gnome-common that are useful for MATE + + Read the dirlist file unconditionally + + Better support of using AUTOCONF environment variable + bgo #510713 (http://bugzilla.gnome.org/show_bug.cgi?id=510713) + + trace AC_CONFIG_SUBDIRS with autoconf + Find configure.ac and configure.in files using the trace + functionality of autoconf in order to skip build directories from + incomplete make distcheck runs. + bgo #510713 (http://bugzilla.gnome.org/show_bug.cgi?id=510713) + + check for glibtoolize in gnome-autogen.sh + bgo #564558 (http://bugzilla.gnome.org/show_bug.cgi?id=564558) + + Fix srcdir!=builddir for Scrollkeeper + bgo #315320 (http://bugzilla.gnome.org/show_bug.cgi?id=315320) + bgo #409060 (http://bugzilla.gnome.org/show_bug.cgi?id=409060) + bgo #685388 (http://bugzilla.gnome.org/show_bug.cgi?id=685388) + + mate-autogen: Don't print terminal codes if stdin isn't a tty + Otherwise this shows up as garbage in log files. + + fix bashisms in mate-autogen + + macros/mate-autogen: Create m4 directory if it doesnt exits + This is a automake bug fixed in automake 1.13.2 + + mate-autogen.sh: Use autoreconf instead + autopoint/libtoolize/autoconf/automake manually + + Replace deprecated AC_HELP_STRING with AS_HELP_STRING + +------------------------------------------------------------------- +Fri Jan 17 16:40:31 UTC 2014 - [email protected] + +- Update to version 1.7.1 (unstable) + + Replace mate-doc-utils with yelp-tools +- Changes from version 1.7.0 + + Automake turned 14 on Arch Linux + +------------------------------------------------------------------- Old: ---- mate-common-1.6.2.tar.xz New: ---- mate-common-1.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-common.spec ++++++ --- /var/tmp/diff_new_pack.FLUE8r/_old 2014-03-22 18:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.FLUE8r/_new 2014-03-22 18:01:28.000000000 +0100 @@ -1,6 +1,7 @@ +# # spec file for mate-common # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +16,17 @@ Name: mate-common -Version: 1.6.2 +Version: 1.8.0 Release: 0 License: GPL-3.0+ Summary: Common scripts and macros to develop with MATE Url: https://www.mate-desktop.org Group: System/GUI/Other -Source0: %{name}-%{version}.tar.xz +Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz BuildArch: noarch BuildRequires: autoconf BuildRequires: automake -BuildRequires: xz # upstream source distribution requires to run 'autogen.sh'; mate-common is a # requirement, while this doesn't change we pull all the necessary stuff from @@ -60,6 +60,7 @@ %doc AUTHORS COPYING %{_bindir}/mate-doc-common %{_bindir}/mate-autogen +%{_datadir}/aclocal/mate-code-coverage.m4 %{_datadir}/aclocal/mate-common.m4 %{_datadir}/aclocal/mate-compiler-flags.m4 %{_datadir}/mate-common/ ++++++ mate-common-1.6.2.tar.xz -> mate-common-1.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/ChangeLog new/mate-common-1.8.0/ChangeLog --- old/mate-common-1.6.2/ChangeLog 2013-09-09 17:28:12.000000000 +0200 +++ new/mate-common-1.8.0/ChangeLog 2014-02-28 21:00:02.000000000 +0100 @@ -1,13 +1,302 @@ -commit aee9fb499fa8e507089a20803deb825696da7b65 +commit 2e1ed795cf22232b9fa7c41f226cc1d7c9b11fc9 Author: Stefano Karapetsas <[email protected]> -Date: Mon Sep 9 17:27:46 2013 +0200 +Date: Fri Feb 28 20:59:38 2014 +0100 - Bump version to 1.6.2 + Bump version to 1.8.0 + + NEWS | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 2bb97f69e98e3ae00a6e9617b92ecf07de9606fb +Author: Stefano Karapetsas <[email protected]> +Date: Fri Feb 14 17:34:57 2014 +0100 + + Bump version to 1.7.90 + + NEWS | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d928425add8cec8f6be2eb5c7e544f90af9a6ef7 +Author: Stefano Karapetsas <[email protected]> +Date: Fri Feb 14 17:34:27 2014 +0100 + + Update NEWS + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit dd56bf0f0a08164ee80980310720d6f14f6293cd +Author: Stefano Karapetsas <[email protected]> +Date: Fri Feb 14 17:31:26 2014 +0100 + + configure: Add check-news + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fce723994cfe669f51243cdac253db2c4b25f9a9 +Author: Stefano Karapetsas <[email protected]> +Date: Sun Feb 9 19:27:18 2014 +0100 + + Bump version to 1.7.3 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 7ac16bf39855c5db2c4bc9eddc6f95007c3d02b9 +commit 395a50cbc6b56493bf4dbe5185923d8bff1b3156 +Merge: 8695dd1 c12956a +Author: Stefano Karapetsas <[email protected]> +Date: Mon Jan 20 12:58:57 2014 -0800 + + Merge pull request #13 from infirit/master + + Fix tty detection for terminal codes. + +commit c12956aa50497f5849c6c477621a5d0cc0b1d4fd +Author: infirit <[email protected]> +Date: Mon Jan 20 21:55:42 2014 +0100 + + Fix tty detection for terminal codes. + + macros/mate-autogen | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8695dd1dc3ac4fcf19117be53bc0df804f2d75f1 +Author: Stefano Karapetsas <[email protected]> +Date: Sat Jan 18 16:52:44 2014 +0100 + + Bump version to 1.7.2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 56a56f089dac584b3a7b3b524c05eb5418ab4ab1 +Merge: 185a881 ee67cdc +Author: Stefano Karapetsas <[email protected]> +Date: Sat Jan 4 09:59:30 2014 -0800 + + Merge pull request #11 from infirit/gnomefixes + + Many fixes from gnome-common that are useful for MATE + +commit ee67cdc2cd7c65318d21faed1056160f8355990e +Author: infirit <[email protected]> +Date: Fri Jan 3 15:36:05 2014 +0100 + + Read the dirlist file unconditionally + + Based on GNOME commit: + https://git.gnome.org/browse/gnome-common/commit/?id=799ae3eaebd82f961cbca82325351c3b5db7494c + + macros/mate-autogen | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit a1bbc3ba85d9f62c759ff9168fce150868c29dc9 +Author: infirit <[email protected]> +Date: Fri Jan 3 15:32:14 2014 +0100 + + Better support of using AUTOCONF environment variable + + Gnome bug url: + http://bugzilla.gnome.org/show_bug.cgi?id=510713 + + Based on GNOME commit: + https://git.gnome.org/browse/gnome-common/commit/?id=4bb2a2450f67550ae761c75cb7ff2325bad54c8b + + macros/mate-autogen | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit 2c0c0cc3954d08542d41a796926a29307076a154 +Author: infirit <[email protected]> +Date: Fri Jan 3 15:22:38 2014 +0100 + + Trace AC_CONFIG_SUBDIRS with autoconf + + Find configure.ac and configure.in files using the trace functionality of autoconf in order to + skip build directories from incomplete make distcheck runs. + + GNOME bug url: + http://bugzilla.gnome.org/show_bug.cgi?id=510713 + + Based on GNOME commit: + https://git.gnome.org/browse/gnome-common/commit/?id=4668cc8250c15119dc7bdbbf842da53f4fe478fe + + macros/mate-autogen | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +commit ab26b36ea5a8c3afccd13e60165f89678b73c7f3 +Author: infirit <[email protected]> +Date: Fri Jan 3 15:19:41 2014 +0100 + + Check for glibtoolize in gnome-autogen.sh + + Gnome BUG url: + http://bugzilla.gnome.org/show_bug.cgi?id=564558 + + Based on GNOME commit: + https://git.gnome.org/browse/gnome-common/commit/?id=70422b555f881acc7523818bdea22dea84dd5901 + + macros/mate-autogen | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c346cec8d4c1eb6c668fcd4134151d2460b4e49 +Author: infirit <[email protected]> +Date: Fri Jan 3 15:17:29 2014 +0100 + + Fix srcdir!=builddir for Scrollkeeper + + Gnome BUGS urls: + http://bugzilla.gnome.org/show_bug.cgi?id=315320 + http://bugzilla.gnome.org/show_bug.cgi?id=409060 + http://bugzilla.gnome.org/show_bug.cgi?id=685388 + + Based on GNOME commits: + https://git.gnome.org/browse/gnome-common/commit/?id=1b2fb3fb47405908eb53d0db46329a64a1697a59 + https://git.gnome.org/browse/gnome-common/commit/?id=960b1bde8d156f61340500a260402264c5320603 + https://git.gnome.org/browse/gnome-common/commit/?id=ee12b92340223bb33b9da232132c44cacecc7968 + + doc-build/omf.make | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 4c625cd5209062aaba6eecdb95b47a219ae7c746 +Author: infirit <[email protected]> +Date: Fri Jan 3 15:00:52 2014 +0100 + + mate-autogen: Don't print terminal codes if stdin isn't a tty + + Otherwise this shows up as garbage in log files. + + Based on GNOME commit: + https://git.gnome.org/browse/gnome-common/commit/?id=7f977b0214623142819c8b7a08839949fb9f3ec0 + + macros/mate-autogen | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 5ab654b317e170e4c7e7b814d0551a646d7111d3 +Author: infirit <[email protected]> +Date: Fri Jan 3 14:57:21 2014 +0100 + + Fix bashisms in mate-autogen + + Based on GNOME commit: + https://git.gnome.org/browse/gnome-common/commit/?id=101362218645db3f0fbb55e1e6ea80c4bd70f97d + + macros/mate-autogen | 29 +++++++++++++++-------------- + 1 file changed, 15 insertions(+), 14 deletions(-) + +commit 326dd32af1ecc9df2013b516f7f8f427a4b6cf5c +Author: infirit <[email protected]> +Date: Fri Jan 3 14:41:52 2014 +0100 + + Add code coverage support + + Add a MATE_CODE_COVERAGE m4 macro to allow projects to easily add + code + coverage support using lcov. This is heavily based on the code coverage + tooling from GLib (LGPLv2.1+), originally written by Patrick Hulin and + modified by Matthias Clasen, Stef Walter and Simon McVittie since. + Adapted for use in MATE by Sander Sweers. + + See GNOME commit: + https://git.gnome.org/browse/gnome-common/commit/?id=493d55921f26ac3a9a3b7cc33756c88daace329e + + And follow up commits: + https://git.gnome.org/browse/gnome-common/log/macros2/gnome-code-coverage.m4 + + macros/Makefile.am | 3 +- + macros/mate-autogen | 3 + + macros/mate-code-coverage.m4 | 165 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 170 insertions(+), 1 deletion(-) + +commit da4619a11bf11b4f6c5e15d93ec796aee49916d8 +Author: infirit <[email protected]> +Date: Fri Jan 3 14:28:13 2014 +0100 + + macros/mate-autogen: Create m4 directory if it doesnt exits + + This is a automake bug fixed in automake 1.13.2 + + Based on gnome commit: + https://git.gnome.org/browse/gnome-common/commit/?id=47aa8189803d5f1bf60701f52795ef8735064b6c + + macros/mate-autogen | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 4d00cba6eb5a21bea9c0e5a495787e134fae7a19 +Author: infirit <[email protected]> +Date: Fri Jan 3 14:24:12 2014 +0100 + + mate-autogen.sh: Use autoreconf + + instead autopoint/libtoolize/autoconf/automake manually + + Based on gnome-common commits + https://git.gnome.org/browse/gnome-common/commit/?id=323bbfe0989405725379cada1aa5cb361fd2999f + https://git.gnome.org/browse/gnome-common/commit/?id=ac800833454ab6d38afb288773079b8ad1d5503f + + macros/mate-autogen | 83 +++++------------------------------------------------ + 1 file changed, 7 insertions(+), 76 deletions(-) + +commit a5462e1fc2f408aa6b697300c1879b4567a51bf9 +Author: infirit <[email protected]> +Date: Fri Jan 3 14:11:47 2014 +0100 + + Replace deprecated AC_HELP_STRING with AS_HELP_STRING + + macros/mate-common.m4 | 2 +- + macros/mate-compiler-flags.m4 | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 185a8813fec72f8c541192f59e93caca50e4ce68 +Author: Stefano Karapetsas <[email protected]> +Date: Sat Oct 5 16:42:11 2013 +0200 + + Bump version to 1.7.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 894f62a7af6124c71496c6a4ec30daea582924b9 +Author: Stefano Karapetsas <[email protected]> +Date: Tue Jul 16 23:55:24 2013 +0200 + + Replace mate-doc-utils with yelp-tools + + macros/mate-autogen | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +commit 6e310bd968ba9d6651dd1092660271fed16e498a +Author: Stefano Karapetsas <[email protected]> +Date: Mon Jul 15 16:22:08 2013 +0200 + + Bump version to 1.7.0 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 40ce1b3d47077c1cc2b7d4af91ed8c71fdaf10b4 +Author: Stefano Karapetsas <[email protected]> +Date: Mon Jul 15 12:48:13 2013 +0200 + + Remove obsolete distro folder + + distro/archlinux/PKGBUILD | 27 --------------------------- + distro/archlinux/mate.csh | 1 - + distro/archlinux/mate.sh | 1 - + 3 files changed, 29 deletions(-) + +commit 8f76d69546ab05fcf76d1718ec1bb453f7883f90 +Merge: 6f0c0b6 08f0e4e +Author: Stefano Karapetsas <[email protected]> +Date: Mon Jul 1 01:46:36 2013 -0700 + + Merge pull request #8 from MDykstra/master + + Automake turned 14 on Arch Linux + +commit 08f0e4e566039511744fc80ba9976b416722ba12 Author: Marcel Dijkstra <[email protected]> Date: Sun Jun 30 23:41:12 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/Makefile.in new/mate-common-1.8.0/Makefile.in --- old/mate-common-1.6.2/Makefile.in 2013-09-09 17:28:06.000000000 +0200 +++ new/mate-common-1.8.0/Makefile.in 2014-02-28 21:00:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -411,6 +411,12 @@ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) + @case `sed 15q $(srcdir)/NEWS` in \ + *"$(VERSION)"*) : ;; \ + *) \ + echo "NEWS not updated; not releasing" 1>&2; \ + exit 1;; \ + esac $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -490,10 +496,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -535,9 +547,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/NEWS new/mate-common-1.8.0/NEWS --- old/mate-common-1.6.2/NEWS 2013-09-09 17:28:03.000000000 +0200 +++ new/mate-common-1.8.0/NEWS 2014-02-28 20:59:34.000000000 +0100 @@ -1 +1,5 @@ +1.8.0 + * Replace mate-doc-utils with yelp-tools + * Cherry pick many improvements from gnome-common + * Use autoreconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/aclocal.m4 new/mate-common-1.8.0/aclocal.m4 --- old/mate-common-1.6.2/aclocal.m4 2013-09-09 17:28:05.000000000 +0200 +++ new/mate-common-1.8.0/aclocal.m4 2014-02-28 20:59:59.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -153,6 +153,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -261,6 +267,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell [email protected] about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -269,7 +317,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/configure new/mate-common-1.8.0/configure --- old/mate-common-1.6.2/configure 2013-09-09 17:28:06.000000000 +0200 +++ new/mate-common-1.8.0/configure 2014-02-28 21:00:00.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mate-common 1.6.2. +# Generated by GNU Autoconf 2.69 for mate-common 1.8.0. # # Report bugs to <https://github.com/mate-desktop/mate-common>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='mate-common' PACKAGE_TARNAME='mate-common' -PACKAGE_VERSION='1.6.2' -PACKAGE_STRING='mate-common 1.6.2' +PACKAGE_VERSION='1.8.0' +PACKAGE_STRING='mate-common 1.8.0' PACKAGE_BUGREPORT='https://github.com/mate-desktop/mate-common' PACKAGE_URL='' @@ -1204,7 +1204,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mate-common 1.6.2 to adapt to many kinds of systems. +\`configure' configures mate-common 1.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mate-common 1.6.2:";; + short | recursive ) echo "Configuration of mate-common 1.8.0:";; esac cat <<\_ACEOF @@ -1347,7 +1347,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mate-common configure 1.6.2 +mate-common configure 1.8.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1364,7 +1364,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mate-common $as_me 1.6.2, which was +It was created by mate-common $as_me 1.8.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1715,7 +1715,7 @@ -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2230,7 +2230,7 @@ # Define the identity of the package. PACKAGE='mate-common' - VERSION='1.6.2' + VERSION='1.8.0' cat >>confdefs.h <<_ACEOF @@ -2281,6 +2281,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell [email protected] about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : @@ -2908,7 +2950,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mate-common $as_me 1.6.2, which was +This file was extended by mate-common $as_me 1.8.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2961,7 +3003,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mate-common config.status 1.6.2 +mate-common config.status 1.8.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/configure.ac new/mate-common-1.8.0/configure.ac --- old/mate-common-1.6.2/configure.ac 2013-09-09 17:28:03.000000000 +0200 +++ new/mate-common-1.8.0/configure.ac 2014-02-28 20:59:27.000000000 +0100 @@ -1,9 +1,9 @@ AC_PREREQ(2.54) -AC_INIT([mate-common], [1.6.2], [https://github.com/mate-desktop/mate-common]) +AC_INIT([mate-common], [1.8.0], [https://github.com/mate-desktop/mate-common]) AC_CONFIG_SRCDIR([macros/mate-autogen]) -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/doc/Makefile.in new/mate-common-1.8.0/doc/Makefile.in --- old/mate-common-1.6.2/doc/Makefile.in 2013-09-09 17:28:06.000000000 +0200 +++ new/mate-common-1.8.0/doc/Makefile.in 2014-02-28 21:00:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/doc-build/Makefile.in new/mate-common-1.8.0/doc-build/Makefile.in --- old/mate-common-1.6.2/doc-build/Makefile.in 2013-09-09 17:28:06.000000000 +0200 +++ new/mate-common-1.8.0/doc-build/Makefile.in 2014-02-28 21:00:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/doc-build/omf.make new/mate-common-1.8.0/doc-build/omf.make --- old/mate-common-1.6.2/doc-build/omf.make 2013-09-09 17:28:03.000000000 +0200 +++ new/mate-common-1.8.0/doc-build/omf.make 2014-01-04 19:02:21.000000000 +0100 @@ -36,19 +36,23 @@ omf_timestamp: $(omffile) -for file in $(omffile); do \ - scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ + absfile=$(srcdir)/$$file; \ + test -r $$file && absfile=$$file; \ + scrollkeeper-preinstall $(docdir)/$(docname).xml $$absfile $$file.out; \ done; \ touch omf_timestamp install-data-hook-omf: $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) for file in $(omffile); do \ - $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + absfile=$(srcdir)/$$file.out; \ + test -r $$file.out && absfile=$$file.out; \ + $(INSTALL_DATA) $$absfile $(DESTDIR)$(omf_dest_dir)/$$file; \ done -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) uninstall-local-omf: - -for file in $(srcdir)/*.omf; do \ + -for file in $(omffile); do \ basefile=`basename $$file`; \ rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/macros/Makefile.am new/mate-common-1.8.0/macros/Makefile.am --- old/mate-common-1.6.2/macros/Makefile.am 2013-09-09 17:28:03.000000000 +0200 +++ new/mate-common-1.8.0/macros/Makefile.am 2014-01-04 19:02:21.000000000 +0100 @@ -2,7 +2,8 @@ MATE2_MACROS = \ mate-common.m4 \ - mate-compiler-flags.m4 + mate-compiler-flags.m4 \ + mate-code-coverage.m4 EXTRA_DIST = $(MATE2_MACROS) mate-autogen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/macros/Makefile.in new/mate-common-1.8.0/macros/Makefile.in --- old/mate-common-1.6.2/macros/Makefile.in 2013-09-09 17:28:06.000000000 +0200 +++ new/mate-common-1.8.0/macros/Makefile.in 2014-02-28 21:00:00.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -213,7 +213,8 @@ top_srcdir = @top_srcdir@ MATE2_MACROS = \ mate-common.m4 \ - mate-compiler-flags.m4 + mate-compiler-flags.m4 \ + mate-code-coverage.m4 EXTRA_DIST = $(MATE2_MACROS) mate-autogen aclocaldir = $(datadir)/aclocal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/macros/mate-autogen new/mate-common-1.8.0/macros/mate-autogen --- old/mate-common-1.6.2/macros/mate-autogen 2013-09-09 17:28:03.000000000 +0200 +++ new/mate-common-1.8.0/macros/mate-autogen 2014-01-25 16:27:25.000000000 +0100 @@ -18,24 +18,23 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #name of package -PKG_NAME=${PKG_NAME:-Package} -srcdir=${srcdir:-.} +test "PKG_NAME" || PKG_NAME=Package +test "$srcdir" || srcdir=. # default version requirements ... -REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53} -REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9} -REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3} -REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40} -REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0} -REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25} -REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0} -REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} -REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-1.1.0} -REQUIRED_MATE_DOC_UTILS_VERSION=${REQUIRED_MATE_DOC_UTILS_VERSION:-1.1.0} +test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 +test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 +test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 +test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 +test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 +test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 +test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 +test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 +test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=1.1.0 # a list of required m4 macros. Package can set an initial value -REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} -FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-} +test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= +test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS= # Not all echo versions allow -n, so we check what is possible. This test is # based on the one in autoconf. @@ -52,8 +51,13 @@ esac # some terminal codes ... -boldface="`tput bold 2>/dev/null`" -normal="`tput sgr0 2>/dev/null`" +if tty <&1 >/dev/null 2>&1; then + boldface="`tput bold 2>/dev/null`" + normal="`tput sgr0 2>/dev/null`" +else + boldface= + normal= +fi printbold() { echo $ECHO_N "$boldface" $ECHO_C echo "$@" @@ -184,8 +188,8 @@ # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 # but it contains only Automake's own macros, so we can ignore it. - # Read the dirlist file, supported by Automake >= 1.7. - if compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then + # Read the dirlist file + if [ -s $cm_macrodirs/dirlist ]; then cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` if [ -n "$cm_dirlist" ] ; then for cm_dir in $cm_dirlist; do @@ -272,10 +276,33 @@ want_intltool=false want_pkg_config=false want_gtk_doc=false -want_mate_doc_utils=false +want_yelp_tools=false want_maintainer_mode=false -configure_files="`find $srcdir -name '{arch}' -prune -o -name '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`" +#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 +WANT_AUTOCONF_2_5=1 +export WANT_AUTOCONF_2_5 +version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ + "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"; +AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` + +find_configure_files() { + configure_ac= + if test -f "$1/configure.ac"; then + configure_ac="$1/configure.ac" + elif test -f "$1/configure.in"; then + configure_ac="$1/configure.in" + fi + if test "x$configure_ac" != x; then + echo "$configure_ac" + $AUTOCONF -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do + find_configure_files "$1/$dir" + done + fi +} + +configure_files="`find_configure_files .`" + for configure_ac in $configure_files; do dirname=`dirname $configure_ac` if [ -f $dirname/NO-AUTO-GEN ]; then @@ -302,8 +329,8 @@ if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then want_gtk_doc=true fi - if grep "^MATE_DOC_INIT" $configure_ac >/dev/null; then - want_mate_doc_utils=true + if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then + want_yelp_tools=true fi # check that AM_MAINTAINER_MODE is used @@ -321,15 +348,11 @@ grep "^MATE_CXX_WARNINGS" $configure_ac >/dev/null; then require_m4macro mate-compiler-flags.m4 fi + if grep "^MATE_CODE_COVERAGE" $configure_ac >/dev/null; then + require_m4macro mate-code-coverage.m4 + fi done -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"; -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; 1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; @@ -348,7 +371,7 @@ ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` if $want_libtool; then - version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \ + version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz"; require_m4macro libtool.m4 fi @@ -383,9 +406,8 @@ require_m4macro gtk-doc.m4 fi -if $want_mate_doc_utils; then - version_check mate-doc-utils MATE_DOC_PREPARE mate-doc-prepare $REQUIRED_MATE_DOC_UTILS_VERSION \ - "http://pub.mate-desktop.org/releases/"; +if $want_yelp_tools; then + require_m4macro yelp.m4 fi if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then @@ -414,35 +436,14 @@ printbold "Processing $configure_ac" cd $dirname - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi + # if the AC_CONFIG_MACRO_DIR() macro is used, create that directory + # This is a automake bug fixed in automake 1.13.2 + # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13514 + m4dir=`autoconf --trace 'AC_CONFIG_MACRO_DIR:$1'` + if [ -n "$m4dir" ]; then + mkdir -p $m4dir fi - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi if grep "^GTK_DOC_CHECK" $basename >/dev/null; then printbold "Running $GTKDOCIZE..." $GTKDOCIZE --copy || exit 1 @@ -452,59 +453,15 @@ printbold "Running mate-doc-common..." mate-doc-common --copy || exit 1 fi - if grep "^MATE_DOC_INIT" $basename >/dev/null; then - printbold "Running $MATE_DOC_PREPARE..." - $MATE_DOC_PREPARE --force --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "MATE_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete mate macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --force --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 + if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || + grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then + printbold "Running $INTLTOOLIZE..." + $INTLTOOLIZE --force --copy --automake || exit 1 fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi + # Now that all the macros are sorted, run autoreconf ... + printbold "Running autoreconf..." + autoreconf --verbose --force --install -Wno-portability || exit 1 cd "$topdir" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/macros/mate-code-coverage.m4 new/mate-common-1.8.0/macros/mate-code-coverage.m4 --- old/mate-common-1.6.2/macros/mate-code-coverage.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/mate-common-1.8.0/macros/mate-code-coverage.m4 2014-01-04 19:02:21.000000000 +0100 @@ -0,0 +1,165 @@ +dnl **Based on GNOME's code coverage** +dnl MATE_CODE_COVERAGE +dnl +dnl Defines CODE_COVERAGE_CFLAGS and CODE_COVERAGE_LDFLAGS which should be +dnl included in the CFLAGS and LIBS/LDFLAGS variables of every build target +dnl (program or library) which should be built with code coverage support. +dnl Also defines MATE_CODE_COVERAGE_RULES which should be substituted in your +dnl Makefile; and $enable_code_coverage which can be used in subsequent +dnl configure output. +dnl +dnl Note that all optimisation flags in CFLAGS must be disabled when code +dnl coverage is enabled. +dnl +dnl Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+. +dnl This file is licenced under LGPLv2.1+. +dnl +dnl Usage example: +dnl configure.ac: +dnl MATE_CODE_COVERAGE +dnl +dnl Makefile.am: +dnl @MATE_CODE_COVERAGE_RULES@ +dnl my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) … +dnl my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) … +dnl +dnl This results in a “check-code-coverage” rule being added to any Makefile.am +dnl which includes “@MATE_CODE_COVERAGE_RULES@” (assuming the module has been +dnl configured with --enable-code-coverage). Running `make check-code-coverage` +dnl in that directory will run the module’s test suite (`make check`) and build +dnl a code coverage report detailing the code which was touched, then print the +dnl URI for the report. + +AC_DEFUN([MATE_CODE_COVERAGE],[ + dnl Check for --enable-code-coverage + AC_MSG_CHECKING([whether to build with code coverage support]) + AC_ARG_ENABLE([code-coverage], AS_HELP_STRING([--enable-code-coverage], [Whether to enable code coverage support]),, enable_code_coverage=no) + AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes]) + AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage]) + AC_MSG_RESULT($enable_code_coverage) + + AS_IF([ test "$enable_code_coverage" = "yes" ], [ + dnl Check if gcc is being used + AS_IF([ test "$GCC" = "no" ], [ + AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage]) + ]) + + # List of supported lcov versions. + lcov_version_list="1.6 1.7 1.8 1.9 1.10" + + AC_CHECK_PROG([LCOV], [lcov], [lcov]) + AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) + + AS_IF([ test "$LCOV" ], [ + AC_CACHE_CHECK([for lcov version], mate_cv_lcov_version, [ + mate_cv_lcov_version=invalid + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` + for lcov_check_version in $lcov_version_list; do + if test "$lcov_version" = "$lcov_check_version"; then + mate_cv_lcov_version="$lcov_check_version (ok)" + fi + done + ]) + ], [ + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" + AC_MSG_ERROR([$lcov_msg]) + ]) + + case $mate_cv_lcov_version in + ""|invalid[)] + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." + AC_MSG_ERROR([$lcov_msg]) + LCOV="exit 0;" + ;; + esac + + AS_IF([ test -z "$GENHTML" ], [ + AC_MSG_ERROR([Could not find genhtml from the lcov package]) + ]) + + dnl Build the code coverage flags + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LDFLAGS="-lgcov" + + AC_SUBST([CODE_COVERAGE_CFLAGS]) + AC_SUBST([CODE_COVERAGE_LDFLAGS]) + ]) + +MATE_CODE_COVERAGE_RULES=' +# Code coverage +# +# Optional: +# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# (Default: $(top_builddir)) +# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated +# by lcov for code coverage. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) +# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage +# reports to be created. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. +# (Default: empty) +# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml +# instance. (Default: empty) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore +# +# The generated report will be titled using the $(PACKAGE_NAME) and +# $(PACKAGE_VERSION). In order to add the current git hash to the title, +# use the git-version-gen script, available online. + +# Optional variables +CODE_COVERAGE_DIRECTORY ?= $(top_builddir) +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_GENHTML_OPTIONS ?= +CODE_COVERAGE_IGNORE_PATTERN ?= + +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet + +# Use recursive makes in order to ignore errors during check +check-code-coverage: +ifeq ($(CODE_COVERAGE_ENABLED),yes) + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture +else + @echo "Need to reconfigure with --enable-code-coverage" +endif + +# Capture code coverage data +code-coverage-capture: code-coverage-capture-hook +ifeq ($(CODE_COVERAGE_ENABLED),yes) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp + LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +else + @echo "Need to reconfigure with --enable-code-coverage" +endif + +# Hook rule executed before code-coverage-capture, overridable by the user +code-coverage-capture-hook: + +ifeq ($(CODE_COVERAGE_ENABLED),yes) +clean: code-coverage-clean +code-coverage-clean: + -$(LCOV) --directory $(top_builddir) -z + -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) + -find . -name "*.gcda" -o -name "*.gcov" -delete +endif + +GITIGNOREFILES ?= +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) + +DISTCHECK_CONFIGURE_FLAGS ?= +DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage + +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean +' + + AC_SUBST([MATE_CODE_COVERAGE_RULES]) + m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([MATE_CODE_COVERAGE_RULES])]) +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/macros/mate-common.m4 new/mate-common-1.8.0/macros/mate-common.m4 --- old/mate-common-1.6.2/macros/mate-common.m4 2013-09-09 17:28:03.000000000 +0200 +++ new/mate-common-1.8.0/macros/mate-common.m4 2014-01-04 19:02:21.000000000 +0100 @@ -35,7 +35,7 @@ AC_DEFUN([MATE_DEBUG_CHECK], [ AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], + AS_HELP_STRING([--enable-debug], [turn on debugging]),, [enable_debug=no]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/macros/mate-compiler-flags.m4 new/mate-common-1.8.0/macros/mate-compiler-flags.m4 --- old/mate-common-1.6.2/macros/mate-compiler-flags.m4 2013-09-09 17:28:03.000000000 +0200 +++ new/mate-common-1.8.0/macros/mate-compiler-flags.m4 2014-01-04 19:02:21.000000000 +0100 @@ -24,7 +24,7 @@ dnl ****************************** AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], [Turn on compiler warnings]),, [enable_compile_warnings="m4_default([$1],[yes])"]) @@ -78,7 +78,7 @@ AC_MSG_RESULT($warning_flags) AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], + AS_HELP_STRING([--enable-iso-c], [Try to warn if code is not ISO C ]),, [enable_iso_c=no]) @@ -106,7 +106,7 @@ AC_DEFUN([MATE_CXX_WARNINGS],[ AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] [Turn on compiler warnings.]),, [enable_cxx_warnings="m4_default([$1],[minimum])"]) @@ -132,7 +132,7 @@ AC_MSG_RESULT($warnCXXFLAGS) AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], + AS_HELP_STRING([--enable-iso-cxx], [Try to warn if code is not ISO C++ ]),, [enable_iso_cxx=no]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-common-1.6.2/missing new/mate-common-1.8.0/missing --- old/mate-common-1.6.2/missing 2013-09-09 17:28:06.000000000 +0200 +++ new/mate-common-1.8.0/missing 2014-02-28 21:00:00.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
