From 3ca54b267a894ba423188b323c46a7ece83e422f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 2 Nov 2014 10:23:54 +0100 Subject: [PATCH] regenerated build files. --- aclocal.m4 | 58 ++++++++++++++++++++++++++++++++++++- configure | 21 +++++++------- po/Makefile | 6 ++-- po/Makefile.in | 6 ++-- po/fr.po | 2 +- po/ppastats.pot | 4 +-- themes/default/templates/footer.tpl | 2 +- 7 files changed, 78 insertions(+), 21 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index df754fc..d56243f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -180,6 +180,61 @@ else fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -733,7 +788,8 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -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 diff --git a/configure b/configure index 160f305..18f295d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ppastats 1.3.1. +# Generated by GNU Autoconf 2.69 for ppastats 1.3.2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ppastats' PACKAGE_TARNAME='ppastats' -PACKAGE_VERSION='1.3.1' -PACKAGE_STRING='ppastats 1.3.1' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='ppastats 1.3.2' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/ppastats' @@ -1321,7 +1321,7 @@ if test "$ac_init_help" = "long"; then # 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 ppastats 1.3.1 to adapt to many kinds of systems. +\`configure' configures ppastats 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1395,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ppastats 1.3.1:";; + short | recursive ) echo "Configuration of ppastats 1.3.2:";; esac cat <<\_ACEOF @@ -1509,7 +1509,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ppastats configure 1.3.1 +ppastats configure 1.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1865,7 +1865,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ppastats $as_me 1.3.1, which was +It was created by ppastats $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2730,7 +2730,7 @@ fi # Define the identity of the package. PACKAGE='ppastats' - VERSION='1.3.1' + VERSION='1.3.2' cat >>confdefs.h <<_ACEOF @@ -2824,6 +2824,7 @@ END fi + ac_config_headers="$ac_config_headers config.h" @@ -7693,7 +7694,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ppastats $as_me 1.3.1, which was +This file was extended by ppastats $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7760,7 +7761,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ppastats config.status 1.3.1 +ppastats config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/po/Makefile b/po/Makefile index 0d228c9..5bbff88 100644 --- a/po/Makefile +++ b/po/Makefile @@ -12,7 +12,7 @@ GETTEXT_MACRO_VERSION = 0.18 PACKAGE = ppastats -VERSION = 1.3.1 +VERSION = 1.3.2 PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh @@ -22,7 +22,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} @@ -209,7 +209,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --package-name="$${package_gnu}ppastats" \ - --package-version='1.3.1' \ + --package-version='1.3.2' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ esac diff --git a/po/Makefile.in b/po/Makefile.in index 40ecb2b..83e4ada 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -12,7 +12,7 @@ GETTEXT_MACRO_VERSION = 0.18 PACKAGE = ppastats -VERSION = 1.3.1 +VERSION = 1.3.2 PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh @@ -22,7 +22,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} @@ -162,7 +162,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --package-name="$${package_gnu}ppastats" \ - --package-version='1.3.1' \ + --package-version='1.3.2' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ esac diff --git a/po/fr.po b/po/fr.po index 03743ff..2066abc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ppastats 0.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-04-22 10:58+0200\n" +"POT-Creation-Date: 2014-11-02 10:22+0100\n" "PO-Revision-Date: 2012-05-05 23:45+0200\n" "Last-Translator: \n" "Language-Team: French\n" diff --git a/po/ppastats.pot b/po/ppastats.pot index 6bc7dff..95ef14a 100644 --- a/po/ppastats.pot +++ b/po/ppastats.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ppastats 1.3.1\n" +"Project-Id-Version: ppastats 1.3.2\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-04-22 10:58+0200\n" +"POT-Creation-Date: 2014-11-02 10:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/themes/default/templates/footer.tpl b/themes/default/templates/footer.tpl index 7041fab..ea91747 100644 --- a/themes/default/templates/footer.tpl +++ b/themes/default/templates/footer.tpl @@ -1,5 +1,5 @@ -- 2.7.4