Hello community,
here is the log from the commit of package gnome-common for openSUSE:Factory checked in at 2014-09-30 19:38:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-common (Old)
and /work/SRC/openSUSE:Factory/.gnome-common.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-common"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-common/gnome-common.changes 2014-05-05 21:15:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-common.new/gnome-common.changes 2014-09-30 19:40:18.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Sep 22 14:24:22 UTC 2014 - zaitor@opensuse.org
+
+- Update to version 3.14.0:
+ + macros2:
+ - Update links to macros in the autoconf-archive.
+ - Add support for APPSTREAM_XML macro (bgo#736497).
+ - Deprecate various obsolete macros.
+ + build: Remove a non-existent file from EXTRA_DIST (bgo#735418).
+ + compiler-flags: allow suppressing warnings.
+ + code-coverage: Support lcov 1.11.
+ + doc: Move doc/usage.txt to README and update.
+ + make program_VERSION a local variable.
+
+-------------------------------------------------------------------
Old:
----
gnome-common-3.12.0.tar.xz
New:
----
gnome-common-3.14.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-common.spec ++++++
--- /var/tmp/diff_new_pack.kSTeyn/_old 2014-09-30 19:40:19.000000000 +0200
+++ /var/tmp/diff_new_pack.kSTeyn/_new 2014-09-30 19:40:19.000000000 +0200
@@ -17,13 +17,13 @@
Name: gnome-common
-Version: 3.12.0
+Version: 3.14.0
Release: 0
Summary: Common Files to Build GNOME
License: GPL-2.0+
Group: System/GUI/GNOME
Url: http://www.gnome.org/
-Source: http://download.gnome.org/sources/gnome-common/3.12/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gnome-common/3.14/%{name}-%{version}.tar.xz
BuildRequires: pkg-config
Requires: autoconf
Requires: automake
@@ -64,6 +64,8 @@
%{_datadir}/aclocal/gnome-code-coverage.m4
%{_datadir}/aclocal/gnome-common.m4
%{_datadir}/aclocal/gnome-compiler-flags.m4
+%{_datadir}/aclocal/ax_check_enable_debug.m4
+%{_datadir}/aclocal/ax_code_coverage.m4
%{_datadir}/gnome-common/
%changelog
++++++ gnome-common-3.12.0.tar.xz -> gnome-common-3.14.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/ChangeLog new/gnome-common-3.14.0/ChangeLog
--- old/gnome-common-3.12.0/ChangeLog 2014-03-24 13:19:37.000000000 +0100
+++ new/gnome-common-3.14.0/ChangeLog 2014-09-22 13:33:29.000000000 +0200
@@ -1,3 +1,180 @@
+commit 5d61b55e8bea32fe2b52e21682ee4b3719b290c5
+Author: David King
+Date: Mon Sep 22 12:32:59 2014 +0100
+
+ version 3.14.0
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 4153deb1b9b76601389657e64dcae6721002236f
+Author: Philip Withnall
+Date: Mon Sep 15 12:08:38 2014 +0100
+
+ macros2: Update links to macros in the autoconf-archive
+
+ Now that the macros have been committed upstream, we can link to their
+ manual pages rather than the bug reports.
+
+ macros2/gnome-code-coverage.m4 | 2 +-
+ macros2/gnome-common.m4 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b23a0e022cde3e3aff15175bd5923eab17f48918
+Author: Bastien Nocera
+Date: Thu Sep 11 20:36:13 2014 +0200
+
+ macros2: Add support for APPSTREAM_XML macro
+
+ And request that appstream-xml.m4 get installed if missing.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=736497
+
+ macros2/gnome-autogen.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit f07add268460e3e678124155a2ce4a623e7d14d6
+Author: Philip Withnall
+Date: Tue Aug 26 00:03:51 2014 +0100
+
+ macros2: Deprecate GNOME_CODE_COVERAGE
+
+ The autoconf-archive AX_CODE_COVERAGE macro should be used instead.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=729405
+
+ macros2/Makefile.am | 1 +
+ macros2/ax_code_coverage.m4 | 180 +++++++++++++++++++++++++++++++++++++++++
+ macros2/gnome-code-coverage.m4 | 137 ++-----------------------------
+ 3 files changed, 188 insertions(+), 130 deletions(-)
+
+commit b62c76f204a8cae64dc2c3c33828d27c1a2581e5
+Author: Philip Withnall
+Date: Fri May 2 16:07:06 2014 +0200
+
+ macros2: Deprecate GNOME_MAINTAINER_MODE_DEFINES
+
+ The modules which it deprecates are all ancient and unused. Many of the
+ modules which use GNOME_MAINTAINER_MODE_DEFINES don’t make use of the
+ DISABLE_DEPRECATED variable it generates anyway.
+
+ If a module really wants maintainer mode, they should use
+ AM_MAINTAINER_MODE. Otherwise, they should just eliminate this call
+ entirely.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=735417
+
+ macros2/gnome-common.m4 | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit f9073d5defa6f30bb8b364c3a56c53a60eb0b0dd
+Author: Philip Withnall
+Date: Fri May 2 16:04:07 2014 +0200
+
+ macros2: Deprecate GNOME_DEBUG_CHECK
+
+ The autoconf-archive AX_DEBUG_CHECK macro should be used instead, or the
+ macro contents should just be substituted into configure.ac directly,
+ since it’s so simple.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=729403
+
+ macros2/Makefile.am | 13 ++++-
+ macros2/ax_check_enable_debug.m4 | 113 +++++++++++++++++++++++++++++++++++++++
+ macros2/gnome-common.m4 | 17 +++---
+ 3 files changed, 130 insertions(+), 13 deletions(-)
+
+commit efd34adf8b6d73f14c13fd87183983c576ea215c
+Author: Philip Withnall
+Date: Tue Aug 26 00:08:37 2014 +0100
+
+ build: Remove a non-existent file from EXTRA_DIST
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=735418
+
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit cdb06bca3101ef09a207deb290bd607ec128e04b
+Author: Michael Catanzaro
+Date: Sun Aug 17 18:00:17 2014 -0500
+
+ compiler-flags: allow suppressing warnings
+
+ Some projects want to see no warnings at all, for example, projects that
+ are written in Vala. But GNOME_COMPILE_WARNINGS([no]) is a no-op that
+ does nothing to turn off the default compiler warnings. Presumably if
+ you ask for no compiler warnings, you want no compiler warnings, so
+ suppress them in this case instead.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=734973
+
+ macros2/gnome-compiler-flags.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 13d01a8be18642956042f00321dece2cfe5493f1
+Author: Martin Pitt
+Date: Thu Jul 10 14:09:23 2014 +0200
+
+ code-coverage: Support lcov 1.11
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=732988
+
+ macros2/gnome-code-coverage.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 5a58347c8f9b48915311f7c91b885722492d378a
+Author: Philip Withnall
+Date: Sat May 10 22:44:27 2014 +0100
+
+ macros2: Remove FORBIDDEN_M4MACROS infrastructure
+
+ It was completely outdated and unused. The REQUIRED_M4MACROS
+ infrastructure is, however, still in use.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=729932
+
+ macros2/gnome-autogen.sh | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+
+commit aa7f70bbce305cabeb1dcdbfc6cd7cd437f6a2c4
+Author: Philip Withnall
+Date: Fri May 2 16:10:33 2014 +0200
+
+ macros2: Remove outdated README file
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=729410
+
+ macros2/README.cvs-commits | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+commit 0d59b7cb3b6e842ba87f4ebc1a56f654ad52301f
+Author: Philip Withnall
+Date: Fri May 2 15:41:29 2014 +0200
+
+ doc: Move doc/usage.txt to README and update
+
+ We don’t like references to CVS any more. Update the guidelines to no
+ longer reference GNOME_COMMON_INIT.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=729410
+
+ README | 38 ++++++++++++++++++++++++++++++++++++++
+ doc/usage.txt | 40 ----------------------------------------
+ 2 files changed, 38 insertions(+), 40 deletions(-)
+
+commit f5bd3785edfbebef04089fc52f804249d88b89de
+Author: Antoine Jacoutot
+Date: Tue Apr 15 10:27:49 2014 +0200
+
+ make program_VERSION a local variable
+
+ Otherwise we may end up overriding what was manually set in the
+ environment.
+
+ macros2/gnome-autogen.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
commit d213283fcb5228d05eb2c796579f18240e8467e8
Author: David King
Date: Mon Mar 24 12:19:08 2014 +0000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/Makefile.am new/gnome-common-3.14.0/Makefile.am
--- old/gnome-common-3.12.0/Makefile.am 2013-06-13 19:44:12.000000000 +0200
+++ new/gnome-common-3.14.0/Makefile.am 2014-08-26 12:27:54.000000000 +0200
@@ -3,7 +3,6 @@
EXTRA_DIST = \
autogen.sh \
gnome-common.doap \
- doc/usage.txt \
ChangeLog.pre-git
DISTCHECK_CONFIGURE_FLAGS = --disable-silent-rules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/Makefile.in new/gnome-common-3.14.0/Makefile.in
--- old/gnome-common-3.12.0/Makefile.in 2014-03-24 13:19:30.000000000 +0100
+++ new/gnome-common-3.14.0/Makefile.in 2014-09-22 13:33:17.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -78,7 +78,7 @@
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) COPYING \
- ChangeLog install-sh missing
+ ChangeLog README install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -264,7 +264,6 @@
EXTRA_DIST = \
autogen.sh \
gnome-common.doap \
- doc/usage.txt \
ChangeLog.pre-git
DISTCHECK_CONFIGURE_FLAGS = --disable-silent-rules
@@ -492,10 +491,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)
@@ -537,9 +542,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/gnome-common-3.12.0/README new/gnome-common-3.14.0/README
--- old/gnome-common-3.12.0/README 1970-01-01 01:00:00.000000000 +0100
+++ new/gnome-common-3.14.0/README 2014-05-07 18:11:50.000000000 +0200
@@ -0,0 +1,38 @@
+This module contains various files needed to bootstrap GNOME modules
+built from git. It contains the following components:
+ 1. A common "autogen.sh" script that can be used to configure a
+ source directory checked out from git.
+ 2. Some commonly used macros (quite a small set these days -- macros
+ should be packaged with their respective modules).
+
+To make use of the common autogen script, create a stub autogen.sh
+script in your module that looks something like this:
+
+---- Cut Here ----
+#!/bin/sh
+srcdir=`dirname $0`
+[ -z "$srcdir" ] && srcdir=.
+
+PKG_NAME=mypackage
+REQUIRED_AUTOMAKE_VERSION=1.7
+
+if [ ! -f "$srcdir/configure.ac" ]; then
+ echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
+ exit 1
+fi
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from GNOME Git"
+ exit 1
+}
+
+. gnome-autogen.sh "$@"
+---- Cut Here ----
+
+Then put the following in your configure.ac or configure.in file:
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"])
+
+This will make sure that autoconf macros will be found when you
+rebuild the package without rerunning autogen.sh.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/aclocal.m4 new/gnome-common-3.14.0/aclocal.m4
--- old/gnome-common-3.12.0/aclocal.m4 2014-03-24 13:19:29.000000000 +0100
+++ new/gnome-common-3.14.0/aclocal.m4 2014-09-22 13:33:15.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.4 -*- 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.4], [],
+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.4])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,7 +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 bug-automake@gnu.org 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
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -269,7 +316,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/gnome-common-3.12.0/configure new/gnome-common-3.14.0/configure
--- old/gnome-common-3.12.0/configure 2014-03-24 13:19:30.000000000 +0100
+++ new/gnome-common-3.14.0/configure 2014-09-22 13:33:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-common 3.12.0.
+# Generated by GNU Autoconf 2.69 for gnome-common 3.14.0.
#
# Report bugs to https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='gnome-common'
PACKAGE_TARNAME='gnome-common'
-PACKAGE_VERSION='3.12.0'
-PACKAGE_STRING='gnome-common 3.12.0'
+PACKAGE_VERSION='3.14.0'
+PACKAGE_STRING='gnome-common 3.14.0'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common'
PACKAGE_URL=''
@@ -1205,7 +1205,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 gnome-common 3.12.0 to adapt to many kinds of systems.
+\`configure' configures gnome-common 3.14.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1271,7 +1271,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-common 3.12.0:";;
+ short | recursive ) echo "Configuration of gnome-common 3.14.0:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-common configure 3.12.0
+gnome-common configure 3.14.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1365,7 +1365,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-common $as_me 3.12.0, which was
+It was created by gnome-common $as_me 3.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1716,7 +1716,7 @@
-am__api_version='1.13'
+am__api_version='1.14'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2231,7 +2231,7 @@
# Define the identity of the package.
PACKAGE='gnome-common'
- VERSION='3.12.0'
+ VERSION='3.14.0'
cat >>confdefs.h <<_ACEOF
@@ -2282,6 +2282,47 @@
+# 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 bug-automake@gnu.org 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 +2949,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gnome-common $as_me 3.12.0, which was
+This file was extended by gnome-common $as_me 3.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2961,7 +3002,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gnome-common config.status 3.12.0
+gnome-common config.status 3.14.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/gnome-common-3.12.0/configure.ac new/gnome-common-3.14.0/configure.ac
--- old/gnome-common-3.12.0/configure.ac 2014-03-24 13:17:14.000000000 +0100
+++ new/gnome-common-3.14.0/configure.ac 2014-09-22 13:32:49.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ(2.54)
-AC_INIT([gnome-common], [3.12.0],
+AC_INIT([gnome-common], [3.14.0],
[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common])
AC_CONFIG_SRCDIR([macros2/gnome-autogen.sh])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/doc/usage.txt new/gnome-common-3.14.0/doc/usage.txt
--- old/gnome-common-3.12.0/doc/usage.txt 2013-06-13 19:44:12.000000000 +0200
+++ new/gnome-common-3.14.0/doc/usage.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-This module contains various files needed to bootstrap Gnome 2 modules
-built from CVS. It contains the following components:
- 1. A common "autogen.sh" script that can be used to configure a
- source directory checked out from CVS.
- 2. Some commonly used macros (quite a small set these days -- macros
- should be packaged with their respective modules).
- 3. Some files used to build user documentation.
-
-To make use of the common autogen script, create a stub autogen.sh
-script in your module that looks something like this:
-
----- Cut Here ----
-#!/bin/sh
-srcdir=`dirname $0`
-[ -z "$srcdir" ] && srcdir=.
-
-PKG_NAME=mypackage
-REQUIRED_AUTOMAKE_VERSION=1.7
-
-if [ ! -f "$srcdir/somefile-that-is-only-in-mypackage" ]; then
- echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
- exit 1
-fi
-
-. gnome-autogen.sh
----- Cut Here ----
-
-Then put the following in your configure.ac or configure.in file:
- GNOME_COMMON_INIT
-
-This macro is equivalent to the following two lines (which you can use
-instead if you don't want to depend on gnome-common macros):
- AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
-
-Or if you are using the AC_CONFIG_MACRO_DIR macro:
- AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"])
-
-This will make sure that autoconf macros will be found when you
-rebuild the package without rerunning autogen.sh.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/doc-build/Makefile.in new/gnome-common-3.14.0/doc-build/Makefile.in
--- old/gnome-common-3.12.0/doc-build/Makefile.in 2014-03-24 13:19:30.000000000 +0100
+++ new/gnome-common-3.14.0/doc-build/Makefile.in 2014-09-22 13:33:17.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 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/gnome-common-3.12.0/macros2/Makefile.am new/gnome-common-3.14.0/macros2/Makefile.am
--- old/gnome-common-3.12.0/macros2/Makefile.am 2013-06-13 19:44:12.000000000 +0200
+++ new/gnome-common-3.14.0/macros2/Makefile.am 2014-08-29 18:28:20.000000000 +0200
@@ -5,9 +5,19 @@
gnome-compiler-flags.m4 \
gnome-code-coverage.m4
-EXTRA_DIST = $(GNOME2_MACROS) gnome-autogen.sh
+# Macros copied from the autoconf-archive.
+# http://www.gnu.org/software/autoconf-archive/
+# these should be dropped as soon as the deprecated GNOME2_MACROS which use them
+# are removed. Until then, they should be kept up to date, and all changes to
+# them submitted upstream.
+AUTOCONF_ARCHIVE_MACROS = \
+ ax_check_enable_debug.m4 \
+ ax_code_coverage.m4 \
+ $(NULL)
+
+EXTRA_DIST = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS) gnome-autogen.sh
aclocaldir = $(datadir)/aclocal
-aclocal_DATA = $(GNOME2_MACROS)
+aclocal_DATA = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS)
bin_SCRIPTS = gnome-autogen.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/macros2/Makefile.in new/gnome-common-3.14.0/macros2/Makefile.in
--- old/gnome-common-3.12.0/macros2/Makefile.in 2014-03-24 13:19:30.000000000 +0100
+++ new/gnome-common-3.14.0/macros2/Makefile.in 2014-09-22 13:33:17.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -216,9 +216,20 @@
gnome-compiler-flags.m4 \
gnome-code-coverage.m4
-EXTRA_DIST = $(GNOME2_MACROS) gnome-autogen.sh
+
+# Macros copied from the autoconf-archive.
+# http://www.gnu.org/software/autoconf-archive/
+# these should be dropped as soon as the deprecated GNOME2_MACROS which use them
+# are removed. Until then, they should be kept up to date, and all changes to
+# them submitted upstream.
+AUTOCONF_ARCHIVE_MACROS = \
+ ax_check_enable_debug.m4 \
+ ax_code_coverage.m4 \
+ $(NULL)
+
+EXTRA_DIST = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS) gnome-autogen.sh
aclocaldir = $(datadir)/aclocal
-aclocal_DATA = $(GNOME2_MACROS)
+aclocal_DATA = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS)
bin_SCRIPTS = gnome-autogen.sh
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/macros2/ax_check_enable_debug.m4 new/gnome-common-3.14.0/macros2/ax_check_enable_debug.m4
--- old/gnome-common-3.12.0/macros2/ax_check_enable_debug.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/gnome-common-3.14.0/macros2/ax_check_enable_debug.m4 2014-08-29 18:28:20.000000000 +0200
@@ -0,0 +1,113 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_check_enable_debug.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# Check for the presence of an --enable-debug option to configure and
+# allow/avoid compiled debugging flags appropriately.
+#
+# AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no],
+# [ENABLE DEBUG VARIABLES …],
+# [DISABLE DEBUG VARIABLES NDEBUG …])
+#
+# DESCRIPTION
+#
+# Check for the presence of an --enable-debug option to configure, with the
+# specified default value used when the option is not present. Return the
+# value in the variable $ax_enable_debug.
+#
+# Specifying 'yes' adds '-g -O0' to the compilation flags for all languages.
+# Specifying 'info' adds '-g' to the compilation flags. Specifying 'profile'
+# adds '-g -pg' to the compilation flags and '-pg' to the linking flags.
+# Otherwise, nothing is added.
+#
+# Define the variables listed in the second argument if debug is enabled,
+# defaulting to no variables. Defines the variables listed in the third
+# argument if debug is disabled, defaulting to NDEBUG. All lists of
+# variables should be space-separated.
+#
+# If debug is not enabled, ensure AC_PROG_* will not add debugging flags.
+# Should be invoked prior to any AC_PROG_* compiler checks.
+#
+# LAST MODIFICATION
+#
+# 2014-05-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2011 Rhys Ulerich
+# Copyright © 2014 Philip Withnall
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved.
+
+AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
+ AC_BEFORE([$0],[AC_PROG_CC])dnl
+ AC_BEFORE([$0],[AC_PROG_CXX])dnl
+ AC_BEFORE([$0],[AC_PROG_F77])dnl
+ AC_BEFORE([$0],[AC_PROG_FC])dnl
+
+ AC_MSG_CHECKING(whether to enable debugging)
+
+ m4_define(ax_enable_debug_default,[m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))])
+ m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))])
+ m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))])
+
+ AC_ARG_ENABLE(debug,
+ [AS_HELP_STRING([--enable-debug]@<:@=ax_enable_debug_default@:>@,[compile with debugging; one of yes/info/profile/no])],
+ [],enable_debug=ax_enable_debug_default)
+ if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then
+ AC_MSG_RESULT(yes)
+ CFLAGS="${CFLAGS} -g -O0"
+ CXXFLAGS="${CXXFLAGS} -g -O0"
+ FFLAGS="${FFLAGS} -g -O0"
+ FCFLAGS="${FCFLAGS} -g -O0"
+ OBJCFLAGS="${OBJCFLAGS} -g -O0"
+
+ dnl Define various variables if debugging is enabled.
+ m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])
+ else
+ if test "x$enable_debug" = "xinfo"; then
+ AC_MSG_RESULT(info)
+ CFLAGS="${CFLAGS} -g"
+ CXXFLAGS="${CXXFLAGS} -g"
+ FFLAGS="${FFLAGS} -g"
+ FCFLAGS="${FCFLAGS} -g"
+ OBJCFLAGS="${OBJCFLAGS} -g"
+ elif test "x$enable_debug" = "xprofile"; then
+ AC_MSG_RESULT(profile)
+ CFLAGS="${CFLAGS} -g -pg"
+ CXXFLAGS="${CXXFLAGS} -g -pg"
+ FFLAGS="${FFLAGS} -g -pg"
+ FCFLAGS="${FCFLAGS} -g -pg"
+ OBJCFLAGS="${OBJCFLAGS} -g -pg"
+ LDFLAGS="${LDFLAGS} -pg"
+ else
+ AC_MSG_RESULT(no)
+ dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags
+ dnl by setting any unset environment flag variables
+ if test "x${CFLAGS+set}" != "xset"; then
+ CFLAGS=""
+ fi
+ if test "x${CXXFLAGS+set}" != "xset"; then
+ CXXFLAGS=""
+ fi
+ if test "x${FFLAGS+set}" != "xset"; then
+ FFLAGS=""
+ fi
+ if test "x${FCFLAGS+set}" != "xset"; then
+ FCFLAGS=""
+ fi
+ if test "x${OBJCFLAGS+set}" != "xset"; then
+ OBJCFLAGS=""
+ fi
+ fi
+
+ dnl Define various variables if debugging is disabled.
+ dnl assert.h is a NOP if NDEBUG is defined, so define it by default.
+ m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])
+ fi
+ ax_enable_debug=$enable_debug
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/macros2/ax_code_coverage.m4 new/gnome-common-3.14.0/macros2/ax_code_coverage.m4
--- old/gnome-common-3.12.0/macros2/ax_code_coverage.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/gnome-common-3.14.0/macros2/ax_code_coverage.m4 2014-08-29 18:28:20.000000000 +0200
@@ -0,0 +1,180 @@
+# SYNOPSIS
+#
+# AX_CODE_COVERAGE()
+#
+# DESCRIPTION
+#
+# Defines CODE_COVERAGE_CFLAGS and CODE_COVERAGE_LDFLAGS which should be
+# included in the CFLAGS and LIBS/LDFLAGS variables of every build target
+# (program or library) which should be built with code coverage support.
+# Also defines CODE_COVERAGE_RULES which should be substituted in your
+# Makefile; and $enable_code_coverage which can be used in subsequent
+# configure output. CODE_COVERAGE_ENABLED is defined and substituted, and
+# corresponds to the value of the --enable-code-coverage option, which
+# defaults to being disabled.
+#
+# Note that all optimisation flags in CFLAGS must be disabled when code
+# coverage is enabled.
+#
+# Usage example:
+# configure.ac:
+# AX_CODE_COVERAGE
+#
+# Makefile.am:
+# @CODE_COVERAGE_RULES@
+# my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) …
+# my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) …
+#
+# This results in a “check-code-coverage” rule being added to any Makefile.am
+# which includes “@CODE_COVERAGE_RULES@” (assuming the module has been
+# configured with --enable-code-coverage). Running `make check-code-coverage`
+# in that directory will run the module’s test suite (`make check`) and build
+# a code coverage report detailing the code which was touched, then print the
+# URI for the report.
+#
+# LICENSE
+#
+# Copyright © 2012, 2014 Philip Withnall
+# Copyright © 2012 Xan Lopez
+# Copyright © 2012 Christian Persch
+# Copyright © 2012 Paolo Borelli
+# Copyright © 2012 Dan Winship
+#
+# Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+.
+# This file is licenced under LGPLv2.1+.
+
+#serial 1
+
+AC_DEFUN([AX_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 1.11"
+
+ AC_CHECK_PROG([LCOV], [lcov], [lcov])
+ AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
+
+ AS_IF([ test "$LCOV" ], [
+ AC_CACHE_CHECK([for lcov version], ax_cv_lcov_version, [
+ ax_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
+ ax_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 $ax_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])
+ ])
+
+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([CODE_COVERAGE_RULES])
+ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/macros2/gnome-autogen.sh new/gnome-common-3.14.0/macros2/gnome-autogen.sh
--- old/gnome-common-3.12.0/macros2/gnome-autogen.sh 2014-03-24 13:16:46.000000000 +0100
+++ new/gnome-common-3.14.0/macros2/gnome-autogen.sh 2014-09-12 16:08:15.000000000 +0200
@@ -17,7 +17,6 @@
# a list of required m4 macros. Package can set an initial value
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.
@@ -80,6 +79,7 @@
vc_min_version=$4
vc_source=$5
vc_status=1
+ local ${vc_variable}_VERSION
vc_checkprog=`eval echo "\\$$vc_variable"`
if [ -n "$vc_checkprog" ]; then
@@ -128,13 +128,6 @@
esac
}
-forbid_m4macro() {
- case "$FORBIDDEN_M4MACROS" in
- $1\ * | *\ $1\ * | *\ $1) ;;
- *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
- esac
-}
-
# Usage:
# add_to_cm_macrodirs dirname
# Adds the dir to $cm_macrodirs, if it's not there yet.
@@ -219,32 +212,12 @@
print_m4macros_error
exit $cm_status
fi
- if [ -n "$FORBIDDEN_M4MACROS" ]; then
- printbold "Checking for forbidden M4 macros..."
- # check that each macro file is in one of the macro dirs
- for cm_macro in $FORBIDDEN_M4MACROS; do
- cm_macrofound=false
- for cm_dir in $cm_macrodirs; do
- if [ -f "$cm_dir/$cm_macro" ]; then
- cm_macrofound=true
- break
- fi
- done
- if $cm_macrofound; then
- printerr " $cm_macro found (should be cleared from macros dir)"
- cm_status=1
- fi
- done
- fi
if [ "$cm_status" != 0 ]; then
print_m4macros_error
exit $cm_status
fi
}
-# try to catch the case where the macros2/ directory hasn't been cleared out.
-forbid_m4macro gnome-cxx-check.m4
-
want_glib_gettext=false
want_intltool=false
want_pkg_config=false
@@ -311,6 +284,10 @@
require_m4macro appdata-xml.m4
fi
+ if grep "^APPSTREAM_XML" $configure_ac >/dev/null; then
+ require_m4macro appstream-xml.m4
+ fi
+
# check to make sure gnome-common macros can be found ...
if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null ||
grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null ||
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/macros2/gnome-code-coverage.m4 new/gnome-common-3.14.0/macros2/gnome-code-coverage.m4
--- old/gnome-common-3.12.0/macros2/gnome-code-coverage.m4 2013-06-13 19:44:12.000000000 +0200
+++ new/gnome-common-3.14.0/macros2/gnome-code-coverage.m4 2014-09-15 13:42:28.000000000 +0200
@@ -29,136 +29,13 @@
dnl a code coverage report detailing the code which was touched, then print the
dnl URI for the report.
-AC_DEFUN([GNOME_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], gnome_cv_lcov_version, [
- gnome_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
- gnome_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 $gnome_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])
- ])
-
-GNOME_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
-'
+AU_DEFUN([GNOME_CODE_COVERAGE],[
+ AX_CODE_COVERAGE
+ GNOME_CODE_COVERAGE_RULES=$CODE_COVERAGE_RULES
AC_SUBST([GNOME_CODE_COVERAGE_RULES])
m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([GNOME_CODE_COVERAGE_RULES])])
-])
+],
+[[$0: This macro is deprecated. You should use AX_CODE_COVERAGE instead and
+replace uses of GNOME_CODE_COVERAGE_RULES with CODE_COVERAGE_RULES.
+See: http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html#ax_code_c...]])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/macros2/gnome-common.m4 new/gnome-common-3.14.0/macros2/gnome-common.m4
--- old/gnome-common-3.12.0/macros2/gnome-common.m4 2013-06-13 19:44:12.000000000 +0200
+++ new/gnome-common-3.14.0/macros2/gnome-common.m4 2014-09-15 13:42:28.000000000 +0200
@@ -23,23 +23,18 @@
in your top-level Makefile.am, instead, where "m4" is the macro directory set
with AC_CONFIG_MACRO_DIR() in your configure.ac]])
-AC_DEFUN([GNOME_DEBUG_CHECK],
+AU_DEFUN([GNOME_DEBUG_CHECK],
[
- AC_ARG_ENABLE([debug],
- AC_HELP_STRING([--enable-debug],
- [turn on debugging]),,
- [enable_debug=no])
-
- if test x$enable_debug = xyes ; then
- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
- [Enable additional debugging at the expense of performance and size])
- fi
-])
+ AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG])
+],
+[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and
+replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG.
+See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_c...]])
dnl GNOME_MAINTAINER_MODE_DEFINES ()
dnl define DISABLE_DEPRECATED
dnl
-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
[
AC_REQUIRE([AM_MAINTAINER_MODE])
@@ -52,4 +47,6 @@
fi
AC_SUBST(DISABLE_DEPRECATED)
-])
+],
+[[$0: This macro is deprecated. All of the modules it disables deprecations for
+are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/macros2/gnome-compiler-flags.m4 new/gnome-common-3.14.0/macros2/gnome-compiler-flags.m4
--- old/gnome-common-3.12.0/macros2/gnome-compiler-flags.m4 2013-10-31 19:46:08.000000000 +0100
+++ new/gnome-common-3.14.0/macros2/gnome-compiler-flags.m4 2014-09-22 13:32:01.000000000 +0200
@@ -58,7 +58,7 @@
case "$enable_compile_warnings" in
no)
- warning_flags=
+ warning_flags="-w"
;;
minimum)
warning_flags="-Wall"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-common-3.12.0/missing new/gnome-common-3.14.0/missing
--- old/gnome-common-3.12.0/missing 2014-03-24 13:19:30.000000000 +0100
+++ new/gnome-common-3.14.0/missing 2014-09-22 13:33:17.000000000 +0200
@@ -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 , 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: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org