From d2d98cb07bf3438819625ca83adf2162c030f438 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Tue, 22 Apr 2014 10:54:48 +0200 Subject: [PATCH] fixed compilation when cppcheck is not installed. --- NEWS | 5 +++++ configure | 34 ++++++++++++++++++++++++---------- configure.ac | 1 + po/Makefile | 4 ++-- po/Makefile.in | 4 ++-- po/fr.po | 2 +- po/ppastats.pot | 4 ++-- src/ppastats.1 | 4 ++-- tests/Makefile.am | 6 ++++-- tests/Makefile.in | 17 +++++++++-------- themes/default/templates/footer.tpl | 2 +- 11 files changed, 53 insertions(+), 30 deletions(-) diff --git a/NEWS b/NEWS index c76514a..1da6dff 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +v1.3.1 +------ + +* fixed compilation when cppcheck is not installed. + v1.3.0 ------ diff --git a/configure b/configure index 1e091f7..9ff6f4a 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.x. +# Generated by GNU Autoconf 2.69 for ppastats 1.3.0. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ppastats' PACKAGE_TARNAME='ppastats' -PACKAGE_VERSION='1.3.x' -PACKAGE_STRING='ppastats 1.3.x' +PACKAGE_VERSION='1.3.0' +PACKAGE_STRING='ppastats 1.3.0' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/ppastats' @@ -627,6 +627,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +CPPCHECK_FALSE +CPPCHECK_TRUE HAVE_CPPCHECK HELP2MAN JSON_FALSE @@ -1319,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.x to adapt to many kinds of systems. +\`configure' configures ppastats 1.3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1395,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ppastats 1.3.x:";; + short | recursive ) echo "Configuration of ppastats 1.3.0:";; esac cat <<\_ACEOF @@ -1507,7 +1509,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ppastats configure 1.3.x +ppastats configure 1.3.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1863,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.x, which was +It was created by ppastats $as_me 1.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2728,7 +2730,7 @@ fi # Define the identity of the package. PACKAGE='ppastats' - VERSION='1.3.x' + VERSION='1.3.0' cat >>confdefs.h <<_ACEOF @@ -7144,6 +7146,14 @@ $as_echo "no" >&6; } fi + if test -n "$HAVE_CPPCHECK"; then + CPPCHECK_TRUE= + CPPCHECK_FALSE='#' +else + CPPCHECK_TRUE='#' + CPPCHECK_FALSE= +fi + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7282,6 +7292,10 @@ if test -z "${JSON_TRUE}" && test -z "${JSON_FALSE}"; then as_fn_error $? "conditional \"JSON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CPPCHECK_TRUE}" && test -z "${CPPCHECK_FALSE}"; then + as_fn_error $? "conditional \"CPPCHECK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -7679,7 +7693,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.x, which was +This file was extended by ppastats $as_me 1.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7746,7 +7760,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.x +ppastats config.status 1.3.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 55b1f53..53d79bd 100644 --- a/configure.ac +++ b/configure.ac @@ -64,5 +64,6 @@ AC_CONFIG_FILES([ po/Makefile.in AC_CHECK_PROGS([HELP2MAN], [help2man]) AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes) +AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK") AC_OUTPUT diff --git a/po/Makefile b/po/Makefile index ed206e1..addfee4 100644 --- a/po/Makefile +++ b/po/Makefile @@ -12,7 +12,7 @@ GETTEXT_MACRO_VERSION = 0.18 PACKAGE = ppastats -VERSION = 1.3.x +VERSION = 1.3.0 PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh @@ -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.x' \ + --package-version='1.3.0' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ esac diff --git a/po/Makefile.in b/po/Makefile.in index baca85a..c77f427 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -12,7 +12,7 @@ GETTEXT_MACRO_VERSION = 0.18 PACKAGE = ppastats -VERSION = 1.3.x +VERSION = 1.3.0 PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh @@ -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.x' \ + --package-version='1.3.0' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ esac diff --git a/po/fr.po b/po/fr.po index 1c359a8..3caff03 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 00:00+0200\n" +"POT-Creation-Date: 2014-04-22 01:57+0200\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 10c2c73..d4f3e61 100644 --- a/po/ppastats.pot +++ b/po/ppastats.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ppastats 1.3.x\n" +"Project-Id-Version: ppastats 1.3.0\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-04-22 00:00+0200\n" +"POT-Creation-Date: 2014-04-22 01:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/ppastats.1 b/src/ppastats.1 index 27f190e..c2e63e7 100644 --- a/src/ppastats.1 +++ b/src/ppastats.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. -.TH PPASTATS "1" "March 2014" "ppastats 1.2.x" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. +.TH PPASTATS "1" "April 2014" "ppastats 1.3.0" "User Commands" .SH NAME ppastats \- PPA Statistics command line tool .SH SYNOPSIS diff --git a/tests/Makefile.am b/tests/Makefile.am index a94900d..e80d69c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,8 +8,7 @@ EXTRA_DIST = \ test_strrep.c \ test_ptime.c -TESTS = test-cppcheck.sh \ - test-strrep \ +TESTS = test-strrep \ test-ptime check_PROGRAMS = test-strrep test-ptime @@ -26,3 +25,6 @@ test_ptime_SOURCES = \ $(top_builddir)/src/ptime.c test_ptime_CFLAGS = -I$(top_srcdir)/src +if CPPCHECK +TESTS += test-cppcheck.sh +endif \ No newline at end of file diff --git a/tests/Makefile.in b/tests/Makefile.in index 35f4969..4d38788 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -77,8 +77,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -TESTS = test-cppcheck.sh test-strrep$(EXEEXT) test-ptime$(EXEEXT) +TESTS = test-strrep$(EXEEXT) test-ptime$(EXEEXT) $(am__append_1) check_PROGRAMS = test-strrep$(EXEEXT) test-ptime$(EXEEXT) +@CPPCHECK_TRUE@am__append_1 = test-cppcheck.sh subdir = tests DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp $(top_srcdir)/test-driver @@ -831,13 +832,6 @@ recheck: all $(check_PROGRAMS) am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? -test-cppcheck.sh.log: test-cppcheck.sh - @p='test-cppcheck.sh'; \ - b='test-cppcheck.sh'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) test-strrep.log: test-strrep$(EXEEXT) @p='test-strrep$(EXEEXT)'; \ b='test-strrep'; \ @@ -852,6 +846,13 @@ test-ptime.log: test-ptime$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-cppcheck.sh.log: test-cppcheck.sh + @p='test-cppcheck.sh'; \ + b='test-cppcheck.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ diff --git a/themes/default/templates/footer.tpl b/themes/default/templates/footer.tpl index b785ac3..901d1db 100644 --- a/themes/default/templates/footer.tpl +++ b/themes/default/templates/footer.tpl @@ -1,5 +1,5 @@ -- 2.7.4