[Spice-devel] [PATCH spice-server 3/3] Remove autotools files in favor of meson
Eduardo Lima (Etrunko)
etrunko at redhat.com
Fri Apr 27 19:25:40 UTC 2018
Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
.gitlab-ci.yml | 38 +-
GNUmakefile | 127 ---
Makefile.am | 43 -
README | 35 +-
autogen.sh | 19 -
cfg.mk | 152 ----
configure.ac | 315 -------
docs/Makefile.am | 22 -
docs/manual/Makefile.am | 32 -
m4/ax_valgrind_check.m4 | 235 ------
m4/manywarnings.m4 | 276 -------
m4/spice-compile-warnings.m4 | 143 ----
m4/virt-linker-no-indirect.m4 | 32 -
m4/virt-linker-relro.m4 | 35 -
m4/warnings.m4 | 79 --
maint.mk | 1670 --------------------------------------
server/Makefile.am | 226 ------
server/spice-server-enums.c.tmpl | 39 -
server/spice-server-enums.h.tmpl | 19 -
server/tests/Makefile.am | 150 ----
spice-common | 1 -
spice-server.pc.in | 14 -
tools/Makefile.am | 23 -
23 files changed, 30 insertions(+), 3695 deletions(-)
delete mode 100644 GNUmakefile
delete mode 100644 Makefile.am
delete mode 100755 autogen.sh
delete mode 100644 cfg.mk
delete mode 100644 configure.ac
delete mode 100644 docs/Makefile.am
delete mode 100644 docs/manual/Makefile.am
delete mode 100644 m4/ax_valgrind_check.m4
delete mode 100644 m4/manywarnings.m4
delete mode 100644 m4/spice-compile-warnings.m4
delete mode 100644 m4/virt-linker-no-indirect.m4
delete mode 100644 m4/virt-linker-relro.m4
delete mode 100644 m4/warnings.m4
delete mode 100644 maint.mk
delete mode 100644 server/Makefile.am
delete mode 100644 server/spice-server-enums.c.tmpl
delete mode 100644 server/spice-server-enums.h.tmpl
delete mode 100644 server/tests/Makefile.am
delete mode 160000 spice-common
delete mode 100644 spice-server.pc.in
delete mode 100644 tools/Makefile.am
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52851ca6..9209cce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,15 +11,6 @@ before_script:
- ln -sf /usr/bin/python3 /usr/bin/python #FIXME?
makecheck:
- script:
- - >
- CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
- LDFLAGS='-fsanitize=address -lasan'
- ./autogen.sh
- - make
- - make -C server check || (cat server/tests/test-suite.log && exit 1)
-
-meson-makecheck:
script:
- meson build
- ninja -C build
@@ -29,12 +20,6 @@ meson-makecheck:
# --enable-statistics compile statistic code
# --without-sasl disable SASL
options:
- script:
- - ./autogen.sh --enable-statistics --without-sasl
- - make
- - make -C server check || (cat server/tests/test-suite.log && exit 1)
-
-meson-options:
script:
- meson -Dstatistics=true -Dsasl=false build
- ninja -C build
@@ -48,25 +33,12 @@ check-valgrind:
dnf install valgrind
gstreamer1-libav gstreamer1-plugins-ugly gstreamer1-plugins-good gstreamer1-plugins-bad-free
-y
- - >
- CFLAGS='-O2 -pipe -g -D_FORTIFY_SOURCE=0'
- ./autogen.sh --enable-valgrind --enable-extra-checks
- - make
- - make check-valgrind || (cat server/tests/test-suite-memcheck.log && exit 1)
-
-meson-check-valgrind:
- script:
- - dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm -y
- - dnf debuginfo-install spice-server glib2 -y
- - >
- dnf install valgrind
- gstreamer1-libav gstreamer1-plugins-ugly gstreamer1-plugins-good gstreamer1-plugins-bad-free
- -y
+# CFLAGS='-O2 -pipe -g -D_FORTIFY_SOURCE=0'
- meson -Dextra-checks=true build
- ninja -C build
- cd build && meson test --wrap=valgrind # || (cat server/tests/test-suite-memcheck.log && exit 1)
-syntax-check:
- script:
- - ./autogen.sh
- - make syntax-check
+#syntax-check:
+# script:
+# - ./autogen.sh
+# - make syntax-check
diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index a869da5b..00000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,127 +0,0 @@
-# Having a separate GNUmakefile lets me 'include' the dynamically
-# generated rules created via cfg.mk (package-local configuration)
-# as well as maint.mk (generic maintainer rules).
-# This makefile is used only if you run GNU Make.
-# It is necessary if you want to build targets usually of interest
-# only to the maintainer.
-
-# Copyright (C) 2001, 2003, 2006-2016 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# If the user runs GNU make but has not yet run ./configure,
-# give them a diagnostic.
-_gl-Makefile := $(wildcard [M]akefile)
-ifneq ($(_gl-Makefile),)
-
-# Make tar archive easier to reproduce.
-export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
-
-# Allow the user to add to this in the Makefile.
-ALL_RECURSIVE_TARGETS =
-
-include Makefile
-
-# Some projects override e.g., _autoreconf here.
--include $(srcdir)/cfg.mk
-
-# Allow cfg.mk to override these.
-_build-aux ?= build-aux
-_autoreconf ?= autoreconf -v
-
-include $(srcdir)/maint.mk
-
-# Ensure that $(VERSION) is up to date for dist-related targets, but not
-# for others: rerunning autoreconf and recompiling everything isn't cheap.
-_have-git-version-gen := \
- $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes)
-ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
- _is-dist-target ?= $(filter-out %clean, \
- $(filter maintainer-% dist% alpha beta stable,$(MAKECMDGOALS)))
- _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
- ifneq (,$(_is-dist-target)$(_is-install-target))
- _curr-ver := $(shell cd $(srcdir) \
- && $(_build-aux)/git-version-gen \
- .tarball-version \
- $(git-version-gen-tag-sed-script))
- ifneq ($(_curr-ver),$(VERSION))
- ifeq ($(_curr-ver),UNKNOWN)
- $(info WARNING: unable to verify if $(VERSION) is the correct version)
- else
- ifneq (,$(_is-install-target))
- # GNU Coding Standards state that 'make install' should not cause
- # recompilation after 'make all'. But as long as changing the version
- # string alters config.h, the cost of having 'make all' always have an
- # up-to-date version is prohibitive. So, as a compromise, we merely
- # warn when installing a version string that is out of date; the user
- # should run 'autoreconf' (or something like 'make distcheck') to
- # fix the version, 'make all' to propagate it, then 'make install'.
- $(info WARNING: version string $(VERSION) is out of date;)
- $(info run '$(MAKE) _version' to fix it)
- else
- $(info INFO: running autoreconf for new version string: $(_curr-ver))
-GNUmakefile: _version
- touch GNUmakefile
- endif
- endif
- endif
- endif
-endif
-
-.PHONY: _version
-_version:
- cd $(srcdir) && rm -rf autom4te.cache .version && $(_autoreconf)
- $(MAKE) $(AM_MAKEFLAGS) Makefile
-
-else
-
-.DEFAULT_GOAL := abort-due-to-no-makefile
-srcdir = .
-
-# The package can override .DEFAULT_GOAL to run actions like autoreconf.
--include ./cfg.mk
-
-# Allow cfg.mk to override these.
-_build-aux ?= build-aux
-_autoreconf ?= autoreconf -v
-
-include ./maint.mk
-
-ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
-$(MAKECMDGOALS): abort-due-to-no-makefile
-endif
-
-abort-due-to-no-makefile:
- @echo There seems to be no Makefile in this directory. 1>&2
- @echo "You must run ./configure before running 'make'." 1>&2
- @exit 1
-
-endif
-
-# Tell version 3.79 and up of GNU make to not build goals in this
-# directory in parallel, in case someone tries to build multiple
-# targets, and one of them can cause a recursive target to be invoked.
-
-# Only set this if Automake doesn't provide it.
-AM_RECURSIVE_TARGETS ?= $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) \
- dist distcheck tags ctags
-
-ALL_RECURSIVE_TARGETS += $(AM_RECURSIVE_TARGETS)
-
-ifneq ($(word 2, $(MAKECMDGOALS)), )
-ifneq ($(filter $(ALL_RECURSIVE_TARGETS), $(MAKECMDGOALS)), )
-.NOTPARALLEL:
-endif
-endif
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 0104f22d..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-NULL =
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = spice-common server docs tools
-
-check-valgrind:
- $(MAKE) -C server check-valgrind
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = spice-server.pc
-
-DISTCHECK_CONFIGURE_FLAGS = \
- --enable-automated-tests \
- --enable-smartcard \
- --with-sasl \
- --enable-manual \
- $(NULL)
-
-EXTRA_DIST = \
- meson.build \
- meson_options.txt \
- subprojects/spice-common.wrap \
- build-aux/git-version-gen \
- .version \
- $(NULL)
-
-# Generate the ChangeLog file (with all entries since the switch to git)
-# and insert it into the directory we're about to use to create a tarball.
-.PHONY: gen-ChangeLog
-gen-ChangeLog:
- if test -d .git || test -d ../.git; then \
- $(top_srcdir)/build-aux/gitlog-to-changelog > $(distdir)/cl-t; \
- rm -f $(distdir)/ChangeLog; \
- mv $(distdir)/cl-t $(distdir)/ChangeLog; \
- fi
-
-# see git-version-gen
-dist-hook: gen-ChangeLog
- echo $(VERSION) > $(distdir)/.tarball-version
-
-BUILT_SOURCES = $(top_srcdir)/.version
-$(top_srcdir)/.version:
- echo $(VERSION) > $@-t && mv $@-t $@
diff --git a/README b/README
index 4aaf6a7c..49011080 100644
--- a/README
+++ b/README
@@ -9,20 +9,35 @@ from a wide variety of machine architectures.
Installation
------------
-The SPICE package uses GNU autotools, so the build install process
-follows the standard process documented in the INSTALL file. As a
-quick start you can do
+The SPICE package uses meson, and the minimum version required is
+0.45.0, because it includes some interesting features for the specific
+use case of subprojects, just like spice-common.
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --libdir=/usr/lib
- make
- sudo make install
+If your distro is still lagging behind on the package version, there is
+an easy way to upgrade meson, by installing a new version on your
+$HOME/.local directory with python 'pip'.
+
+ $ pip3 install --upgrade --user meson
+
+After downloading the meson package, it is necessary to tell python
+where to find it, via the PYTHONPATH environment variable.
+
+ $ export PYTHONPATH='$HOME/.local/lib/python3.6/site-packages
+
+Then you are ready to go. As a quick start, you can do
+
+ $ meson build --prefix=/usr
+ $ ninja -C build
+ $ sudo ninja -C build install
Or to install into a private user specific location
- ./configure --prefix=$HOME/spice
- make
- make install
+ $ meson build --prefix=$HOME/spice
+ $ ninja -C build
+ $ ninja -C build install
+
+More detailed information about the meson build system can be found on
+the project website (http://mesonbuild.com).
The following mandatory dependencies are required in order to
build SPICE
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index e9080fe8..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e # exit on errors
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-git submodule update --init --recursive
-
-mkdir -p m4
-autoreconf --verbose --force --install
-
-cd "$olddir"
-if [ -z "$NOCONFIGURE" ]; then
- "$srcdir"/configure --enable-maintainer-mode --enable-python-checks ${1+"$@"}
-fi
diff --git a/cfg.mk b/cfg.mk
deleted file mode 100644
index 93d7040c..00000000
--- a/cfg.mk
+++ /dev/null
@@ -1,152 +0,0 @@
-# Customize Makefile.maint. -*- makefile -*-
-# Copyright (C) 2008-2011 Red Hat, Inc.
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Tests not to run as part of "make distcheck".
-local-checks-to-skip = \
- changelog-check \
- check-AUTHORS \
- makefile-check \
- makefile_path_separator_check \
- patch-check \
- sc_GPL_version \
- sc_always_defined_macros \
- sc_cast_of_alloca_return_value \
- sc_cross_check_PATH_usage_in_tests \
- sc_dd_max_sym_length \
- sc_error_exit_success \
- sc_file_system \
- sc_immutable_NEWS \
- sc_makefile_path_separator_check \
- sc_obsolete_symbols \
- sc_prohibit_always_true_header_tests \
- sc_prohibit_S_IS_definition \
- sc_prohibit_atoi_atof \
- sc_prohibit_hash_without_use \
- sc_prohibit_jm_in_m4 \
- sc_prohibit_quote_without_use \
- sc_prohibit_quotearg_without_use \
- sc_prohibit_stat_st_blocks \
- sc_prohibit_magic_number_exit \
- sc_prohibit_strcmp \
- sc_prohibit_undesirable_word_seq \
- sc_root_tests \
- sc_space_tab \
- sc_sun_os_names \
- sc_system_h_headers \
- sc_texinfo_acronym \
- sc_tight_scope \
- sc_two_space_separator_in_usage \
- sc_error_message_uppercase \
- sc_program_name \
- sc_require_test_exit_idiom \
- sc_makefile_check \
- sc_useless_cpp_parens \
- sc_Wundef_boolean
-
-# Files that should never cause syntax check failures.
-VC_LIST_ALWAYS_EXCLUDE_REGEX = \
- (^HACKING|\.po|maint.mk)$$
-
-# Functions like free() that are no-ops on NULL arguments.
-useless_free_options = \
- --name=xfree \
- --name=g_free \
- --name=xmlBufferFree \
- --name=xmlFree \
- --name=xmlFreeDoc \
- --name=xmlXPathFreeContext \
- --name=xmlXPathFreeObject
-
-# Ensure that no C source file, docs, or rng schema uses TABs for
-# indentation. Also match *.h.in files, to get libvirt.h.in. Exclude
-# files in gnulib, since they're imported.
-space_indent_files=(\.(rng|s?[ch](\.in)?|html.in|py)|(daemon|tools)/.*\.in)
-sc_TAB_in_indentation:
- @prohibit='^ * ' \
- in_vc_files='$(space_indent_files)$$' \
- halt='indent with space, not TAB, in C, sh, html, py, and RNG schemas' \
- $(_sc_search_regexp)
-
-# G_GNUC_UNUSED should only be applied in implementations, not
-# header declarations
-sc_avoid_attribute_unused_in_header:
- @prohibit='^[^#]*G_GNUC_UNUSED([^:]|$$)' \
- in_vc_files='\.h$$' \
- halt='use G_GNUC_UNUSED in .c rather than .h files' \
- $(_sc_search_regexp)
-
-# Enforce recommended preprocessor indentation style.
-sc_preprocessor_indentation:
- @if cppi --version >/dev/null 2>&1; then \
- $(VC_LIST_EXCEPT) | grep '\.[ch]$$' | xargs cppi -a -c \
- || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \
- exit 1; }; \
- else \
- echo '$(ME): skipping test $@: cppi not installed' 1>&2; \
- fi
-
-sc_copyright_format:
- @require='Copyright .*Red 'Hat', Inc\.' \
- containing='Copyright .*Red 'Hat \
- halt='Red Hat copyright is missing Inc.' \
- $(_sc_search_regexp)
- @prohibit='Copyright [^(].*Red 'Hat \
- halt='consistently use (C) in Red Hat copyright' \
- $(_sc_search_regexp)
- @prohibit='\<Red''Hat\>' \
- halt='spell Red Hat as two words' \
- $(_sc_search_regexp)
-
-# We don't use this feature of maint.mk.
-prev_version_file = /dev/null
-
-# Give credit where due:
-# Ensure that each commit author email address (possibly mapped via
-# git log's .mailmap) appears in our AUTHORS file.
-sc_check_author_list:
- @fail=0; \
- for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \
- sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_ at -]\)/\\\1/g'); \
- grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \
- || { printf '%s\n' "$$i" >&2; fail=1; }; \
- done; \
- test $$fail = 1 \
- && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \
- test $$fail = 0
-
-
-# XXX some of these tools/ programs probably ought to bindtextdomain ?
-exclude_file_name_regexp--sc_bindtextdomain = ^server/tests|common/region.c|tools/(bitmap_to_c.c|icon_to_c.c|reds_stat.c)
-
-exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch]
-
-exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = docs/.*.odt|server/tests/base_test.ppm|docs/manual/images/.*.png
-
-# XXX this should be removed & all cases fixed
-exclude_file_name_regexp--sc_prohibit_have_config_h = ^*/.*(c|cpp|h)
-
-
-exclude_file_name_regexp--sc_unmarked_diagnostics = ^.*\.(c|py|h)
-
-exclude_file_name_regexp--sc_prohibit_path_max_allocation = server/tests/test-display-base.c
-
-exclude_file_name_regexp--sc_cast_of_argument_to_free = server/red-replay-qxl.c
-
-exclude_file_name_regexp--sc_avoid_attribute_unused_in_header = server/stat.h
-
-# this contains a VALGRIND_CHECK_RULES occurrence wrapped in @ which is expected
-exclude_file_name_regexp--sc_makefile_at_at_check = server/tests/Makefile.am
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 2443ccf3..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,315 +0,0 @@
-AC_PREREQ([2.57])
-
-# Follow the libtool manual for the so version:
-# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-# - If the library source code has changed at all since the last update,
-# then increment revision (‘c:r:a’ becomes ‘c:r+1:a’).
-# - If any interfaces have been added, removed, or changed since the last update,
-# increment current, and set revision to 0.
-# - If any interfaces have been added since the last public release,
-# then increment age.
-# - If any interfaces have been removed or changed since the last public release,
-# then set age to 0.
-#
-dnl TODO see server/spice-char.h TODO comment for API breakage
-m4_define([SPICE_CURRENT], [13])
-m4_define([SPICE_REVISION], [4])
-m4_define([SPICE_AGE], [12])
-
-AC_INIT(spice, [m4_esyscmd(build-aux/git-version-gen .tarball-version)],
- [spice-devel at lists.freedesktop.org], spice)
-
-major=`echo $PACKAGE_VERSION | cut -d. -f1`
-minor=`echo $PACKAGE_VERSION | cut -d. -f2`
-micro=`echo $PACKAGE_VERSION | cut -d. -f3`
-git=`echo $PACKAGE_VERSION | cut -d. -f4`
-if test x"$git" != x ; then
- micro=$(($micro+1))
-fi
-SPICE_SERVER_VERSION=`printf "0x%02x%02x%02x" $major $minor $micro`
-AC_SUBST(SPICE_SERVER_VERSION)
-
-AC_CONFIG_MACRO_DIR([m4])
-m4_include([spice-common/m4/spice-deps.m4])
-AM_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR(.)
-
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects])
-AM_MAINTAINER_MODE
-
-AC_PROG_CC
-AC_PROG_CC_C99
-if test x"$ac_cv_prog_cc_c99" = xno; then
- AC_MSG_ERROR([C99 compiler is required.])
-fi
-AC_PROG_INSTALL
-AC_CANONICAL_HOST
-LT_INIT([disable-static])
-AM_PROG_CC_C_O
-AC_C_BIGENDIAN
-PKG_PROG_PKG_CONFIG
-
-AC_CHECK_HEADERS([sys/time.h execinfo.h linux/sockios.h pthread_np.h])
-AC_CHECK_DECL([TCP_KEEPIDLE], [have_tcp_keepidle="yes"],,
- [#include <netinet/tcp.h>])
-AS_IF([test "x$have_tcp_keepidle" = "xyes"],
- [AC_DEFINE([HAVE_TCP_KEEPIDLE],1,[Define to 1 if <netinet/tcp.h> has a TCP_KEEPIDLE definition])],
-)
-AC_FUNC_ALLOCA
-
-SPICE_LT_VERSION=m4_format("%d:%d:%d", SPICE_CURRENT, SPICE_REVISION, SPICE_AGE)
-AC_SUBST(SPICE_LT_VERSION)
-
-# Check for the CPU we are using
-case $host_cpu in
- x86_64)
- ;;
- *)
- SPICE_WARNING([spice-server on non-x86_64 architectures has not been extensively tested])
-esac
-
-dnl =========================================================================
-dnl Check optional features
-SPICE_CHECK_SMARTCARD
-SPICE_EXTRA_CHECKS
-
-AC_ARG_ENABLE(gstreamer,
- AS_HELP_STRING([--enable-gstreamer=@<:@auto/0.10/1.0/yes/no@:>@],
- [Enable GStreamer support]),,
- [enable_gstreamer="auto"])
-
-if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x0.10"; then
- SPICE_CHECK_GSTREAMER(GSTREAMER_1_0, 1.0, [gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 gstreamer-video-1.0],
- [enable_gstreamer="1.0"
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gst-plugins-base 1.0], [appsrc videoconvert appsink])
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gstreamer-libav 1.0], [avenc_mjpeg])
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gst-plugins-good 1.0], [vp8enc vp9enc])
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_1_0, [gst-plugins-ugly 1.0], [x264enc])
- ],
- [if test "x$enable_gstreamer" = "x1.0"; then
- AC_MSG_ERROR([GStreamer 1.0 support requested but not found. You may set GSTREAMER_1_0_CFLAGS and GSTREAMER_1_0_LIBS to avoid the need to call pkg-config.])
- fi
- ])
-fi
-
-if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x1.0"; then
- SPICE_CHECK_GSTREAMER(GSTREAMER_0_10, 0.10, [gstreamer-0.10 gstreamer-base-0.10 gstreamer-app-0.10 gstreamer-video-0.10],
- [enable_gstreamer="0.10"
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_0_10, [gst-plugins-base 0.10], [appsrc appsink])
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_0_10, [gstreamer-ffmpeg 0.10], [ffmpegcolorspace ffenc_mjpeg])
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_0_10, [gst-plugins-bad 0.10], [vp8enc])
- SPICE_CHECK_GSTREAMER_ELEMENTS($GST_INSPECT_0_10, [gst-plugins-ugly 0.10], [x264enc])
- ],
- [if test "x$enable_gstreamer" = "x0.10"; then
- AC_MSG_ERROR([GStreamer 0.10 support requested but not found. You may set GSTREAMER_0_10_CFLAGS and GSTREAMER_0_10_LIBS to avoid the need to call pkg-config.])
- fi
- ])
-fi
-AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer_0_10" = "xyes" || test "x$have_gstreamer_1_0" = "xyes")
-AM_CONDITIONAL(HAVE_GSTREAMER_1_0, test "x$have_gstreamer_1_0" = "xyes")
-
-AS_IF([test "x$enable_gstreamer" = "xyes"],
- [AC_MSG_ERROR("GStreamer support requested but not found")],
- [test "x$enable_gstreamer" = "xauto"],
- [enable_gstreamer="no"
-])
-AS_IF([test x"$missing_gstreamer_elements" = xyes],
- [SPICE_WARNING([The GStreamer video encoder can be built but may not work.])
-])
-
-if test "x$have_gstreamer_0_10" = "xyes" || test "x$have_gstreamer_1_0" = "xyes"; then
- PKG_CHECK_MODULES(ORC, orc-0.4)
- AC_SUBST(ORC_CFLAGS)
- AC_SUBST(ORC_LIBS)
-fi
-
-dnl Check for the presence of Valgrind and do the plumbing to allow
-dnl the running of "make check-valgrind".
-AX_VALGRIND_DFLT(memcheck, on)
-AX_VALGRIND_DFLT(helgrind, off)
-AX_VALGRIND_DFLT(drd, off)
-AX_VALGRIND_DFLT(sgcheck, off)
-
-AX_VALGRIND_CHECK
-
-SPICE_CHECK_LZ4
-SPICE_CHECK_SASL
-AM_CONDITIONAL(HAVE_SASL, test "x$have_sasl" = "xyes")
-
-dnl =========================================================================
-dnl Check deps
-
-AC_CONFIG_SUBDIRS([spice-common])
-COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/'
-COMMON_CFLAGS="$COMMON_CFLAGS -DG_LOG_DOMAIN=\\\"Spice\\\""
-AC_SUBST(COMMON_CFLAGS)
-
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-AC_CHECK_LIB(rt, clock_gettime, LIBRT="-lrt")
-AC_SUBST(LIBRT)
-
-AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" -pthread $LIBM $LIBRT"])
-
-SPICE_REQUIRES=""
-
-AS_IF([test x"$have_smartcard" = "xyes"], [
- AS_VAR_APPEND([SPICE_REQUIRES], [" libcacard >= 0.1.2"])
-])
-
-SPICE_PROTOCOL_MIN_VER=0.12.14
-PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= $SPICE_PROTOCOL_MIN_VER])
-AC_SUBST([SPICE_PROTOCOL_MIN_VER])
-
-GLIB2_REQUIRED=2.32
-GLIB2_ENCODED_VERSION="GLIB_VERSION_2_32"
-PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= $GLIB2_REQUIRED gio-2.0 >= $GLIB2_REQUIRED])
-GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB2_ENCODED_VERSION \
- -DGLIB_VERSION_MAX_ALLOWED=$GLIB2_ENCODED_VERSION"
-AS_VAR_APPEND([SPICE_REQUIRES], [" glib-2.0 >= $GLIB2_REQUIRED gio-2.0 >= $GLIB2_REQUIRED"])
-
-PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0 >= $GLIB2_REQUIRED])
-AS_VAR_APPEND([SPICE_REQUIRES], [" gobject-2.0 >= $GLIB2_REQUIRED"])
-
-#used only by tests
-PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= $GLIB2_REQUIRED])
-
-PIXMAN_REQUIRED=0.17.7
-PKG_CHECK_MODULES(PIXMAN, pixman-1 >= $PIXMAN_REQUIRED)
-AC_SUBST(PIXMAN_CFLAGS)
-AC_SUBST(PIXMAN_LIBS)
-AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN_REQUIRED"])
-
-AC_ARG_ENABLE([celt051],
- AS_HELP_STRING([--disable-celt051], [Disable celt051 audio codec (enabled by default)]),,
- [enable_celt051="yes"])
-
-if test "x$enable_celt051" = "xyes"; then
- CELT051_REQUIRED=0.5.1.1
- PKG_CHECK_MODULES(CELT051, celt051 >= $CELT051_REQUIRED,
- AS_VAR_APPEND([SPICE_REQUIRES], [" celt051 >= $CELT051_REQUIRED"]))
-fi
-
-PKG_CHECK_MODULES(SSL, openssl >= 1.0.0)
-AC_SUBST(SSL_CFLAGS)
-AC_SUBST(SSL_LIBS)
-AS_VAR_APPEND([SPICE_REQUIRES], [" openssl"])
-
-AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
- AC_MSG_CHECKING([for jpeglib.h])
- AC_TRY_CPP(
-[#include <stdio.h>
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_STDLIB_H
-#include <jpeglib.h>],
- JPEG_LIBS='-ljpeg'
- AC_MSG_RESULT($jpeg_ok),
- AC_MSG_ERROR([jpeglib.h not found])),
- AC_MSG_ERROR([libjpeg not found]))
-AC_SUBST(JPEG_LIBS)
-
-AC_CHECK_LIB(z, deflate, Z_LIBS='-lz', AC_MSG_ERROR([zlib not found]))
-AC_SUBST(Z_LIBS)
-
-
-AC_ARG_ENABLE([manual],
- AS_HELP_STRING([--enable-manual=@<:@auto/yes/no@:>@],
- [Build SPICE manual]),
- [],
- [enable_manual="auto"])
-if test "x$enable_manual" != "xno"; then
- AC_PATH_PROG([ASCIIDOC], [asciidoc])
- AS_IF([test -z "$ASCIIDOC" && test "x$enable_manual" = "xyes"],
- [AC_MSG_ERROR([asciidoc is missing and build of manual was requested])])
- AC_PATH_PROG([A2X], [a2x])
- AS_IF([test -z "$A2X" && test "x$enable_manual" = "xyes"],
- [AC_MSG_ERROR([a2x is missing and build of manual was requested])])
-fi
-AS_IF([test -n "$ASCIIDOC"], [have_asciidoc=yes], [have_asciidoc=no])
-AM_CONDITIONAL([BUILD_MANUAL], [test -n "$ASCIIDOC" || test -n "$A2X"])
-AM_CONDITIONAL([BUILD_HTML_MANUAL], [test -n "$ASCIIDOC"])
-AM_CONDITIONAL([BUILD_CHUNKED_MANUAL], [test -n "$A2X"])
-
-AC_ARG_ENABLE([statistics],
- AS_HELP_STRING([--enable-statistics=@<:@yes/no@:>@],
- [Build SPICE with statistic code enabled @<:@default=no@:>@]))
-AS_IF([test "$enable_statistics" = "yes"],
- [AC_DEFINE([RED_STATISTICS], [1], [Enable SPICE statistics])])
-
-dnl ===========================================================================
-dnl check compiler flags
-
-SPICE_COMPILE_WARNINGS
-LIBVIRT_LINKER_RELRO
-LIBVIRT_LINKER_NO_INDIRECT
-
-AC_SUBST(WARN_CFLAGS)
-
-dnl =========================================================================
-dnl -fvisibility stuff
-
-have_gcc4=no
-AC_MSG_CHECKING(for -fvisibility)
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#if defined(__GNUC__) && (__GNUC__ >= 4)
-#else
-error Need GCC 4.0 for visibility
-#endif
-int main () { return 0; }
-])], have_gcc4=yes)
-
-if test "x$have_gcc4" = "xyes" && test ! "$os_win32" = "yes" ; then
- VISIBILITY_HIDDEN_CFLAGS="-fvisibility=hidden"
-fi
-AC_MSG_RESULT($have_gcc4)
-AC_SUBST(VISIBILITY_HIDDEN_CFLAGS)
-
-dnl ensure linker supports ---version-script option before using it
-AC_CACHE_CHECK([if -Wl,--version-script works], [spice_cv_ld_version_script],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -Wl,--version-script=$srcdir/server/spice-server.syms"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
- [spice_cv_ld_version_script=yes], [spice_cv_ld_version_script=no])
- LDFLAGS="$save_LDFLAGS"])
-AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT],
- [test x"$spice_cv_ld_version_script" = xyes])
-
-AC_DEFINE([SPICE_USE_SAFER_CONTAINEROF], [1], [Enable more type safe version of SPICE_CONTAINEROF])
-
-AC_SUBST(SPICE_REQUIRES)
-AC_SUBST(SPICE_NONPKGCONFIG_CFLAGS)
-AC_SUBST(SPICE_NONPKGCONFIG_LIBS)
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_OUTPUT([
-Makefile
-spice-server.pc
-server/Makefile
-server/spice-version.h
-server/tests/Makefile
-docs/Makefile
-docs/manual/Makefile
-tools/Makefile
-])
-
-dnl ==========================================================================
-AC_MSG_NOTICE([
-
- Spice $VERSION
- ==============
-
- prefix: ${prefix}
- C compiler: ${CC}
-
- LZ4 support: ${have_lz4}
- Smartcard: ${have_smartcard}
- GStreamer: ${enable_gstreamer}
- SASL support: ${have_sasl}
- Manual: ${have_asciidoc}
-
- Now type 'make' to build $PACKAGE
-])
-SPICE_PRINT_MESSAGES
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index aa4298fd..00000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-NULL =
-ASCIIDOC_FLAGS = -a icons -a toc
-
-EXTRA_DIST = \
- meson.build \
- spice_style.html \
- spice_style.txt \
- spice_threading_model.html \
- spice_threading_model.txt \
- $(NULL)
-
-if BUILD_MANUAL
-SUBDIRS = manual
-
-all-local: spice_style.html spice_threading_model.html
-
-%.html: %.txt
- $(AM_V_GEN) $(ASCIIDOC) -n $(ASCIIDOC_FLAGS) -o $@ $<
-endif
-
-clean-local:
- rm -f spice_style.html
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
deleted file mode 100644
index bffccfd3..00000000
--- a/docs/manual/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-NULL =
-SUFFIXES = .html
-ASCIIDOC_FLAGS = -a icons -a toc
-
-EXTRA_DIST = \
- meson.build \
- images/icons/important.png \
- images/icons/note.png \
- manual.html \
- manual.chunked \
- manual.txt \
- $(NULL)
-
-.txt.html:
- $(AM_V_GEN) $(ASCIIDOC) $(ASCIIDOC_FLAGS) -o $@ $<
-
-manual.chunked: manual.txt
- $(AM_V_GEN) $(A2X) -f chunked -D $(builddir) $(ASCIIDOC_FLAGS) $<
-
-docfiles =
-if BUILD_HTML_MANUAL
-docfiles += manual.html
-endif
-if BUILD_CHUNKED_MANUAL
-docfiles += manual.chunked
-endif
-
-all-local: $(docfiles)
-
-clean-local:
- rm -f manual.html
- rm -rf manual.chunked
diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4
deleted file mode 100644
index ac62fff3..00000000
--- a/m4/ax_valgrind_check.m4
+++ /dev/null
@@ -1,235 +0,0 @@
-# ===========================================================================
-# https://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_VALGRIND_DFLT(memcheck|helgrind|drd|sgcheck, on|off)
-# AX_VALGRIND_CHECK()
-#
-# DESCRIPTION
-#
-# AX_VALGRIND_CHECK checks whether Valgrind is present and, if so, allows
-# running `make check` under a variety of Valgrind tools to check for
-# memory and threading errors.
-#
-# Defines VALGRIND_CHECK_RULES which should be substituted in your
-# Makefile; and $enable_valgrind which can be used in subsequent configure
-# output. VALGRIND_ENABLED is defined and substituted, and corresponds to
-# the value of the --enable-valgrind option, which defaults to being
-# enabled if Valgrind is installed and disabled otherwise. Individual
-# Valgrind tools can be disabled via --disable-valgrind-<tool>, the
-# default is configurable via the AX_VALGRIND_DFLT command or is to use
-# all commands not disabled via AX_VALGRIND_DFLT. All AX_VALGRIND_DFLT
-# calls must be made before the call to AX_VALGRIND_CHECK.
-#
-# If unit tests are written using a shell script and automake's
-# LOG_COMPILER system, the $(VALGRIND) variable can be used within the
-# shell scripts to enable Valgrind, as described here:
-#
-# https://www.gnu.org/software/gnulib/manual/html_node/Running-self_002dtests-under-valgrind.html
-#
-# Usage example:
-#
-# configure.ac:
-#
-# AX_VALGRIND_DFLT([sgcheck], [off])
-# AX_VALGRIND_CHECK
-#
-# Makefile.am:
-#
-# @VALGRIND_CHECK_RULES@
-# VALGRIND_SUPPRESSIONS_FILES = my-project.supp
-# EXTRA_DIST = my-project.supp
-#
-# This results in a "check-valgrind" rule being added to any Makefile.am
-# which includes "@VALGRIND_CHECK_RULES@" (assuming the module has been
-# configured with --enable-valgrind). Running `make check-valgrind` in
-# that directory will run the module's test suite (`make check`) once for
-# each of the available Valgrind tools (out of memcheck, helgrind and drd)
-# while the sgcheck will be skipped unless enabled again on the
-# commandline with --enable-valgrind-sgcheck. The results for each check
-# will be output to test-suite-$toolname.log. The target will succeed if
-# there are zero errors and fail otherwise.
-#
-# Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in
-# memcheck, helgrind, drd and sgcheck. These are useful because often only
-# some of those tools can be ran cleanly on a codebase.
-#
-# The macro supports running with and without libtool.
-#
-# LICENSE
-#
-# Copyright (c) 2014, 2015, 2016 Philip Withnall <philip.withnall at collabora.co.uk>
-#
-# 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. This file is offered as-is, without any
-# warranty.
-
-#serial 15
-
-dnl Configured tools
-m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]])
-m4_set_add_all([valgrind_exp_tool_set], [sgcheck])
-m4_foreach([vgtool], [valgrind_tool_list],
- [m4_define([en_dflt_valgrind_]vgtool, [on])])
-
-AC_DEFUN([AX_VALGRIND_DFLT],[
- m4_define([en_dflt_valgrind_$1], [$2])
-])dnl
-
-AC_DEFUN([AX_VALGRIND_CHECK],[
- dnl Check for --enable-valgrind
- AC_ARG_ENABLE([valgrind],
- [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])],
- [enable_valgrind=$enableval],[enable_valgrind=])
-
- AS_IF([test "$enable_valgrind" != "no"],[
- # Check for Valgrind.
- AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind])
- AS_IF([test "$VALGRIND" = ""],[
- AS_IF([test "$enable_valgrind" = "yes"],[
- AC_MSG_ERROR([Could not find valgrind; either install it or reconfigure with --disable-valgrind])
- ],[
- enable_valgrind=no
- ])
- ],[
- enable_valgrind=yes
- ])
- ])
-
- AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
- AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind])
-
- # Check for Valgrind tools we care about.
- [valgrind_enabled_tools=]
- m4_foreach([vgtool],[valgrind_tool_list],[
- AC_ARG_ENABLE([valgrind-]vgtool,
- m4_if(m4_defn([en_dflt_valgrind_]vgtool),[off],dnl
-[AS_HELP_STRING([--enable-valgrind-]vgtool, [Whether to use ]vgtool[ during the Valgrind tests])],dnl
-[AS_HELP_STRING([--disable-valgrind-]vgtool, [Whether to skip ]vgtool[ during the Valgrind tests])]),
- [enable_valgrind_]vgtool[=$enableval],
- [enable_valgrind_]vgtool[=])
- AS_IF([test "$enable_valgrind" = "no"],[
- enable_valgrind_]vgtool[=no],
- [test "$enable_valgrind_]vgtool[" ]dnl
-m4_if(m4_defn([en_dflt_valgrind_]vgtool), [off], [= "yes"], [!= "no"]),[
- AC_CACHE_CHECK([for Valgrind tool ]vgtool,
- [ax_cv_valgrind_tool_]vgtool,[
- ax_cv_valgrind_tool_]vgtool[=no
- m4_set_contains([valgrind_exp_tool_set],vgtool,
- [m4_define([vgtoolx],[exp-]vgtool)],
- [m4_define([vgtoolx],vgtool)])
- AS_IF([`$VALGRIND --tool=]vgtoolx[ --help >/dev/null 2>&1`],[
- ax_cv_valgrind_tool_]vgtool[=yes
- ])
- ])
- AS_IF([test "$ax_cv_valgrind_tool_]vgtool[" = "no"],[
- AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[
- AC_MSG_ERROR([Valgrind does not support ]vgtool[; reconfigure with --disable-valgrind-]vgtool)
- ],[
- enable_valgrind_]vgtool[=no
- ])
- ],[
- enable_valgrind_]vgtool[=yes
- ])
- ])
- AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[
- valgrind_enabled_tools="$valgrind_enabled_tools ]m4_bpatsubst(vgtool,[^exp-])["
- ])
- AC_SUBST([ENABLE_VALGRIND_]vgtool,[$enable_valgrind_]vgtool)
- ])
- AC_SUBST([valgrind_tools],["]m4_join([ ], valgrind_tool_list)["])
- AC_SUBST([valgrind_enabled_tools],[$valgrind_enabled_tools])
-
-[VALGRIND_CHECK_RULES='
-# Valgrind check
-#
-# Optional:
-# - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions
-# files to load. (Default: empty)
-# - VALGRIND_FLAGS: General flags to pass to all Valgrind tools.
-# (Default: --num-callers=30)
-# - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of:
-# memcheck, helgrind, drd, sgcheck). (Default: various)
-
-# Optional variables
-VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES))
-VALGRIND_FLAGS ?= --num-callers=30
-VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no
-VALGRIND_helgrind_FLAGS ?= --history-level=approx
-VALGRIND_drd_FLAGS ?=
-VALGRIND_sgcheck_FLAGS ?=
-
-# Internal use
-valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
-
-valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
-valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS)
-valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS)
-valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
-
-valgrind_quiet = $(valgrind_quiet_$(V))
-valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
-valgrind_quiet_0 = --quiet
-valgrind_v_use = $(valgrind_v_use_$(V))
-valgrind_v_use_ = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY))
-valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%,%,$''@):;
-
-# Support running with and without libtool.
-ifneq ($(LIBTOOL),)
-valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute
-else
-valgrind_lt =
-endif
-
-# Use recursive makes in order to ignore errors during check
-check-valgrind:
-ifeq ($(VALGRIND_ENABLED),yes)
- $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \
- $(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool))
-else
- @echo "Need to reconfigure with --enable-valgrind"
-endif
-
-# Valgrind running
-VALGRIND_TESTS_ENVIRONMENT = \
- $(TESTS_ENVIRONMENT) \
- env VALGRIND=$(VALGRIND) \
- G_SLICE=always-malloc,debug-blocks \
- G_DEBUG=$${G_DEBUG:+$$G_DEBUG,}gc-friendly
-
-VALGRIND_LOG_COMPILER = \
- $(valgrind_lt) \
- $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
-
-define valgrind_tool_rule =
-check-valgrind-$(1):
-ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes)
- $$(valgrind_v_use)$$(MAKE) check-TESTS \
- TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \
- LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \
- LOG_FLAGS="$$(valgrind_$(1)_flags)" \
- TEST_SUITE_LOG=test-suite-$(1).log
-else ifeq ($$(VALGRIND_ENABLED),yes)
- @echo "Need to reconfigure with --enable-valgrind-$(1)"
-else
- @echo "Need to reconfigure with --enable-valgrind"
-endif
-endef
-
-$(foreach tool,$(valgrind_tools),$(eval $(call valgrind_tool_rule,$(tool))))
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
-
-MOSTLYCLEANFILES ?=
-MOSTLYCLEANFILES += $(valgrind_log_files)
-
-.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools))
-']
-
- AC_SUBST([VALGRIND_CHECK_RULES])
- m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])])
-])
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
deleted file mode 100644
index 4f701f4e..00000000
--- a/m4/manywarnings.m4
+++ /dev/null
@@ -1,276 +0,0 @@
-# manywarnings.m4 serial 8
-dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Simon Josefsson
-
-# gl_MANYWARN_COMPLEMENT(OUTVAR, LISTVAR, REMOVEVAR)
-# --------------------------------------------------
-# Copy LISTVAR to OUTVAR except for the entries in REMOVEVAR.
-# Elements separated by whitespace. In set logic terms, the function
-# does OUTVAR = LISTVAR \ REMOVEVAR.
-AC_DEFUN([gl_MANYWARN_COMPLEMENT],
-[
- gl_warn_set=
- set x $2; shift
- for gl_warn_item
- do
- case " $3 " in
- *" $gl_warn_item "*)
- ;;
- *)
- gl_warn_set="$gl_warn_set $gl_warn_item"
- ;;
- esac
- done
- $1=$gl_warn_set
-])
-
-# gl_MANYWARN_ALL_GCC(VARIABLE)
-# -----------------------------
-# Add all documented GCC warning parameters to variable VARIABLE.
-# Note that you need to test them using gl_WARN_ADD if you want to
-# make sure your gcc understands it.
-AC_DEFUN([gl_MANYWARN_ALL_GCC],
-[
- dnl First, check for some issues that only occur when combining multiple
- dnl gcc warning categories.
- AC_REQUIRE([AC_PROG_CC])
- if test -n "$GCC"; then
-
- dnl Check if -W -Werror -Wno-missing-field-initializers is supported
- dnl with the current $CC $CFLAGS $CPPFLAGS.
- AC_MSG_CHECKING([whether -Wno-missing-field-initializers is supported])
- AC_CACHE_VAL([gl_cv_cc_nomfi_supported], [
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[]], [[]])],
- [gl_cv_cc_nomfi_supported=yes],
- [gl_cv_cc_nomfi_supported=no])
- CFLAGS="$gl_save_CFLAGS"])
- AC_MSG_RESULT([$gl_cv_cc_nomfi_supported])
-
- if test "$gl_cv_cc_nomfi_supported" = yes; then
- dnl Now check whether -Wno-missing-field-initializers is needed
- dnl for the { 0, } construct.
- AC_MSG_CHECKING([whether -Wno-missing-field-initializers is needed])
- AC_CACHE_VAL([gl_cv_cc_nomfi_needed], [
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -W -Werror"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[int f (void)
- {
- typedef struct { int a; int b; } s_t;
- s_t s1 = { 0, };
- return s1.b;
- }
- ]],
- [[]])],
- [gl_cv_cc_nomfi_needed=no],
- [gl_cv_cc_nomfi_needed=yes])
- CFLAGS="$gl_save_CFLAGS"
- ])
- AC_MSG_RESULT([$gl_cv_cc_nomfi_needed])
- fi
-
- dnl Next, check if -Werror -Wuninitialized is useful with the
- dnl user's choice of $CFLAGS; some versions of gcc warn that it
- dnl has no effect if -O is not also used
- AC_MSG_CHECKING([whether -Wuninitialized is supported])
- AC_CACHE_VAL([gl_cv_cc_uninitialized_supported], [
- gl_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Werror -Wuninitialized"
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[]], [[]])],
- [gl_cv_cc_uninitialized_supported=yes],
- [gl_cv_cc_uninitialized_supported=no])
- CFLAGS="$gl_save_CFLAGS"])
- AC_MSG_RESULT([$gl_cv_cc_uninitialized_supported])
-
- fi
-
- # List all gcc warning categories.
- # To compare this list to your installed GCC's, run this Bash command:
- #
- # comm -3 \
- # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \
- # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort |
- # grep -v -x -f <(
- # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec))
-
- gl_manywarn_set=
- for gl_manywarn_item in \
- -fno-common \
- -W \
- -Wabi \
- -Waddress \
- -Waggressive-loop-optimizations \
- -Wall \
- -Wattributes \
- -Wbad-function-cast \
- -Wbool-compare \
- -Wbuiltin-macro-redefined \
- -Wcast-align \
- -Wchar-subscripts \
- -Wchkp \
- -Wclobbered \
- -Wcomment \
- -Wcomments \
- -Wcoverage-mismatch \
- -Wcpp \
- -Wdate-time \
- -Wdeprecated \
- -Wdeprecated-declarations \
- -Wdesignated-init \
- -Wdisabled-optimization \
- -Wdiscarded-array-qualifiers \
- -Wdiscarded-qualifiers \
- -Wdiv-by-zero \
- -Wdouble-promotion \
- -Wduplicated-cond \
- -Wempty-body \
- -Wendif-labels \
- -Wenum-compare \
- -Wextra \
- -Wformat-contains-nul \
- -Wformat-extra-args \
- -Wformat-nonliteral \
- -Wformat-security \
- -Wformat-signedness \
- -Wformat-y2k \
- -Wformat-zero-length \
- -Wframe-address \
- -Wfree-nonheap-object \
- -Whsa \
- -Wignored-attributes \
- -Wignored-qualifiers \
- -Wimplicit \
- -Wimplicit-function-declaration \
- -Wimplicit-int \
- -Wincompatible-pointer-types \
- -Winit-self \
- -Winline \
- -Wint-conversion \
- -Wint-to-pointer-cast \
- -Winvalid-memory-model \
- -Winvalid-pch \
- -Wjump-misses-init \
- -Wlogical-not-parentheses \
- -Wlogical-op \
- -Wmain \
- -Wmaybe-uninitialized \
- -Wmemset-transposed-args \
- -Wmisleading-indentation \
- -Wmissing-braces \
- -Wmissing-declarations \
- -Wmissing-field-initializers \
- -Wmissing-include-dirs \
- -Wmissing-parameter-type \
- -Wmissing-prototypes \
- -Wmultichar \
- -Wnarrowing \
- -Wnested-externs \
- -Wnonnull \
- -Wnonnull-compare \
- -Wnull-dereference \
- -Wodr \
- -Wold-style-declaration \
- -Wold-style-definition \
- -Wopenmp-simd \
- -Woverflow \
- -Woverlength-strings \
- -Woverride-init \
- -Wpacked \
- -Wpacked-bitfield-compat \
- -Wparentheses \
- -Wpointer-arith \
- -Wpointer-sign \
- -Wpointer-to-int-cast \
- -Wpragmas \
- -Wreturn-local-addr \
- -Wreturn-type \
- -Wscalar-storage-order \
- -Wsequence-point \
- -Wshadow \
- -Wshift-count-negative \
- -Wshift-count-overflow \
- -Wshift-negative-value \
- -Wsizeof-array-argument \
- -Wsizeof-pointer-memaccess \
- -Wstack-protector \
- -Wstrict-aliasing \
- -Wstrict-overflow \
- -Wstrict-prototypes \
- -Wsuggest-attribute=const \
- -Wsuggest-attribute=format \
- -Wsuggest-attribute=noreturn \
- -Wsuggest-attribute=pure \
- -Wsuggest-final-methods \
- -Wsuggest-final-types \
- -Wswitch \
- -Wswitch-bool \
- -Wswitch-default \
- -Wsync-nand \
- -Wsystem-headers \
- -Wtautological-compare \
- -Wtrampolines \
- -Wtrigraphs \
- -Wtype-limits \
- -Wuninitialized \
- -Wunknown-pragmas \
- -Wunsafe-loop-optimizations \
- -Wunused \
- -Wunused-but-set-parameter \
- -Wunused-but-set-variable \
- -Wunused-function \
- -Wunused-label \
- -Wunused-local-typedefs \
- -Wunused-macros \
- -Wunused-parameter \
- -Wunused-result \
- -Wunused-value \
- -Wunused-variable \
- -Wvarargs \
- -Wvariadic-macros \
- -Wvector-operation-performance \
- -Wvla \
- -Wvolatile-register-var \
- -Wwrite-strings \
- \
- ; do
- gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
- done
-
- # gcc --help=warnings outputs an unusual form for these options; list
- # them here so that the above 'comm' command doesn't report a false match.
- gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2"
- gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc"
- gl_manywarn_set="$gl_manywarn_set -Wshift-overflow=2"
- gl_manywarn_set="$gl_manywarn_set -Wunused-const-variable=2"
-
- # These are needed for older GCC versions.
- if test -n "$GCC"; then
- case `($CC --version) 2>/dev/null` in
- 'gcc (GCC) '[[0-3]].* | \
- 'gcc (GCC) '4.[[0-7]].*)
- gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option"
- gl_manywarn_set="$gl_manywarn_set -funit-at-a-time"
- ;;
- esac
- fi
-
- # Disable specific options as needed.
- if test "$gl_cv_cc_nomfi_needed" = yes; then
- gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers"
- fi
-
- if test "$gl_cv_cc_uninitialized_supported" = no; then
- gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized"
- fi
-
- $1=$gl_manywarn_set
-])
diff --git a/m4/spice-compile-warnings.m4 b/m4/spice-compile-warnings.m4
deleted file mode 100644
index 5a601209..00000000
--- a/m4/spice-compile-warnings.m4
+++ /dev/null
@@ -1,143 +0,0 @@
-dnl
-dnl Enable all known GCC compiler warnings, except for those
-dnl we can't yet cope with
-dnl
-AC_DEFUN([SPICE_COMPILE_WARNINGS],[
- dnl ******************************
- dnl More compiler warnings
- dnl ******************************
-
- AC_ARG_ENABLE([werror],
- AS_HELP_STRING([--enable-werror], [Use -Werror (if supported)]),
- [set_werror="$enableval"],
- [if test -d $srcdir/.git; then
- is_git_version=true
- set_werror=yes
- else
- set_werror=no
- fi])
-
- # List of warnings that are not relevant / wanted
-
- # Don't care about C++ compiler compat
- dontwarn="$dontwarn -Wc++-compat"
- dontwarn="$dontwarn -Wabi"
- dontwarn="$dontwarn -Wdeprecated"
- # For older gcc versions, -Wenum-compare is "C++ and Objective-C++ only"
- # For newer gcc versions, -Wenum-compare is "enabled by -Wall"
- dontwarn="$dontwarn -Wenum-compare"
- # Don't care about ancient C standard compat
- dontwarn="$dontwarn -Wtraditional"
- # Don't care about ancient C standard compat
- dontwarn="$dontwarn -Wtraditional-conversion"
- # Ignore warnings in /usr/include
- dontwarn="$dontwarn -Wsystem-headers"
- # Happy for compiler to add struct padding
- dontwarn="$dontwarn -Wpadded"
- # GCC very confused with -O2
- dontwarn="$dontwarn -Wunreachable-code"
-
-
- dontwarn="$dontwarn -Wconversion"
- dontwarn="$dontwarn -Wsign-conversion"
- dontwarn="$dontwarn -Wvla"
- dontwarn="$dontwarn -Wundef"
- dontwarn="$dontwarn -Wcast-qual"
- dontwarn="$dontwarn -Wlong-long"
- dontwarn="$dontwarn -Wswitch-default"
- dontwarn="$dontwarn -Wswitch-enum"
- dontwarn="$dontwarn -Wstrict-overflow"
- dontwarn="$dontwarn -Wunsafe-loop-optimizations"
- dontwarn="$dontwarn -Wformat-nonliteral"
- dontwarn="$dontwarn -Wfloat-equal"
- dontwarn="$dontwarn -Wdeclaration-after-statement"
- dontwarn="$dontwarn -Wcast-qual"
- dontwarn="$dontwarn -Wconversion"
- dontwarn="$dontwarn -Wsign-conversion"
- dontwarn="$dontwarn -Wpacked"
- dontwarn="$dontwarn -Wunused-macros"
- dontwarn="$dontwarn -Woverlength-strings"
- dontwarn="$dontwarn -Wstack-protector"
- dontwarn="$dontwarn -Winline"
- dontwarn="$dontwarn -Wbad-function-cast"
- dontwarn="$dontwarn -Wshadow"
- dontwarn="$dontwarn -Wformat-signedness"
- dontwarn="$dontwarn -Wnull-dereference"
-
- # This causes an error to be detected in glib headers
- dontwarn="$dontwarn -Wshift-overflow=2"
-
- # We want to enable these, but need to sort out the
- # decl mess with gtk/generated_*.c
- dontwarn="$dontwarn -Wmissing-declarations"
-
- # Get all possible GCC warnings
- gl_MANYWARN_ALL_GCC([maybewarn])
-
- # Remove the ones we don't want, blacklisted earlier
- gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn])
-
- # Check for $CC support of each warning
- for w in $wantwarn; do
- gl_WARN_ADD([$w])
- done
-
- # GNULIB uses '-W' (aka -Wextra) which includes a bunch of stuff.
- # Unfortunately, this means you can't simply use '-Wsign-compare'
- # with gl_MANYWARN_COMPLEMENT
- # So we have -W enabled, and then have to explicitly turn off...
- gl_WARN_ADD([-Wno-sign-compare])
- gl_WARN_ADD([-Wno-unused-parameter])
- # We can't enable this due to horrible spice_usb_device_get_description
- # signature
- gl_WARN_ADD([-Wno-format-nonliteral])
-
- # This should be < 1024 really. pixman_utils is the blackspot
- # preventing lower usage
- gl_WARN_ADD([-Wframe-larger-than=20460])
-
- # Use improved glibc headers
- AH_VERBATIM([FORTIFY_SOURCE],
- [/* Enable compile-time and run-time bounds-checking, and some warnings. */
-#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
-# define _FORTIFY_SOURCE 2
-#endif
-])
-
- # Extra special flags
- dnl -fstack-protector stuff passes gl_WARN_ADD with gcc
- dnl on Mingw32, but fails when actually used
- case $host in
- *-*-linux*)
- dnl Fedora only uses -fstack-protector, but doesn't seem to
- dnl be great overhead in adding -fstack-protector-all instead
- dnl gl_WARN_ADD([-fstack-protector])
- gl_WARN_ADD([-fstack-protector-all])
- gl_WARN_ADD([--param=ssp-buffer-size=4])
- ;;
- esac
- gl_WARN_ADD([-fexceptions])
- gl_WARN_ADD([-fasynchronous-unwind-tables])
- gl_WARN_ADD([-fdiagnostics-show-option])
- gl_WARN_ADD([-funit-at-a-time])
-
- # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure
- # fire even without -O.
- gl_WARN_ADD([-fipa-pure-const])
-
- # We should eventually enable this, but right now there are at
- # least 75 functions triggering warnings.
- gl_WARN_ADD([-Wno-suggest-attribute=pure])
- gl_WARN_ADD([-Wno-suggest-attribute=const])
-
- if test "$set_werror" = "yes"
- then
- gl_WARN_ADD([-Werror])
- fi
- WARN_CXXFLAGS=$WARN_CFLAGS
- AC_SUBST([WARN_CXXFLAGS])
-
- WARN_LDFLAGS=$WARN_CFLAGS
- AC_SUBST([WARN_CFLAGS])
- AC_SUBST([WARN_LDFLAGS])
-])
diff --git a/m4/virt-linker-no-indirect.m4 b/m4/virt-linker-no-indirect.m4
deleted file mode 100644
index b344f708..00000000
--- a/m4/virt-linker-no-indirect.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl
-dnl Check for --no-copy-dt-needed-entries
-dnl
-dnl Copyright (C) 2013 Guido Günther <agx at sigxcpu.org>
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library. If not, see
-dnl <http://www.gnu.org/licenses/>.
-dnl
-
-AC_DEFUN([LIBVIRT_LINKER_NO_INDIRECT],[
- AC_MSG_CHECKING([for how to avoid indirect lib deps])
-
- NO_INDIRECT_LDFLAGS=
- case `$LD --help 2>&1` in
- *"--no-copy-dt-needed-entries"*)
- NO_INDIRECT_LDFLAGS="-Wl,--no-copy-dt-needed-entries" ;;
- esac
- AC_SUBST([NO_INDIRECT_LDFLAGS])
-
- AC_MSG_RESULT([$NO_INDIRECT_LDFLAGS])
-])
diff --git a/m4/virt-linker-relro.m4 b/m4/virt-linker-relro.m4
deleted file mode 100644
index 079a095f..00000000
--- a/m4/virt-linker-relro.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-dnl
-dnl Check for -z now and -z relro linker flags
-dnl
-dnl Copyright (C) 2013 Red Hat, Inc.
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library. If not, see
-dnl <http://www.gnu.org/licenses/>.
-dnl
-
-AC_DEFUN([LIBVIRT_LINKER_RELRO],[
- AC_MSG_CHECKING([for how to force completely read-only GOT table])
-
- RELRO_LDFLAGS=
- ld_help=`$LD --help 2>&1`
- case $ld_help in
- *"-z relro"*) RELRO_LDFLAGS="-Wl,-z -Wl,relro" ;;
- esac
- case $ld_help in
- *"-z now"*) RELRO_LDFLAGS="$RELRO_LDFLAGS -Wl,-z -Wl,now" ;;
- esac
- AC_SUBST([RELRO_LDFLAGS])
-
- AC_MSG_RESULT([$RELRO_LDFLAGS])
-])
diff --git a/m4/warnings.m4 b/m4/warnings.m4
deleted file mode 100644
index e3d239b6..00000000
--- a/m4/warnings.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# warnings.m4 serial 11
-dnl Copyright (C) 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Simon Josefsson
-
-# gl_AS_VAR_APPEND(VAR, VALUE)
-# ----------------------------
-# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it.
-m4_ifdef([AS_VAR_APPEND],
-[m4_copy([AS_VAR_APPEND], [gl_AS_VAR_APPEND])],
-[m4_define([gl_AS_VAR_APPEND],
-[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])])
-
-
-# gl_COMPILER_OPTION_IF(OPTION, [IF-SUPPORTED], [IF-NOT-SUPPORTED],
-# [PROGRAM = AC_LANG_PROGRAM()])
-# -----------------------------------------------------------------
-# Check if the compiler supports OPTION when compiling PROGRAM.
-#
-# FIXME: gl_Warn must be used unquoted until we can assume Autoconf
-# 2.64 or newer.
-AC_DEFUN([gl_COMPILER_OPTION_IF],
-[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl
-AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl
-AS_LITERAL_IF([$1],
- [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))],
- [gl_positive="$1"
-case $gl_positive in
- -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
-esac
-m4_pushdef([gl_Positive], [$gl_positive])])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [
- gl_save_compiler_FLAGS="$gl_Flags"
- gl_AS_VAR_APPEND(m4_defn([gl_Flags]),
- [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["])
- AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
- [AS_VAR_SET(gl_Warn, [yes])],
- [AS_VAR_SET(gl_Warn, [no])])
- gl_Flags="$gl_save_compiler_FLAGS"
-])
-AS_VAR_IF(gl_Warn, [yes], [$2], [$3])
-m4_popdef([gl_Positive])dnl
-AS_VAR_POPDEF([gl_Flags])dnl
-AS_VAR_POPDEF([gl_Warn])dnl
-])
-
-# gl_UNKNOWN_WARNINGS_ARE_ERRORS
-# ------------------------------
-# Clang doesn't complain about unknown warning options unless one also
-# specifies -Wunknown-warning-option -Werror. Detect this.
-AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS],
-[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option],
- [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'],
- [gl_unknown_warnings_are_errors=])])
-
-# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS],
-# [PROGRAM = AC_LANG_PROGRAM()])
-# ---------------------------------------------
-# Adds parameter to WARN_CFLAGS if the compiler supports it when
-# compiling PROGRAM. For example, gl_WARN_ADD([-Wparentheses]).
-#
-# If VARIABLE is a variable name, AC_SUBST it.
-AC_DEFUN([gl_WARN_ADD],
-[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS])
-gl_COMPILER_OPTION_IF([$1],
- [gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])],
- [],
- [$3])
-m4_ifval([$2],
- [AS_LITERAL_IF([$2], [AC_SUBST([$2])])],
- [AC_SUBST([WARN_CFLAGS])])dnl
-])
-
-# Local Variables:
-# mode: autoconf
-# End:
diff --git a/maint.mk b/maint.mk
deleted file mode 100644
index c32f8b6d..00000000
--- a/maint.mk
+++ /dev/null
@@ -1,1670 +0,0 @@
-# -*-Makefile-*-
-# This Makefile fragment tries to be general-purpose enough to be
-# used by many projects via the gnulib maintainer-makefile module.
-
-## Copyright (C) 2001-2016 Free Software Foundation, Inc.
-##
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# This is reported not to work with make-3.79.1
-# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-ME := maint.mk
-
-# Helper variables.
-_empty =
-_sp = $(_empty) $(_empty)
-
-# _equal,S1,S2
-# ------------
-# If S1 == S2, return S1, otherwise the empty string.
-_equal = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
-
-# member-check,VARIABLE,VALID-VALUES
-# ----------------------------------
-# Check that $(VARIABLE) is in the space-separated list of VALID-VALUES, and
-# return it. Die otherwise.
-member-check = \
- $(strip \
- $(if $($(1)), \
- $(if $(findstring $(_sp),$($(1))), \
- $(error invalid $(1): '$($(1))', expected $(2)), \
- $(or $(findstring $(_sp)$($(1))$(_sp),$(_sp)$(2)$(_sp)), \
- $(error invalid $(1): '$($(1))', expected $(2)))), \
- $(error $(1) undefined)))
-
-# Do not save the original name or timestamp in the .tar.gz file.
-# Use --rsyncable if available.
-gzip_rsyncable := \
- $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null \
- && printf %s --rsyncable)
-GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
-
-GIT = git
-VC = $(GIT)
-
-VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir)
-
-# You can override this variable in cfg.mk to set your own regexp
-# matching files to ignore.
-VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$
-
-# This is to preprocess robustly the output of $(VC_LIST), so that even
-# when $(srcdir) is a pathological name like "....", the leading sed command
-# removes only the intended prefix.
-_dot_escaped_srcdir = $(subst .,\.,$(srcdir))
-
-# Post-process $(VC_LIST) output, prepending $(srcdir)/, but only
-# when $(srcdir) is not ".".
-ifeq ($(srcdir),.)
- _prepend_srcdir_prefix =
-else
- _prepend_srcdir_prefix = | $(SED) 's|^|$(srcdir)/|'
-endif
-
-# In order to be able to consistently filter "."-relative names,
-# (i.e., with no $(srcdir) prefix), this definition is careful to
-# remove any $(srcdir) prefix, and to restore what it removes.
-_sc_excl = \
- $(or $(exclude_file_name_regexp--$@),^$$)
-VC_LIST_EXCEPT = \
- $(VC_LIST) | $(SED) 's|^$(_dot_escaped_srcdir)/||' \
- | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
- else grep -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
- | grep -Ev -e '($(VC_LIST_ALWAYS_EXCLUDE_REGEX)|$(_sc_excl))' \
- $(_prepend_srcdir_prefix)
-
-ifeq ($(origin prev_version_file), undefined)
- prev_version_file = $(srcdir)/.prev-version
-endif
-
-PREV_VERSION := $(shell cat $(prev_version_file) 2>/dev/null)
-VERSION_REGEXP = $(subst .,\.,$(VERSION))
-PREV_VERSION_REGEXP = $(subst .,\.,$(PREV_VERSION))
-
-ifeq ($(VC),$(GIT))
- this-vc-tag = v$(VERSION)
- this-vc-tag-regexp = v$(VERSION_REGEXP)
-else
- tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
- tag-this-version = $(subst .,_,$(VERSION))
- this-vc-tag = $(tag-package)-$(tag-this-version)
- this-vc-tag-regexp = $(this-vc-tag)
-endif
-my_distdir = $(PACKAGE)-$(VERSION)
-
-# Old releases are stored here.
-release_archive_dir ?= ../release
-
-# If RELEASE_TYPE is undefined, but RELEASE is, use its second word.
-# But overwrite VERSION.
-ifdef RELEASE
- VERSION := $(word 1, $(RELEASE))
- RELEASE_TYPE ?= $(word 2, $(RELEASE))
-endif
-
-# Validate and return $(RELEASE_TYPE), or die.
-RELEASE_TYPES = alpha beta stable
-release-type = $(call member-check,RELEASE_TYPE,$(RELEASE_TYPES))
-
-# Override gnu_rel_host and url_dir_list in cfg.mk if these are not right.
-# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for stable releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-stable = ftp.gnu.org
-gnu_rel_host ?= $(gnu_ftp_host-$(release-type))
-
-url_dir_list ?= $(if $(call _equal,$(gnu_rel_host),ftp.gnu.org), \
- http://ftpmirror.gnu.org/$(PACKAGE), \
- ftp://$(gnu_rel_host)/gnu/$(PACKAGE))
-
-# Override this in cfg.mk if you are using a different format in your
-# NEWS file.
-today = $(shell date +%Y-%m-%d)
-
-# Select which lines of NEWS are searched for $(news-check-regexp).
-# This is a sed line number spec. The default says that we search
-# lines 1..10 of NEWS for $(news-check-regexp).
-# If you want to search only line 3 or only lines 20-22, use "3" or "20,22".
-news-check-lines-spec ?= 1,10
-news-check-regexp ?= '^\*.* $(VERSION_REGEXP) \($(today)\)'
-
-# Prevent programs like 'sort' from considering distinct strings to be equal.
-# Doing it here saves us from having to set LC_ALL elsewhere in this file.
-export LC_ALL = C
-
-## --------------- ##
-## Sanity checks. ##
-## --------------- ##
-
-ifneq ($(_gl-Makefile),)
-_cfg_mk := $(wildcard $(srcdir)/cfg.mk)
-
-# Collect the names of rules starting with 'sc_'.
-syntax-check-rules := $(sort $(shell $(SED) -n \
- 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' $(srcdir)/$(ME) $(_cfg_mk)))
-.PHONY: $(syntax-check-rules)
-
-ifeq ($(shell $(VC_LIST) >/dev/null 2>&1; echo $$?),0)
- local-checks-available += $(syntax-check-rules)
-else
- local-checks-available += no-vc-detected
-no-vc-detected:
- @echo "No version control files detected; skipping syntax check"
-endif
-.PHONY: $(local-checks-available)
-
-# Arrange to print the name of each syntax-checking rule just before running it.
-$(syntax-check-rules): %: %.m
-sc_m_rules_ = $(patsubst %, %.m, $(syntax-check-rules))
-.PHONY: $(sc_m_rules_)
-$(sc_m_rules_):
- @echo $(patsubst sc_%.m, %, $@)
- @date +%s.%N > .sc-start-$(basename $@)
-
-# Compute and print the elapsed time for each syntax-check rule.
-sc_z_rules_ = $(patsubst %, %.z, $(syntax-check-rules))
-.PHONY: $(sc_z_rules_)
-$(sc_z_rules_): %.z: %
- @end=$$(date +%s.%N); \
- start=$$(cat .sc-start-$*); \
- rm -f .sc-start-$*; \
- awk -v s=$$start -v e=$$end \
- 'END {printf "%.2f $(patsubst sc_%,%,$*)\n", e - s}' < /dev/null
-
-# The patsubst here is to replace each sc_% rule with its sc_%.z wrapper
-# that computes and prints elapsed time.
-local-check := \
- $(patsubst sc_%, sc_%.z, \
- $(filter-out $(local-checks-to-skip), $(local-checks-available)))
-
-syntax-check: $(local-check)
-endif
-
-# _sc_search_regexp
-#
-# This macro searches for a given construct in the selected files and
-# then takes some action.
-#
-# Parameters (shell variables):
-#
-# prohibit | require
-#
-# Regular expression (ERE) denoting either a forbidden construct
-# or a required construct. Those arguments are exclusive.
-#
-# exclude
-#
-# Regular expression (ERE) denoting lines to ignore that matched
-# a prohibit construct. For example, this can be used to exclude
-# comments that mention why the nearby code uses an alternative
-# construct instead of the simpler prohibited construct.
-#
-# in_vc_files | in_files
-#
-# grep-E-style regexp selecting the files to check. For in_vc_files,
-# the regexp is used to select matching files from the list of all
-# version-controlled files; for in_files, it's from the names printed
-# by "find $(srcdir)". When neither is specified, use all files that
-# are under version control.
-#
-# containing | non_containing
-#
-# Select the files (non) containing strings matching this regexp.
-# If both arguments are specified then CONTAINING takes
-# precedence.
-#
-# with_grep_options
-#
-# Extra options for grep.
-#
-# ignore_case
-#
-# Ignore case.
-#
-# halt
-#
-# Message to display before to halting execution.
-#
-# Finally, you may exempt files based on an ERE matching file names.
-# For example, to exempt from the sc_space_tab check all files with the
-# .diff suffix, set this Make variable:
-#
-# exclude_file_name_regexp--sc_space_tab = \.diff$
-#
-# Note that while this functionality is mostly inherited via VC_LIST_EXCEPT,
-# when filtering by name via in_files, we explicitly filter out matching
-# names here as well.
-
-# Initialize each, so that envvar settings cannot interfere.
-export require =
-export prohibit =
-export exclude =
-export in_vc_files =
-export in_files =
-export containing =
-export non_containing =
-export halt =
-export with_grep_options =
-
-# By default, _sc_search_regexp does not ignore case.
-export ignore_case =
-_ignore_case = $$(test -n "$$ignore_case" && printf %s -i || :)
-
-define _sc_say_and_exit
- dummy=; : so we do not need a semicolon before each use; \
- { printf '%s\n' "$(ME): $$msg" 1>&2; exit 1; };
-endef
-
-define _sc_search_regexp
- dummy=; : so we do not need a semicolon before each use; \
- \
- : Check arguments; \
- test -n "$$prohibit" && test -n "$$require" \
- && { msg='Cannot specify both prohibit and require' \
- $(_sc_say_and_exit) } || :; \
- test -z "$$prohibit" && test -z "$$require" \
- && { msg='Should specify either prohibit or require' \
- $(_sc_say_and_exit) } || :; \
- test -z "$$prohibit" && test -n "$$exclude" \
- && { msg='Use of exclude requires a prohibit pattern' \
- $(_sc_say_and_exit) } || :; \
- test -n "$$in_vc_files" && test -n "$$in_files" \
- && { msg='Cannot specify both in_vc_files and in_files' \
- $(_sc_say_and_exit) } || :; \
- test "x$$halt" != x \
- || { msg='halt not defined' $(_sc_say_and_exit) }; \
- \
- : Filter by file name; \
- if test -n "$$in_files"; then \
- files=$$(find $(srcdir) | grep -E "$$in_files" \
- | grep -Ev '$(_sc_excl)'); \
- else \
- files=$$($(VC_LIST_EXCEPT)); \
- if test -n "$$in_vc_files"; then \
- files=$$(echo "$$files" | grep -E "$$in_vc_files"); \
- fi; \
- fi; \
- \
- : Filter by content; \
- test -n "$$files" && test -n "$$containing" \
- && { files=$$(grep -l "$$containing" $$files); } || :; \
- test -n "$$files" && test -n "$$non_containing" \
- && { files=$$(grep -vl "$$non_containing" $$files); } || :; \
- \
- : Check for the construct; \
- if test -n "$$files"; then \
- if test -n "$$prohibit"; then \
- grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \
- | grep -vE "$${exclude:-^$$}" \
- && { msg="$$halt" $(_sc_say_and_exit) } || :; \
- else \
- grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \
- | grep . \
- && { msg="$$halt" $(_sc_say_and_exit) } || :; \
- fi \
- else :; \
- fi || :;
-endef
-
-sc_avoid_if_before_free:
- @$(srcdir)/$(_build-aux)/useless-if-before-free \
- $(useless_free_options) \
- $$($(VC_LIST_EXCEPT) | grep -v useless-if-before-free) && \
- { echo '$(ME): found useless "if" before "free" above' 1>&2; \
- exit 1; } || :
-
-sc_cast_of_argument_to_free:
- @prohibit='\<free *\( *\(' halt="don't cast free argument" \
- $(_sc_search_regexp)
-
-sc_cast_of_x_alloc_return_value:
- @prohibit='\*\) *x(m|c|re)alloc\>' \
- halt="don't cast x*alloc return value" \
- $(_sc_search_regexp)
-
-sc_cast_of_alloca_return_value:
- @prohibit='\*\) *alloca\>' \
- halt="don't cast alloca return value" \
- $(_sc_search_regexp)
-
-sc_space_tab:
- @prohibit='[ ] ' \
- halt='found SPACE-TAB sequence; remove the SPACE' \
- $(_sc_search_regexp)
-
-# Don't use *scanf or the old ato* functions in "real" code.
-# They provide no error checking mechanism.
-# Instead, use strto* functions.
-sc_prohibit_atoi_atof:
- @prohibit='\<([fs]?scanf|ato([filq]|ll)) *\(' \
- halt='do not use *scan''f, ato''f, ato''i, ato''l, ato''ll or ato''q' \
- $(_sc_search_regexp)
-
-# Use STREQ rather than comparing strcmp == 0, or != 0.
-sp_ = strcmp *\(.+\)
-sc_prohibit_strcmp:
- @prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)' \
- exclude='# *define STRN?EQ\(' \
- halt='replace strcmp calls above with STREQ/STRNEQ' \
- $(_sc_search_regexp)
-
-# Really. You don't want to use this function.
-# It may fail to NUL-terminate the destination,
-# and always NUL-pads out to the specified length.
-sc_prohibit_strncpy:
- @prohibit='\<strncpy *\(' \
- halt='do not use strncpy, period' \
- $(_sc_search_regexp)
-
-# Pass EXIT_*, not number, to usage, exit, and error (when exiting)
-# Convert all uses automatically, via these two commands:
-# git grep -l '\<exit *(1)' \
-# | grep -vEf .x-sc_prohibit_magic_number_exit \
-# | xargs --no-run-if-empty \
-# perl -pi -e 's/(^|[^.])\b(exit ?)\(1\)/$1$2(EXIT_FAILURE)/'
-# git grep -l '\<exit *(0)' \
-# | grep -vEf .x-sc_prohibit_magic_number_exit \
-# | xargs --no-run-if-empty \
-# perl -pi -e 's/(^|[^.])\b(exit ?)\(0\)/$1$2(EXIT_SUCCESS)/'
-sc_prohibit_magic_number_exit:
- @prohibit='(^|[^.])\<(usage|exit|error) ?\(-?[0-9]+[,)]' \
- exclude='exit \(77\)|error ?\(((0|77),|[^,]*)' \
- halt='use EXIT_* values rather than magic number' \
- $(_sc_search_regexp)
-
-# Using EXIT_SUCCESS as the first argument to error is misleading,
-# since when that parameter is 0, error does not exit. Use '0' instead.
-sc_error_exit_success:
- @prohibit='error *\(EXIT_SUCCESS,' \
- in_vc_files='\.[chly]$$' \
- halt='found error (EXIT_SUCCESS' \
- $(_sc_search_regexp)
-
-# "FATAL:" should be fully upper-cased in error messages
-# "WARNING:" should be fully upper-cased, or fully lower-cased
-sc_error_message_warn_fatal:
- @grep -nEA2 '[^rp]error *\(' $$($(VC_LIST_EXCEPT)) \
- | grep -E '"Warning|"Fatal|"fatal' && \
- { echo '$(ME): use FATAL, WARNING or warning' 1>&2; \
- exit 1; } || :
-
-# Error messages should not start with a capital letter
-sc_error_message_uppercase:
- @grep -nEA2 '[^rp]error *\(' $$($(VC_LIST_EXCEPT)) \
- | grep -E '"[A-Z]' \
- | grep -vE '"FATAL|"WARNING|"Java|"C#|PRIuMAX' && \
- { echo '$(ME): found capitalized error message' 1>&2; \
- exit 1; } || :
-
-# Error messages should not end with a period
-sc_error_message_period:
- @grep -nEA2 '[^rp]error *\(' $$($(VC_LIST_EXCEPT)) \
- | grep -E '[^."]\."' && \
- { echo '$(ME): found error message ending in period' 1>&2; \
- exit 1; } || :
-
-sc_file_system:
- @prohibit=file''system \
- ignore_case=1 \
- halt='found use of "file''system"; spell it "file system"' \
- $(_sc_search_regexp)
-
-# Don't use cpp tests of this symbol. All code assumes config.h is included.
-sc_prohibit_have_config_h:
- @prohibit='^# *if.*HAVE''_CONFIG_H' \
- halt='found use of HAVE''_CONFIG_H; remove' \
- $(_sc_search_regexp)
-
-# Nearly all .c files must include <config.h>. However, we also permit this
-# via inclusion of a package-specific header, if cfg.mk specified one.
-# config_h_header must be suitable for grep -E.
-config_h_header ?= <config\.h>
-sc_require_config_h:
- @require='^# *include $(config_h_header)' \
- in_vc_files='\.c$$' \
- halt='the above files do not include <config.h>' \
- $(_sc_search_regexp)
-
-# Print each file name for which the first #include does not match
-# $(config_h_header). Like grep -m 1, this only looks at the first match.
-perl_config_h_first_ = \
- -e 'BEGIN {$$ret = 0}' \
- -e 'if (/^\# *include\b/) {' \
- -e ' if (not m{^\# *include $(config_h_header)}) {' \
- -e ' print "$$ARGV\n";' \
- -e ' $$ret = 1;' \
- -e ' }' \
- -e ' \# Move on to next file after first include' \
- -e ' close ARGV;' \
- -e '}' \
- -e 'END {exit $$ret}'
-
-# You must include <config.h> before including any other header file.
-# This can possibly be via a package-specific header, if given by cfg.mk.
-sc_require_config_h_first:
- @if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
- files=$$($(VC_LIST_EXCEPT) | grep '\.c$$') && \
- perl -n $(perl_config_h_first_) $$files || \
- { echo '$(ME): the above files include some other header' \
- 'before <config.h>' 1>&2; exit 1; } || :; \
- else :; \
- fi
-
-sc_prohibit_HAVE_MBRTOWC:
- @prohibit='\bHAVE_MBRTOWC\b' \
- halt="do not use $$prohibit; it is always defined" \
- $(_sc_search_regexp)
-
-# To use this "command" macro, you must first define two shell variables:
-# h: the header name, with no enclosing <> or ""
-# re: a regular expression that matches IFF something provided by $h is used.
-define _sc_header_without_use
- dummy=; : so we do not need a semicolon before each use; \
- h_esc=`echo '[<"]'"$$h"'[">]'|$(SED) 's/\./\\\\./g'`; \
- if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
- files=$$(grep -l '^# *include '"$$h_esc" \
- $$($(VC_LIST_EXCEPT) | grep '\.c$$')) && \
- grep -LE "$$re" $$files | grep . && \
- { echo "$(ME): the above files include $$h but don't use it" \
- 1>&2; exit 1; } || :; \
- else :; \
- fi
-endef
-
-# Prohibit the inclusion of assert.h without an actual use of assert.
-sc_prohibit_assert_without_use:
- @h='assert.h' re='\<assert *\(' $(_sc_header_without_use)
-
-# Prohibit the inclusion of close-stream.h without an actual use.
-sc_prohibit_close_stream_without_use:
- @h='close-stream.h' re='\<close_stream *\(' $(_sc_header_without_use)
-
-# Prohibit the inclusion of getopt.h without an actual use.
-sc_prohibit_getopt_without_use:
- @h='getopt.h' re='\<getopt(_long)? *\(' $(_sc_header_without_use)
-
-# Don't include quotearg.h unless you use one of its functions.
-sc_prohibit_quotearg_without_use:
- @h='quotearg.h' re='\<quotearg(_[^ ]+)? *\(' $(_sc_header_without_use)
-
-# Don't include quote.h unless you use one of its functions.
-sc_prohibit_quote_without_use:
- @h='quote.h' re='\<quote((_n)? *\(|_quoting_options\>)' \
- $(_sc_header_without_use)
-
-# Don't include this header unless you use one of its functions.
-sc_prohibit_long_options_without_use:
- @h='long-options.h' re='\<parse_long_options *\(' \
- $(_sc_header_without_use)
-
-# Don't include this header unless you use one of its functions.
-sc_prohibit_inttostr_without_use:
- @h='inttostr.h' re='\<(off|[iu]max|uint)tostr *\(' \
- $(_sc_header_without_use)
-
-# Don't include this header unless you use one of its functions.
-sc_prohibit_ignore_value_without_use:
- @h='ignore-value.h' re='\<ignore_(value|ptr) *\(' \
- $(_sc_header_without_use)
-
-# Don't include this header unless you use one of its functions.
-sc_prohibit_error_without_use:
- @h='error.h' \
- re='\<error(_at_line|_print_progname|_one_per_line|_message_count)? *\('\
- $(_sc_header_without_use)
-
-# Don't include xalloc.h unless you use one of its functions.
-# Consider these symbols:
-# perl -lne '/^# *define (\w+)\(/ and print $1' lib/xalloc.h|grep -v '^__';
-# perl -lne '/^(?:extern )?(?:void|char) \*?(\w+) *\(/ and print $1' lib/xalloc.h
-# Divide into two sets on case, and filter each through this:
-# | sort | perl -MRegexp::Assemble -le \
-# 'print Regexp::Assemble->new(file => "/dev/stdin")->as_string'|sed 's/\?://g'
-# Note this was produced by the above:
-# _xa1 = \
-#x(((2n?)?re|c(har)?|n(re|m)|z)alloc|alloc_(oversized|die)|m(alloc|emdup)|strdup)
-# But we can do better, in at least two ways:
-# 1) take advantage of two "dup"-suffixed strings:
-# x(((2n?)?re|c(har)?|n(re|m)|[mz])alloc|alloc_(oversized|die)|(mem|str)dup)
-# 2) notice that "c(har)?|[mz]" is equivalent to the shorter and more readable
-# "char|[cmz]"
-# x(((2n?)?re|char|n(re|m)|[cmz])alloc|alloc_(oversized|die)|(mem|str)dup)
-_xa1 = x(((2n?)?re|char|n(re|m)|[cmz])alloc|alloc_(oversized|die)|(mem|str)dup)
-_xa2 = X([CZ]|N?M)ALLOC
-sc_prohibit_xalloc_without_use:
- @h='xalloc.h' \
- re='\<($(_xa1)|$(_xa2)) *\('\
- $(_sc_header_without_use)
-
-# Extract function names:
-# perl -lne '/^(?:extern )?(?:void|char) \*?(\w+) *\(/ and print $1' lib/hash.h
-_hash_re = \
-clear|delete|free|get_(first|next)|insert|lookup|print_statistics|reset_tuning
-_hash_fn = \<($(_hash_re)) *\(
-_hash_struct = (struct )?\<[Hh]ash_(table|tuning)\>
-sc_prohibit_hash_without_use:
- @h='hash.h' \
- re='$(_hash_fn)|$(_hash_struct)'\
- $(_sc_header_without_use)
-
-sc_prohibit_cloexec_without_use:
- @h='cloexec.h' re='\<(set_cloexec_flag|dup_cloexec) *\(' \
- $(_sc_header_without_use)
-
-sc_prohibit_posixver_without_use:
- @h='posixver.h' re='\<posix2_version *\(' $(_sc_header_without_use)
-
-sc_prohibit_same_without_use:
- @h='same.h' re='\<same_name *\(' $(_sc_header_without_use)
-
-sc_prohibit_hash_pjw_without_use:
- @h='hash-pjw.h' \
- re='\<hash_pjw\>' \
- $(_sc_header_without_use)
-
-sc_prohibit_safe_read_without_use:
- @h='safe-read.h' re='(\<SAFE_READ_ERROR\>|\<safe_read *\()' \
- $(_sc_header_without_use)
-
-sc_prohibit_argmatch_without_use:
- @h='argmatch.h' \
- re='(\<(ARRAY_CARDINALITY|X?ARGMATCH(|_TO_ARGUMENT|_VERIFY))\>|\<(invalid_arg|argmatch(_exit_fn|_(in)?valid)?) *\()' \
- $(_sc_header_without_use)
-
-sc_prohibit_canonicalize_without_use:
- @h='canonicalize.h' \
- re='CAN_(EXISTING|ALL_BUT_LAST|MISSING)|canonicalize_(mode_t|filename_mode|file_name)' \
- $(_sc_header_without_use)
-
-sc_prohibit_root_dev_ino_without_use:
- @h='root-dev-ino.h' \
- re='(\<ROOT_DEV_INO_(CHECK|WARN)\>|\<get_root_dev_ino *\()' \
- $(_sc_header_without_use)
-
-sc_prohibit_openat_without_use:
- @h='openat.h' \
- re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat|(FCHMOD|FCHOWN|STAT)AT_INLINE)\>' \
- $(_sc_header_without_use)
-
-# Prohibit the inclusion of c-ctype.h without an actual use.
-ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
-|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper
-sc_prohibit_c_ctype_without_use:
- @h='c-ctype.h' re='\<c_($(ctype_re)) *\(' \
- $(_sc_header_without_use)
-
-# The following list was generated by running:
-# man signal.h|col -b|perl -ne '/bsd_signal.*;/.../sigwaitinfo.*;/ and print' \
-# | perl -lne '/^\s+(?:int|void).*?(\w+).*/ and print $1' | fmt
-_sig_functions = \
- bsd_signal kill killpg pthread_kill pthread_sigmask raise sigaction \
- sigaddset sigaltstack sigdelset sigemptyset sigfillset sighold sigignore \
- siginterrupt sigismember signal sigpause sigpending sigprocmask sigqueue \
- sigrelse sigset sigsuspend sigtimedwait sigwait sigwaitinfo
-_sig_function_re = $(subst $(_sp),|,$(strip $(_sig_functions)))
-# The following were extracted from "man signal.h" manually.
-_sig_types_and_consts = \
- MINSIGSTKSZ SA_NOCLDSTOP SA_NOCLDWAIT SA_NODEFER SA_ONSTACK \
- SA_RESETHAND SA_RESTART SA_SIGINFO SIGEV_NONE SIGEV_SIGNAL \
- SIGEV_THREAD SIGSTKSZ SIG_BLOCK SIG_SETMASK SIG_UNBLOCK SS_DISABLE \
- SS_ONSTACK mcontext_t pid_t sig_atomic_t sigevent siginfo_t sigset_t \
- sigstack sigval stack_t ucontext_t
-# generated via this:
-# perl -lne '/^#ifdef (SIG\w+)/ and print $1' lib/sig2str.c|sort -u|fmt -70
-_sig_names = \
- SIGABRT SIGALRM SIGALRM1 SIGBUS SIGCANCEL SIGCHLD SIGCLD SIGCONT \
- SIGDANGER SIGDIL SIGEMT SIGFPE SIGFREEZE SIGGRANT SIGHUP SIGILL \
- SIGINFO SIGINT SIGIO SIGIOT SIGKAP SIGKILL SIGKILLTHR SIGLOST SIGLWP \
- SIGMIGRATE SIGMSG SIGPHONE SIGPIPE SIGPOLL SIGPRE SIGPROF SIGPWR \
- SIGQUIT SIGRETRACT SIGSAK SIGSEGV SIGSOUND SIGSTKFLT SIGSTOP SIGSYS \
- SIGTERM SIGTHAW SIGTRAP SIGTSTP SIGTTIN SIGTTOU SIGURG SIGUSR1 \
- SIGUSR2 SIGVIRT SIGVTALRM SIGWAITING SIGWINCH SIGWIND SIGWINDOW \
- SIGXCPU SIGXFSZ
-_sig_syms_re = $(subst $(_sp),|,$(strip $(_sig_names) $(_sig_types_and_consts)))
-
-# Prohibit the inclusion of signal.h without an actual use.
-sc_prohibit_signal_without_use:
- @h='signal.h' \
- re='\<($(_sig_function_re)) *\(|\<($(_sig_syms_re))\>' \
- $(_sc_header_without_use)
-
-# Don't include stdio--.h unless you use one of its functions.
-sc_prohibit_stdio--_without_use:
- @h='stdio--.h' re='\<((f(re)?|p)open|tmpfile) *\(' \
- $(_sc_header_without_use)
-
-# Don't include stdio-safer.h unless you use one of its functions.
-sc_prohibit_stdio-safer_without_use:
- @h='stdio-safer.h' re='\<((f(re)?|p)open|tmpfile)_safer *\(' \
- $(_sc_header_without_use)
-
-# Prohibit the inclusion of strings.h without a sensible use.
-# Using the likes of bcmp, bcopy, bzero, index or rindex is not sensible.
-sc_prohibit_strings_without_use:
- @h='strings.h' \
- re='\<(strn?casecmp|ffs(ll)?)\>' \
- $(_sc_header_without_use)
-
-# Get the list of symbol names with this:
-# perl -lne '/^# *define ([A-Z]\w+)\(/ and print $1' lib/intprops.h|fmt
-_intprops_names = \
- TYPE_IS_INTEGER TYPE_SIGNED TYPE_MINIMUM TYPE_MAXIMUM \
- INT_BITS_STRLEN_BOUND INT_STRLEN_BOUND INT_BUFSIZE_BOUND \
- INT_ADD_RANGE_OVERFLOW INT_SUBTRACT_RANGE_OVERFLOW \
- INT_NEGATE_RANGE_OVERFLOW INT_MULTIPLY_RANGE_OVERFLOW \
- INT_DIVIDE_RANGE_OVERFLOW INT_REMAINDER_RANGE_OVERFLOW \
- INT_LEFT_SHIFT_RANGE_OVERFLOW INT_ADD_OVERFLOW INT_SUBTRACT_OVERFLOW \
- INT_NEGATE_OVERFLOW INT_MULTIPLY_OVERFLOW INT_DIVIDE_OVERFLOW \
- INT_REMAINDER_OVERFLOW INT_LEFT_SHIFT_OVERFLOW
-_intprops_syms_re = $(subst $(_sp),|,$(strip $(_intprops_names)))
-# Prohibit the inclusion of intprops.h without an actual use.
-sc_prohibit_intprops_without_use:
- @h='intprops.h' \
- re='\<($(_intprops_syms_re)) *\(' \
- $(_sc_header_without_use)
-
-_stddef_syms_re = NULL|offsetof|ptrdiff_t|size_t|wchar_t
-# Prohibit the inclusion of stddef.h without an actual use.
-sc_prohibit_stddef_without_use:
- @h='stddef.h' \
- re='\<($(_stddef_syms_re))\>' \
- $(_sc_header_without_use)
-
-_de1 = dirfd|(close|(fd)?open|read|rewind|seek|tell)dir(64)?(_r)?
-_de2 = (versionsort|struct dirent|getdirentries|alphasort|scandir(at)?)(64)?
-_de3 = MAXNAMLEN|DIR|ino_t|d_ino|d_fileno|d_namlen
-_dirent_syms_re = $(_de1)|$(_de2)|$(_de3)
-# Prohibit the inclusion of dirent.h without an actual use.
-sc_prohibit_dirent_without_use:
- @h='dirent.h' \
- re='\<($(_dirent_syms_re))\>' \
- $(_sc_header_without_use)
-
-# Prohibit the inclusion of verify.h without an actual use.
-sc_prohibit_verify_without_use:
- @h='verify.h' \
- re='\<(verify(true|expr)?|static_assert) *\(' \
- $(_sc_header_without_use)
-
-# Don't include xfreopen.h unless you use one of its functions.
-sc_prohibit_xfreopen_without_use:
- @h='xfreopen.h' re='\<xfreopen *\(' $(_sc_header_without_use)
-
-sc_obsolete_symbols:
- @prohibit='\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \
- halt='do not use HAVE''_FCNTL_H or O'_NDELAY \
- $(_sc_search_regexp)
-
-# FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ
-
-# Each nonempty ChangeLog line must start with a year number, or a TAB.
-sc_changelog:
- @prohibit='^[^12 ]' \
- in_vc_files='^ChangeLog$$' \
- halt='found unexpected prefix in a ChangeLog' \
- $(_sc_search_regexp)
-
-# Ensure that each .c file containing a "main" function also
-# calls bindtextdomain.
-sc_bindtextdomain:
- @require='bindtextdomain *\(' \
- in_vc_files='\.c$$' \
- containing='\<main *(' \
- halt='the above files do not call bindtextdomain' \
- $(_sc_search_regexp)
-
-# Require that the final line of each test-lib.sh-using test be this one:
-# Exit $fail
-# Note: this test requires GNU grep's --label= option.
-Exit_witness_file ?= tests/test-lib.sh
-Exit_base := $(notdir $(Exit_witness_file))
-sc_require_test_exit_idiom:
- @if test -f $(srcdir)/$(Exit_witness_file); then \
- die=0; \
- for i in $$(grep -l -F 'srcdir/$(Exit_base)' \
- $$($(VC_LIST) tests)); do \
- tail -n1 $$i | grep '^Exit .' > /dev/null \
- && : || { die=1; echo $$i; } \
- done; \
- test $$die = 1 && \
- { echo 1>&2 '$(ME): the final line in each of the above is not:'; \
- echo 1>&2 'Exit something'; \
- exit 1; } || :; \
- fi
-
-sc_trailing_blank:
- @prohibit='[ ]$$' \
- halt='found trailing blank(s)' \
- exclude='^Binary file .* matches$$' \
- $(_sc_search_regexp)
-
-# Match lines like the following, but where there is only one space
-# between the options and the description:
-# -D, --all-repeated[=delimit-method] print all duplicate lines\n
-longopt_re = --[a-z][0-9A-Za-z-]*(\[?=[0-9A-Za-z-]*\]?)?
-sc_two_space_separator_in_usage:
- @prohibit='^ *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$' \
- halt='help2man requires at least two spaces between an option and its description'\
- $(_sc_search_regexp)
-
-# A regexp matching function names like "error" that may be used
-# to emit translatable messages.
-_gl_translatable_diag_func_re ?= error
-
-# Look for diagnostics that aren't marked for translation.
-# This won't find any for which error's format string is on a separate line.
-sc_unmarked_diagnostics:
- @prohibit='\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \
- exclude='(_|ngettext ?)\(' \
- halt='found unmarked diagnostic(s)' \
- $(_sc_search_regexp)
-
-# Avoid useless parentheses like those in this example:
-# #if defined (SYMBOL) || defined (SYM2)
-sc_useless_cpp_parens:
- @prohibit='^# *if .*defined *\(' \
- halt='found useless parentheses in cpp directive' \
- $(_sc_search_regexp)
-
-# List headers for which HAVE_HEADER_H is always true, assuming you are
-# using the appropriate gnulib module. CAUTION: for each "unnecessary"
-# #if HAVE_HEADER_H that you remove, be sure that your project explicitly
-# requires the gnulib module that guarantees the usability of that header.
-gl_assured_headers_ = \
- cd $(gnulib_dir)/lib && echo *.in.h|$(SED) 's/\.in\.h//g'
-
-# Convert the list of names to upper case, and replace each space with "|".
-az_ = abcdefghijklmnopqrstuvwxyz
-AZ_ = ABCDEFGHIJKLMNOPQRSTUVWXYZ
-gl_header_upper_case_or_ = \
- $$($(gl_assured_headers_) \
- | tr $(az_)/.- $(AZ_)___ \
- | tr -s ' ' '|' \
- )
-sc_prohibit_always_true_header_tests:
- @or=$(gl_header_upper_case_or_); \
- re="HAVE_($$or)_H"; \
- prohibit='\<'"$$re"'\>' \
- halt=$$(printf '%s\n' \
- 'do not test the above HAVE_<header>_H symbol(s);' \
- ' with the corresponding gnulib module, they are always true') \
- $(_sc_search_regexp)
-
-sc_prohibit_defined_have_decl_tests:
- @prohibit='(#[ ]*ifn?def|\<defined)\>[ (]+HAVE_DECL_' \
- halt='HAVE_DECL macros are always defined' \
- $(_sc_search_regexp)
-
-# ==================================================================
-gl_other_headers_ ?= \
- intprops.h \
- openat.h \
- stat-macros.h
-
-# Perl -lne code to extract "significant" cpp-defined symbols from a
-# gnulib header file, eliminating a few common false-positives.
-# The exempted names below are defined only conditionally in gnulib,
-# and hence sometimes must/may be defined in application code.
-gl_extract_significant_defines_ = \
- /^\# *define ([^_ (][^ (]*)(\s*\(|\s+\w+)/\
- && $$2 !~ /(?:rpl_|_used_without_)/\
- && $$1 !~ /^(?:NSIG|ENODATA)$$/\
- && $$1 !~ /^(?:SA_RESETHAND|SA_RESTART)$$/\
- and print $$1
-
-# Create a list of regular expressions matching the names
-# of macros that are guaranteed to be defined by parts of gnulib.
-define def_sym_regex
- gen_h=$(gl_generated_headers_); \
- (cd $(gnulib_dir)/lib; \
- for f in *.in.h $(gl_other_headers_); do \
- test -f $$f \
- && perl -lne '$(gl_extract_significant_defines_)' $$f; \
- done; \
- ) | sort -u \
- | $(SED) 's/^/^ *# *(define|undef) */;s/$$/\\>/'
-endef
-
-# Don't define macros that we already get from gnulib header files.
-sc_prohibit_always-defined_macros:
- @if test -d $(gnulib_dir); then \
- case $$(echo all: | grep -l -f - Makefile) in Makefile);; *) \
- echo '$(ME): skipping $@: you lack GNU grep' 1>&2; exit 0;; \
- esac; \
- $(def_sym_regex) | grep -E -f - $$($(VC_LIST_EXCEPT)) \
- && { echo '$(ME): define the above via some gnulib .h file' \
- 1>&2; exit 1; } || :; \
- fi
-# ==================================================================
-
-# Prohibit checked in backup files.
-sc_prohibit_backup_files:
- @$(VC_LIST) | grep '~$$' && \
- { echo '$(ME): found version controlled backup file' 1>&2; \
- exit 1; } || :
-
-# Require the latest GPL.
-sc_GPL_version:
- @prohibit='either ''version [^3]' \
- halt='GPL vN, N!=3' \
- $(_sc_search_regexp)
-
-# Require the latest GFDL. Two regexp, since some .texi files end up
-# line wrapping between 'Free Documentation License,' and 'Version'.
-_GFDL_regexp = (Free ''Documentation.*Version 1\.[^3]|Version 1\.[^3] or any)
-sc_GFDL_version:
- @prohibit='$(_GFDL_regexp)' \
- halt='GFDL vN, N!=3' \
- $(_sc_search_regexp)
-
-# Don't use Texinfo's @acronym{}.
-# http://lists.gnu.org/archive/html/bug-gnulib/2010-03/msg00321.html
-texinfo_suffix_re_ ?= \.(txi|texi(nfo)?)$$
-sc_texinfo_acronym:
- @prohibit='@acronym\{' \
- in_vc_files='$(texinfo_suffix_re_)' \
- halt='found use of Texinfo @acronym{}' \
- $(_sc_search_regexp)
-
-cvs_keywords = \
- Author|Date|Header|Id|Name|Locker|Log|RCSfile|Revision|Source|State
-
-sc_prohibit_cvs_keyword:
- @prohibit='\$$($(cvs_keywords))\$$' \
- halt='do not use CVS keyword expansion' \
- $(_sc_search_regexp)
-
-# This Perl code is slightly obfuscated. Not only is each "$" doubled
-# because it's in a Makefile, but the $$c's are comments; we cannot
-# use "#" due to the way the script ends up concatenated onto one line.
-# It would be much more concise, and would produce better output (including
-# counts) if written as:
-# perl -ln -0777 -e '/\n(\n+)$/ and print "$ARGV: ".length $1' ...
-# but that would be far less efficient, reading the entire contents
-# of each file, rather than just the last two bytes of each.
-# In addition, while the code below detects both blank lines and a missing
-# newline at EOF, the above detects only the former.
-#
-# This is a perl script that is expected to be the single-quoted argument
-# to a command-line "-le". The remaining arguments are file names.
-# Print the name of each file that does not end in exactly one newline byte.
-# I.e., warn if there are blank lines (2 or more newlines), or if the
-# last byte is not a newline. However, currently we don't complain
-# about any file that contains exactly one byte.
-# Exit nonzero if at least one such file is found, otherwise, exit 0.
-# Warn about, but otherwise ignore open failure. Ignore seek/read failure.
-#
-# Use this if you want to remove trailing empty lines from selected files:
-# perl -pi -0777 -e 's/\n\n+$/\n/' files...
-#
-require_exactly_one_NL_at_EOF_ = \
- foreach my $$f (@ARGV) \
- { \
- open F, "<", $$f or (warn "failed to open $$f: $$!\n"), next; \
- my $$p = sysseek (F, -2, 2); \
- my $$c = "seek failure probably means file has < 2 bytes; ignore"; \
- my $$last_two_bytes; \
- defined $$p and $$p = sysread F, $$last_two_bytes, 2; \
- close F; \
- $$c = "ignore read failure"; \
- $$p && ($$last_two_bytes eq "\n\n" \
- || substr ($$last_two_bytes,1) ne "\n") \
- and (print $$f), $$fail=1; \
- } \
- END { exit defined $$fail }
-sc_prohibit_empty_lines_at_EOF:
- @perl -le '$(require_exactly_one_NL_at_EOF_)' $$($(VC_LIST_EXCEPT)) \
- || { echo '$(ME): empty line(s) or no newline at EOF' \
- 1>&2; exit 1; } || :
-
-# Make sure we don't use st_blocks. Use ST_NBLOCKS instead.
-# This is a bit of a kludge, since it prevents use of the string
-# even in comments, but for now it does the job with no false positives.
-sc_prohibit_stat_st_blocks:
- @prohibit='[.>]st_blocks' \
- halt='do not use st_blocks; use ST_NBLOCKS' \
- $(_sc_search_regexp)
-
-# Make sure we don't define any S_IS* macros in src/*.c files.
-# They're already defined via gnulib's sys/stat.h replacement.
-sc_prohibit_S_IS_definition:
- @prohibit='^ *# *define *S_IS' \
- halt='do not define S_IS* macros; include <sys/stat.h>' \
- $(_sc_search_regexp)
-
-# Perl block to convert a match to FILE_NAME:LINENO:TEST,
-# that is shared by two definitions below.
-perl_filename_lineno_text_ = \
- -e ' {' \
- -e ' $$n = ($$` =~ tr/\n/\n/ + 1);' \
- -e ' ($$v = $$&) =~ s/\n/\\n/g;' \
- -e ' print "$$ARGV:$$n:$$v\n";' \
- -e ' }'
-
-prohibit_doubled_words_ = \
- the then in an on if is it but for or at and do to
-# expand the regex before running the check to avoid using expensive captures
-prohibit_doubled_word_expanded_ = \
- $(join $(prohibit_doubled_words_),$(addprefix \s+,$(prohibit_doubled_words_)))
-prohibit_doubled_word_RE_ ?= \
- /\b(?:$(subst $(_sp),|,$(prohibit_doubled_word_expanded_)))\b/gims
-prohibit_doubled_word_ = \
- -e 'while ($(prohibit_doubled_word_RE_))' \
- $(perl_filename_lineno_text_)
-
-# Define this to a regular expression that matches
-# any filename:dd:match lines you want to ignore.
-# The default is to ignore no matches.
-ignore_doubled_word_match_RE_ ?= ^$$
-
-sc_prohibit_doubled_word:
- @perl -n -0777 $(prohibit_doubled_word_) $$($(VC_LIST_EXCEPT)) \
- | grep -vE '$(ignore_doubled_word_match_RE_)' \
- | grep . && { echo '$(ME): doubled words' 1>&2; exit 1; } || :
-
-# A regular expression matching undesirable combinations of words like
-# "can not"; this matches them even when the two words appear on different
-# lines, but not when there is an intervening delimiter like "#" or "*".
-# Similarly undesirable, "See @xref{...}", since an @xref should start
-# a sentence. Explicitly prohibit any prefix of "see" or "also".
-# Also prohibit a prefix matching "\w+ +".
-# @pxref gets the same see/also treatment and should be parenthesized;
-# presume it must *not* start a sentence.
-bad_xref_re_ ?= (?:[\w,:;] +|(?:see|also)\s+)\@xref\{
-bad_pxref_re_ ?= (?:[.!?]|(?:see|also))\s+\@pxref\{
-prohibit_undesirable_word_seq_RE_ ?= \
- /(?:\bcan\s+not\b|$(bad_xref_re_)|$(bad_pxref_re_))/gims
-prohibit_undesirable_word_seq_ = \
- -e 'while ($(prohibit_undesirable_word_seq_RE_))' \
- $(perl_filename_lineno_text_)
-# Define this to a regular expression that matches
-# any filename:dd:match lines you want to ignore.
-# The default is to ignore no matches.
-ignore_undesirable_word_sequence_RE_ ?= ^$$
-
-sc_prohibit_undesirable_word_seq:
- @perl -n -0777 $(prohibit_undesirable_word_seq_) \
- $$($(VC_LIST_EXCEPT)) \
- | grep -vE '$(ignore_undesirable_word_sequence_RE_)' | grep . \
- && { echo '$(ME): undesirable word sequence' >&2; exit 1; } || :
-
-# Except for shell files and for loops, double semicolon is probably a mistake
-sc_prohibit_double_semicolon:
- @prohibit='; *;[ {} \]*(/[/*]|$$)' \
- in_vc_files='\.[chly]$$' \
- exclude='\bfor *\(.*\)' \
- halt="Double semicolon detected" \
- $(_sc_search_regexp)
-
-_ptm1 = use "test C1 && test C2", not "test C1 -''a C2"
-_ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
-# Using test's -a and -o operators is not portable.
-# We prefer test over [, since the latter is spelled [[ in configure.ac.
-sc_prohibit_test_minus_ao:
- @prohibit='(\<test| \[+) .+ -[ao] ' \
- halt='$(_ptm1); $(_ptm2)' \
- $(_sc_search_regexp)
-
-# Avoid a test bashism.
-sc_prohibit_test_double_equal:
- @prohibit='(\<test| \[+) .+ == ' \
- containing='#! */bin/[a-z]*sh' \
- halt='use "test x = x", not "test x =''= x"' \
- $(_sc_search_regexp)
-
-# Each program that uses proper_name_utf8 must link with one of the
-# ICONV libraries. Otherwise, some ICONV library must appear in LDADD.
-# The perl -0777 invocation below extracts the possibly-multi-line
-# definition of LDADD from the appropriate Makefile.am and exits 0
-# when it contains "ICONV".
-sc_proper_name_utf8_requires_ICONV:
- @progs=$$(grep -l 'proper_name_utf8 ''("' $$($(VC_LIST_EXCEPT)));\
- if test "x$$progs" != x; then \
- fail=0; \
- for p in $$progs; do \
- dir=$$(dirname "$$p"); \
- perl -0777 \
- -ne 'exit !(/^LDADD =(.+?[^\\]\n)/ms && $$1 =~ /ICONV/)' \
- $$dir/Makefile.am && continue; \
- base=$$(basename "$$p" .c); \
- grep "$${base}_LDADD.*ICONV)" $$dir/Makefile.am > /dev/null \
- || { fail=1; echo 1>&2 "$(ME): $$p uses proper_name_utf8"; }; \
- done; \
- test $$fail = 1 && \
- { echo 1>&2 '$(ME): the above do not link with any ICONV library'; \
- exit 1; } || :; \
- fi
-
-# Warn about "c0nst struct Foo const foo[]",
-# but not about "char const *const foo" or "#define const const".
-sc_redundant_const:
- @prohibit='\bconst\b[[:space:][:alnum:]]{2,}\bconst\b' \
- halt='redundant "const" in declarations' \
- $(_sc_search_regexp)
-
-sc_const_long_option:
- @prohibit='^ *static.*struct option ' \
- exclude='const struct option|struct option const' \
- halt='add "const" to the above declarations' \
- $(_sc_search_regexp)
-
-NEWS_hash = \
- $$($(SED) -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p' \
- $(srcdir)/NEWS \
- | perl -0777 -pe \
- 's/^Copyright.+?Free\sSoftware\sFoundation,\sInc\.\n//ms' \
- | md5sum - \
- | $(SED) 's/ .*//')
-
-# Ensure that we don't accidentally insert an entry into an old NEWS block.
-sc_immutable_NEWS:
- @if test -f $(srcdir)/NEWS; then \
- test "$(NEWS_hash)" = '$(old_NEWS_hash)' && : || \
- { echo '$(ME): you have modified old NEWS' 1>&2; exit 1; }; \
- fi
-
-# Update the hash stored above. Do this after each release and
-# for any corrections to old entries.
-update-NEWS-hash: NEWS
- perl -pi -e 's/^(old_NEWS_hash[ \t]+:?=[ \t]+).*/$${1}'"$(NEWS_hash)/" \
- $(srcdir)/cfg.mk
-
-# Ensure that we use only the standard $(VAR) notation,
-# not @...@ in Makefile.am, now that we can rely on automake
-# to emit a definition for each substituted variable.
-# However, there is still one case in which @VAR@ use is not just
-# legitimate, but actually required: when augmenting an automake-defined
-# variable with a prefix. For example, gettext uses this:
-# MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
-# otherwise, makeinfo would put German or French (current locale)
-# navigation hints in the otherwise-English documentation.
-#
-# Allow the package to add exceptions via a hook in cfg.mk;
-# for example, @PRAGMA_SYSTEM_HEADER@ can be permitted by
-# setting this to ' && !/PRAGMA_SYSTEM_HEADER/'.
-_makefile_at_at_check_exceptions ?=
-sc_makefile_at_at_check:
- @perl -ne '/\@\w+\@/' \
- -e ' && !/(\w+)\s+=.*\@\1\@$$/' \
- -e ''$(_makefile_at_at_check_exceptions) \
- -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}' \
- $$($(VC_LIST_EXCEPT) | grep -E '(^|/)(Makefile\.am|[^/]+\.mk)$$') \
- && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
-
-news-check: NEWS
- $(AM_V_GEN)if $(SED) -n $(news-check-lines-spec)p $< \
- | grep -E $(news-check-regexp) >/dev/null; then \
- :; \
- else \
- echo 'NEWS: $$(news-check-regexp) failed to match' 1>&2; \
- exit 1; \
- fi
-
-sc_makefile_TAB_only_indentation:
- @prohibit='^ [ ]{8}' \
- in_vc_files='akefile|\.mk$$' \
- halt='found TAB-8-space indentation' \
- $(_sc_search_regexp)
-
-sc_m4_quote_check:
- @prohibit='(AC_DEFINE(_UNQUOTED)?|AC_DEFUN)\([^[]' \
- in_vc_files='(^configure\.ac|\.m4)$$' \
- halt='quote the first arg to AC_DEF*' \
- $(_sc_search_regexp)
-
-fix_po_file_diag = \
-'you have changed the set of files with translatable diagnostics;\n\
-apply the above patch\n'
-
-# Generate a list of files in which to search for translatable strings.
-perl_translatable_files_list_ = \
- -e 'foreach $$file (@ARGV) {' \
- -e ' \# Consider only file extensions with one or two letters' \
- -e ' $$file =~ /\...?$$/ or next;' \
- -e ' \# Ignore m4 and mk files' \
- -e ' $$file =~ /\.m[4k]$$/ and next;' \
- -e ' \# Ignore a .c or .h file with a corresponding .l or .y file' \
- -e ' $$file =~ /(.+)\.[ch]$$/ && (-e "$${1}.l" || -e "$${1}.y")' \
- -e ' and next;' \
- -e ' \# Skip unreadable files' \
- -e ' -r $$file or next;' \
- -e ' print "$$file ";' \
- -e '}'
-
-# Verify that all source files using _() (more specifically, files that
-# match $(_gl_translatable_string_re)) are listed in po/POTFILES.in.
-po_file ?= $(srcdir)/po/POTFILES.in
-generated_files ?= $(srcdir)/lib/*.[ch]
-_gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$)
-sc_po_check:
- @if test -f $(po_file); then \
- grep -E -v '^(#|$$)' $(po_file) \
- | grep -v '^src/false\.c$$' | sort > $@-1; \
- files=$$(perl $(perl_translatable_files_list_) \
- $$($(VC_LIST_EXCEPT)) $(generated_files)); \
- grep -E -l '$(_gl_translatable_string_re)' $$files \
- | $(SED) 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2; \
- diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \
- || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \
- rm -f $@-1 $@-2; \
- fi
-
-# Sometimes it is useful to change the PATH environment variable
-# in Makefiles. When doing so, it's better not to use the Unix-centric
-# path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'.
-msg = 'Do not use ":" above; use $$(PATH_SEPARATOR) instead'
-sc_makefile_path_separator_check:
- @prohibit='PATH[=].*:' \
- in_vc_files='akefile|\.mk$$' \
- halt=$(msg) \
- $(_sc_search_regexp)
-
-# Check that 'make alpha' will not fail at the end of the process,
-# i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
-# and is read-only.
-writable-files:
- $(AM_V_GEN)if test -d $(release_archive_dir); then \
- for file in $(DIST_ARCHIVES); do \
- for p in ./ $(release_archive_dir)/; do \
- test -e $$p$$file || continue; \
- test -w $$p$$file \
- || { echo ERROR: $$p$$file is not writable; fail=1; }; \
- done; \
- done; \
- test "$$fail" && exit 1 || : ; \
- else :; \
- fi
-
-v_etc_file = $(gnulib_dir)/lib/version-etc.c
-sample-test = tests/sample-test
-texi = doc/$(PACKAGE).texi
-# Make sure that the copyright date in $(v_etc_file) is up to date.
-# Do the same for the $(sample-test) and the main doc/.texi file.
-sc_copyright_check:
- @require='enum { COPYRIGHT_YEAR = '$$(date +%Y)' };' \
- in_files=$(v_etc_file) \
- halt='out of date copyright in $(v_etc_file); update it' \
- $(_sc_search_regexp)
- @require='# Copyright \(C\) '$$(date +%Y)' Free' \
- in_vc_files=$(sample-test) \
- halt='out of date copyright in $(sample-test); update it' \
- $(_sc_search_regexp)
- @require='Copyright @copyright\{\} .*'$$(date +%Y) \
- in_vc_files=$(texi) \
- halt='out of date copyright in $(texi); update it' \
- $(_sc_search_regexp)
-
-# If tests/help-version exists and seems to be new enough, assume that its
-# use of init.sh and path_prepend_ is correct, and ensure that every other
-# use of init.sh is identical.
-# This is useful because help-version cross-checks prog --version
-# with $(VERSION), which verifies that its path_prepend_ invocation
-# sets PATH correctly. This is an inexpensive way to ensure that
-# the other init.sh-using tests also get it right.
-_hv_file ?= $(srcdir)/tests/help-version
-_hv_regex_weak ?= ^ *\. .*/init\.sh"
-# Fix syntax-highlighters "
-_hv_regex_strong ?= ^ *\. "\$${srcdir=\.}/init\.sh"
-sc_cross_check_PATH_usage_in_tests:
- @if test -f $(_hv_file); then \
- grep -l 'VERSION mismatch' $(_hv_file) >/dev/null \
- || { echo "$@: skipped: no such file: $(_hv_file)" 1>&2; \
- exit 0; }; \
- grep -lE '$(_hv_regex_strong)' $(_hv_file) >/dev/null \
- || { echo "$@: $(_hv_file) lacks conforming use of init.sh" 1>&2; \
- exit 1; }; \
- good=$$(grep -E '$(_hv_regex_strong)' $(_hv_file)); \
- grep -LFx "$$good" \
- $$(grep -lE '$(_hv_regex_weak)' $$($(VC_LIST_EXCEPT))) \
- | grep . && \
- { echo "$(ME): the above files use path_prepend_ inconsistently" \
- 1>&2; exit 1; } || :; \
- fi
-
-# BRE regex of file contents to identify a test script.
-_test_script_regex ?= \<init\.sh\>
-
-# In tests, use "compare expected actual", not the reverse.
-sc_prohibit_reversed_compare_failure:
- @prohibit='\<compare [^ ]+ ([^ ]*exp|/dev/null)' \
- containing='$(_test_script_regex)' \
- halt='reversed compare arguments' \
- $(_sc_search_regexp)
-
-# #if HAVE_... will evaluate to false for any non numeric string.
-# That would be flagged by using -Wundef, however gnulib currently
-# tests many undefined macros, and so we can't enable that option.
-# So at least preclude common boolean strings as macro values.
-sc_Wundef_boolean:
- @prohibit='^#define.*(yes|no|true|false)$$' \
- in_files='$(CONFIG_INCLUDE)' \
- halt='Use 0 or 1 for macro values' \
- $(_sc_search_regexp)
-
-# Even if you use pathmax.h to guarantee that PATH_MAX is defined, it might
-# not be constant, or might overflow a stack. In general, use PATH_MAX as
-# a limit, not an array or alloca size.
-sc_prohibit_path_max_allocation:
- @prohibit='(\balloca *\([^)]*|\[[^]]*)\bPATH_MAX' \
- halt='Avoid stack allocations of size PATH_MAX' \
- $(_sc_search_regexp)
-
-sc_vulnerable_makefile_CVE-2009-4029:
- @prohibit='perm -777 -exec chmod a\+rwx|chmod 777 \$$\(distdir\)' \
- in_files='(^|/)Makefile\.in$$' \
- halt=$$(printf '%s\n' \
- 'the above files are vulnerable; beware of running' \
- ' "make dist*" rules, and upgrade to fixed automake' \
- ' see http://bugzilla.redhat.com/542609 for details') \
- $(_sc_search_regexp)
-
-sc_vulnerable_makefile_CVE-2012-3386:
- @prohibit='chmod a\+w \$$\(distdir\)' \
- in_files='(^|/)Makefile\.in$$' \
- halt=$$(printf '%s\n' \
- 'the above files are vulnerable; beware of running' \
- ' "make distcheck", and upgrade to fixed automake' \
- ' see http://bugzilla.redhat.com/CVE-2012-3386 for details') \
- $(_sc_search_regexp)
-
-vc-diff-check:
- $(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
- $(AM_V_at)if test -s vc-diffs; then \
- cat vc-diffs; \
- echo "Some files are locally modified:" 1>&2; \
- exit 1; \
- else \
- rm vc-diffs; \
- fi
-
-rel-files = $(DIST_ARCHIVES)
-
-gnulib_dir ?= $(srcdir)/gnulib
-gnulib-version = $$(cd $(gnulib_dir) \
- && { git describe || git rev-parse --short=10 HEAD; } )
-bootstrap-tools ?= autoconf,automake,gnulib
-
-gpgv = $$(gpgv2 --version >/dev/null && echo gpgv2 || echo gpgv)
-# If it's not already specified, derive the GPG key ID from
-# the signed tag we've just applied to mark this release.
-gpg_key_ID ?= \
- $$(cd $(srcdir) \
- && git cat-file tag v$(VERSION) \
- | $(gpgv) --status-fd 1 --keyring /dev/null - - 2>/dev/null \
- | awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
-
-translation_project_ ?= coordinator at translationproject.org
-
-# Make info-gnu the default only for a stable release.
-announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
-announcement_mail_headers_stable = \
- To: info-gnu at gnu.org \
- Cc: $(announcement_Cc_) \
- Mail-Followup-To: $(PACKAGE_BUGREPORT)
-
-announcement_Cc_alpha = $(translation_project_)
-announcement_mail_headers_alpha = \
- To: $(PACKAGE_BUGREPORT) \
- Cc: $(announcement_Cc_)
-
-announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha)
-announcement_mail_headers_beta = $(announcement_mail_headers_alpha)
-
-announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
-announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type))
-announcement: NEWS ChangeLog $(rel-files)
-# Not $(AM_V_GEN) since the output of this command serves as
-# announcement message: it would start with " GEN announcement".
- $(AM_V_at)$(srcdir)/$(_build-aux)/announce-gen \
- --mail-headers='$(announcement_mail_headers_)' \
- --release-type=$(release-type) \
- --package=$(PACKAGE) \
- --prev=$(PREV_VERSION) \
- --curr=$(VERSION) \
- --gpg-key-id=$(gpg_key_ID) \
- --srcdir=$(srcdir) \
- --news=$(srcdir)/NEWS \
- --bootstrap-tools=$(bootstrap-tools) \
- $$(case ,$(bootstrap-tools), in (*,gnulib,*) \
- echo --gnulib-version=$(gnulib-version);; esac) \
- --no-print-checksums \
- $(addprefix --url-dir=, $(url_dir_list))
-
-.PHONY: release-commit
-release-commit:
- $(AM_V_GEN)cd $(srcdir) \
- && $(_build-aux)/do-release-commit-and-tag \
- -C $(abs_builddir) $(RELEASE)
-
-## ---------------- ##
-## Updating files. ##
-## ---------------- ##
-
-ftp-gnu = ftp://ftp.gnu.org/gnu
-www-gnu = http://www.gnu.org
-
-upload_dest_dir_ ?= $(PACKAGE)
-upload_command = \
- $(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \
- --to $(gnu_rel_host):$(upload_dest_dir_) \
- $(rel-files)
-emit_upload_commands:
- @echo =====================================
- @echo =====================================
- @echo '$(upload_command)'
- @echo '# send the ~/announce-$(my_distdir) e-mail'
- @echo =====================================
- @echo =====================================
-
-.PHONY: upload
-upload:
- $(AM_V_GEN)$(upload_command)
-
-define emit-commit-log
- printf '%s\n' 'maint: post-release administrivia' '' \
- '* NEWS: Add header line for next release.' \
- '* .prev-version: Record previous version.' \
- '* cfg.mk (old_NEWS_hash): Auto-update.'
-endef
-
-.PHONY: no-submodule-changes
-no-submodule-changes:
- $(AM_V_GEN)if test -d $(srcdir)/.git \
- && git --version >/dev/null 2>&1; then \
- diff=$$(cd $(srcdir) && git submodule -q foreach \
- git diff-index --name-only HEAD) \
- || exit 1; \
- case $$diff in '') ;; \
- *) echo '$(ME): submodule files are locally modified:'; \
- echo "$$diff"; exit 1;; esac; \
- else \
- : ; \
- fi
-
-submodule-checks ?= no-submodule-changes public-submodule-commit
-
-# Ensure that each sub-module commit we're using is public.
-# Without this, it is too easy to tag and release code that
-# cannot be built from a fresh clone.
-.PHONY: public-submodule-commit
-public-submodule-commit:
- $(AM_V_GEN)if test -d $(srcdir)/.git \
- && git --version >/dev/null 2>&1; then \
- cd $(srcdir) && \
- git submodule --quiet foreach \
- 'test "$$(git rev-parse "$$sha1")" \
- = "$$(git merge-base origin "$$sha1")"' \
- || { echo '$(ME): found non-public submodule commit' >&2; \
- exit 1; }; \
- else \
- : ; \
- fi
-# This rule has a high enough utility/cost ratio that it should be a
-# dependent of "check" by default. However, some of us do occasionally
-# commit a temporary change that deliberately points to a non-public
-# submodule commit, and want to be able to use rules like "make check".
-# In that case, run e.g., "make check gl_public_submodule_commit="
-# to disable this test.
-gl_public_submodule_commit ?= public-submodule-commit
-check: $(gl_public_submodule_commit)
-
-.PHONY: alpha beta stable release
-ALL_RECURSIVE_TARGETS += alpha beta stable
-alpha beta stable: $(local-check) writable-files $(submodule-checks)
- $(AM_V_GEN)test $@ = stable \
- && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
- || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
- || :
- $(AM_V_at)$(MAKE) vc-diff-check
- $(AM_V_at)$(MAKE) news-check
- $(AM_V_at)$(MAKE) distcheck
- $(AM_V_at)$(MAKE) dist
- $(AM_V_at)$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
- $(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
-
-release:
- $(AM_V_GEN)$(MAKE) _version
- $(AM_V_GEN)$(MAKE) $(release-type)
-
-# Override this in cfg.mk if you follow different procedures.
-release-prep-hook ?= release-prep
-
-gl_noteworthy_news_ = * Noteworthy changes in release ?.? (????-??-??) [?]
-.PHONY: release-prep
-release-prep:
- $(AM_V_GEN)$(MAKE) --no-print-directory -s announcement \
- > ~/announce-$(my_distdir)
- $(AM_V_at)if test -d $(release_archive_dir); then \
- ln $(rel-files) $(release_archive_dir); \
- chmod a-w $(rel-files); \
- fi
- $(AM_V_at)echo $(VERSION) > $(prev_version_file)
- $(AM_V_at)$(MAKE) update-NEWS-hash
- $(AM_V_at)perl -pi \
- -e '$$. == 3 and print "$(gl_noteworthy_news_)\n\n\n"' \
- $(srcdir)/NEWS
- $(AM_V_at)msg=$$($(emit-commit-log)) || exit 1; \
- cd $(srcdir) && $(VC) commit -m "$$msg" -a
-
-# Override this with e.g., -s $(srcdir)/some_other_name.texi
-# if the default $(PACKAGE)-derived name doesn't apply.
-gendocs_options_ ?=
-
-.PHONY: web-manual
-web-manual:
- $(AM_V_GEN)test -z "$(manual_title)" \
- && { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
- $(AM_V_at)cd '$(srcdir)/doc'; \
- $(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \
- -o '$(abs_builddir)/doc/manual' \
- --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
- "$(PACKAGE_NAME) - $(manual_title)"
- $(AM_V_at)echo " *** Upload the doc/manual directory to web-cvs."
-
-.PHONY: web-manual-update
-web-manual-update:
- $(AM_V_GEN)cd $(srcdir) \
- && $(_build-aux)/gnu-web-doc-update -C $(abs_builddir)
-
-
-# Code Coverage
-
-init-coverage:
- $(MAKE) $(AM_MAKEFLAGS) clean
- lcov --directory . --zerocounters
-
-COVERAGE_CCOPTS ?= "-g --coverage"
-COVERAGE_OUT ?= doc/coverage
-
-build-coverage:
- $(MAKE) $(AM_MAKEFLAGS) CFLAGS=$(COVERAGE_CCOPTS) CXXFLAGS=$(COVERAGE_CCOPTS)
- $(MAKE) $(AM_MAKEFLAGS) CFLAGS=$(COVERAGE_CCOPTS) CXXFLAGS=$(COVERAGE_CCOPTS) check
- mkdir -p $(COVERAGE_OUT)
- lcov --directory . --output-file $(COVERAGE_OUT)/$(PACKAGE).info \
- --capture
-
-gen-coverage:
- genhtml --output-directory $(COVERAGE_OUT) \
- $(COVERAGE_OUT)/$(PACKAGE).info \
- --highlight --frames --legend \
- --title "$(PACKAGE_NAME)"
-
-coverage: init-coverage build-coverage gen-coverage
-
-# Some projects carry local adjustments for gnulib modules via patches in
-# a gnulib patch directory whose default name is gl/ (defined in bootstrap
-# via local_gl_dir=gl). Those patches become stale as the originals evolve
-# in gnulib. Use this rule to refresh any stale patches. It applies each
-# patch to the original in $(gnulib_dir) and uses the temporary result to
-# generate a fuzz-free .diff file. If you customize the name of your local
-# gnulib patch directory via bootstrap.conf, this rule detects that name.
-# Run this from a non-VPATH (i.e., srcdir) build directory.
-.PHONY: refresh-gnulib-patches
-refresh-gnulib-patches:
- gl=gl; \
- if test -f bootstrap.conf; then \
- t=$$(perl -lne '/^\s*local_gl_dir=(\S+)/ and $$d=$$1;' \
- -e 'END{defined $$d and print $$d}' bootstrap.conf); \
- test -n "$$t" && gl=$$t; \
- fi; \
- for diff in $$(cd $$gl; git ls-files | grep '\.diff$$'); do \
- b=$$(printf %s "$$diff"|$(SED) 's/\.diff$$//'); \
- VERSION_CONTROL=none \
- patch "$(gnulib_dir)/$$b" "$$gl/$$diff" || exit 1; \
- ( cd $(gnulib_dir) || exit 1; \
- git diff "$$b" > "../$$gl/$$diff"; \
- git checkout $$b ) || exit 1; \
- done
-
-# Update gettext files.
-PACKAGE ?= $(shell basename $(PWD))
-PO_DOMAIN ?= $(PACKAGE)
-POURL = http://translationproject.org/latest/$(PO_DOMAIN)/
-PODIR ?= po
-refresh-po:
- rm -f $(PODIR)/*.po && \
- echo "$(ME): getting translations into po (please ignore the robots.txt ERROR 404)..." && \
- wget --no-verbose --directory-prefix $(PODIR) --no-directories --recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
- echo 'en at boldquot' > $(PODIR)/LINGUAS && \
- echo 'en at quot' >> $(PODIR)/LINGUAS && \
- ls $(PODIR)/*.po | $(SED) 's/\.po//;s,$(PODIR)/,,' | \
- sort >> $(PODIR)/LINGUAS
-
- # Running indent once is not idempotent, but running it twice is.
-INDENT_SOURCES ?= $(C_SOURCES)
-.PHONY: indent
-indent:
- indent $(INDENT_SOURCES)
- indent $(INDENT_SOURCES)
-
-# If you want to set UPDATE_COPYRIGHT_* environment variables,
-# put the assignments in this variable.
-update-copyright-env ?=
-
-# Run this rule once per year (usually early in January)
-# to update all FSF copyright year lists in your project.
-# If you have an additional project-specific rule,
-# add it in cfg.mk along with a line 'update-copyright: prereq'.
-# By default, exclude all variants of COPYING; you can also
-# add exemptions (such as ChangeLog..* for rotated change logs)
-# in the file .x-update-copyright.
-.PHONY: update-copyright
-update-copyright:
- $(AM_V_GEN)grep -l -w Copyright \
- $$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \
- | $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@
-
-# This tight_scope test is skipped with a warning if $(_gl_TS_headers) is not
-# overridden and $(_gl_TS_dir)/Makefile.am does not mention noinst_HEADERS.
-
-# NOTE: to override any _gl_TS_* default value, you must
-# define the variable(s) using "export" in cfg.mk.
-_gl_TS_dir ?= src
-
-ALL_RECURSIVE_TARGETS += sc_tight_scope
-sc_tight_scope: tight-scope.mk
- @fail=0; \
- if ! grep '^ *export _gl_TS_headers *=' $(srcdir)/cfg.mk \
- > /dev/null \
- && ! grep -w noinst_HEADERS $(srcdir)/$(_gl_TS_dir)/Makefile.am \
- > /dev/null 2>&1; then \
- echo '$(ME): skipping $@'; \
- else \
- $(MAKE) -s -C $(_gl_TS_dir) \
- -f Makefile \
- -f $(abs_top_srcdir)/cfg.mk \
- -f $(abs_top_builddir)/$< \
- _gl_tight_scope \
- || fail=1; \
- fi; \
- rm -f $<; \
- exit $$fail
-
-tight-scope.mk: $(ME)
- @rm -f $@ $@-t
- @perl -ne '/^# TS-start/.../^# TS-end/ and print' $(srcdir)/$(ME) > $@-t
- @chmod a=r $@-t && mv $@-t $@
-
-ifeq (a,b)
-# TS-start
-
-# Most functions should have static scope.
-# Any that don't must be marked with 'extern', but 'main'
-# and 'usage' are exceptions: they're always extern, but
-# do not need to be marked. Symbols matching '__.*' are
-# reserved by the compiler, so are automatically excluded below.
-_gl_TS_unmarked_extern_functions ?= main usage
-_gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\w+) *\(/
-
-# If your project uses a macro like "XTERN", then put
-# the following in cfg.mk to override this default:
-# export _gl_TS_extern = extern|XTERN
-_gl_TS_extern ?= extern
-
-# The second nm|grep checks for file-scope variables with 'extern' scope.
-# Without gnulib's progname module, you might put program_name here.
-# Symbols matching '__.*' are reserved by the compiler,
-# so are automatically excluded below.
-_gl_TS_unmarked_extern_vars ?=
-
-# NOTE: the _match variables are perl expressions -- not mere regular
-# expressions -- so that you can extend them to match other patterns
-# and easily extract matched variable names.
-# For example, if your project declares some global variables via
-# a macro like this: GLOBAL(type, var_name, initializer), then you
-# can override this definition to automatically extract those names:
-# export _gl_TS_var_match = \
-# /^(?:$(_gl_TS_extern)) .*?\**(\w+)(\[.*?\])?;/ || /\bGLOBAL\(.*?,\s*(.*?),/
-_gl_TS_var_match ?= /^(?:$(_gl_TS_extern)) .*?(\w+)(\[.*?\])?;/
-
-# The names of object files in (or relative to) $(_gl_TS_dir).
-_gl_TS_obj_files ?= *.$(OBJEXT)
-
-# Files in which to search for the one-line style extern declarations.
-# $(_gl_TS_dir)-relative.
-_gl_TS_headers ?= $(noinst_HEADERS)
-_gl_TS_other_headers ?= *.h
-
-.PHONY: _gl_tight_scope
-_gl_tight_scope: $(bin_PROGRAMS)
- sed_wrap='s/^/^_?/;s/$$/$$/'; \
- t=exceptions-$$$$; \
- trap 's=$$?; rm -f $$t; exit $$s' 0; \
- for sig in 1 2 3 13 15; do \
- eval "trap 'v=`expr $$sig + 128`; (exit $$v); exit $$v' $$sig"; \
- done; \
- src=`for f in $(SOURCES); do \
- test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`; \
- hdr=`for f in $(_gl_TS_headers); do \
- test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`; \
- ( printf '%s\n' '__.*' $(_gl_TS_unmarked_extern_functions); \
- grep -h -A1 '^extern .*[^;]$$' $$src \
- | grep -vE '^(extern |--|#)' | $(SED) 's/ .*//; /^$$/d'; \
- perl -lne \
- '$(_gl_TS_function_match) and print $$1' $$hdr; \
- ) | sort -u | $(SED) "$$sed_wrap" > $$t; \
- nm -g $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
- && { echo the above functions should have static scope >&2; \
- exit 1; } || : ; \
- ( printf '%s\n' '__.*' main $(_gl_TS_unmarked_extern_vars); \
- perl -lne '$(_gl_TS_var_match) and print $$1' \
- $$hdr $(_gl_TS_other_headers) \
- ) | sort -u | $(SED) "$$sed_wrap" > $$t; \
- nm -g $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \
- | sort -u | grep -Ev -f $$t \
- && { echo the above variables should have static scope >&2; \
- exit 1; } || :
-# TS-end
-endif
diff --git a/server/Makefile.am b/server/Makefile.am
deleted file mode 100644
index de11cbc3..00000000
--- a/server/Makefile.am
+++ /dev/null
@@ -1,226 +0,0 @@
-NULL =
-SUBDIRS = . tests
-
-check-valgrind:
- $(MAKE) -C tests check-valgrind
-
-AM_CPPFLAGS = \
- -DSPICE_SERVER_INTERNAL \
- $(COMMON_CFLAGS) \
- $(GLIB2_CFLAGS) \
- $(GOBJECT2_CFLAGS) \
- $(LZ4_CFLAGS) \
- $(PIXMAN_CFLAGS) \
- $(SASL_CFLAGS) \
- $(SLIRP_CFLAGS) \
- $(SMARTCARD_CFLAGS) \
- $(GSTREAMER_0_10_CFLAGS) \
- $(GSTREAMER_1_0_CFLAGS) \
- $(SPICE_PROTOCOL_CFLAGS) \
- $(SSL_CFLAGS) \
- $(VISIBILITY_HIDDEN_CFLAGS) \
- $(WARN_CFLAGS) \
- $(ORC_CFLAGS) \
- $(NULL)
-
-noinst_LTLIBRARIES = libserver.la
-lib_LTLIBRARIES = libspice-server.la
-
-libspice_server_la_LDFLAGS = \
- -version-info $(SPICE_LT_VERSION) \
- -no-undefined \
- $(RELRO_LDFLAGS) \
- $(NO_INDIRECT_LDFLAGS) \
- $(NULL)
-
-if HAVE_LD_VERSION_SCRIPT
-libspice_server_la_LDFLAGS += \
- -Wl,--version-script=$(srcdir)/spice-server.syms
-EXTRA_libspice_server_la_DEPENDENCIES = $(srcdir)/spice-server.syms
-endif
-
-libserver_la_LIBADD = \
- $(top_builddir)/spice-common/common/libspice-common.la \
- $(top_builddir)/spice-common/common/libspice-common-server.la \
- $(GL_LIBS) \
- $(GLIB2_LIBS) \
- $(GOBJECT2_LIBS) \
- $(JPEG_LIBS) \
- $(LZ4_LIBS) \
- $(LIBRT) \
- $(PIXMAN_LIBS) \
- $(SASL_LIBS) \
- $(SLIRP_LIBS) \
- $(GSTREAMER_0_10_LIBS) \
- $(GSTREAMER_1_0_LIBS) \
- $(SSL_LIBS) \
- $(Z_LIBS) \
- $(SPICE_NONPKGCONFIG_LIBS) \
- $(ORC_LIBS) \
- $(NULL)
-
-libspice_serverincludedir = $(includedir)/spice-server
-libspice_serverinclude_HEADERS = \
- spice-audio.h \
- spice-char.h \
- spice-core.h \
- spice-experimental.h \
- spice-input.h \
- spice-migration.h \
- spice-qxl.h \
- spice-server.h \
- spice-version.h \
- spice-replay.h \
- spice.h \
- $(NULL)
-
-spice_built_sources = spice-server-enums.h spice-server-enums.c
-
-libserver_la_SOURCES = \
- $(libspice_serverinclude_HEADERS) \
- $(spice_built_sources) \
- agent-msg-filter.c \
- agent-msg-filter.h \
- cache-item.h \
- char-device.c \
- char-device.h \
- common-graphics-channel.c \
- common-graphics-channel.h \
- cursor-channel.c \
- cursor-channel-client.c \
- cursor-channel-client.h \
- cursor-channel.h \
- dcc.c \
- dcc.h \
- dcc-private.h \
- dcc-send.c \
- demarshallers.h \
- dispatcher.c \
- dispatcher.h \
- display-channel.c \
- display-channel.h \
- display-channel-private.h \
- display-limits.h \
- event-loop.c \
- glib-compat.h \
- glz-encoder.c \
- glz-encoder-dict.c \
- glz-encoder-dict.h \
- glz-encoder.h \
- glz-encoder-priv.h \
- image-cache.c \
- image-cache.h \
- image-encoders.c \
- image-encoders.h \
- inputs-channel.c \
- inputs-channel-client.c \
- inputs-channel-client.h \
- inputs-channel.h \
- jpeg-encoder.c \
- jpeg-encoder.h \
- main-channel.c \
- main-channel-client.c \
- main-channel-client.h \
- main-channel.h \
- main-dispatcher.c \
- main-dispatcher.h \
- memslot.c \
- memslot.h \
- migration-protocol.h \
- mjpeg-encoder.c \
- net-utils.c \
- net-utils.h \
- pixmap-cache.c \
- pixmap-cache.h \
- red-channel.c \
- red-channel-capabilities.c \
- red-channel-capabilities.h \
- red-channel-client.c \
- red-channel-client.h \
- red-channel.h \
- red-client.c \
- red-client.h \
- red-common.h \
- red-parse-qxl.c \
- red-parse-qxl.h \
- red-pipe-item.c \
- red-pipe-item.h \
- red-qxl.c \
- red-qxl.h \
- red-record-qxl.c \
- red-record-qxl.h \
- red-replay-qxl.c \
- reds.c \
- reds.h \
- reds-private.h \
- red-stream.c \
- red-stream.h \
- red-worker.c \
- red-worker.h \
- sound.c \
- sound.h \
- spice-bitmap-utils.c \
- spice-bitmap-utils.h \
- spicevmc.c \
- stat-file.c \
- stat-file.h \
- stat.h \
- stream-channel.c \
- stream-channel.h \
- red-stream-device.c \
- red-stream-device.h \
- sw-canvas.c \
- tree.c \
- tree.h \
- utils.c \
- utils.h \
- video-encoder.h \
- video-stream.c \
- video-stream.h \
- zlib-encoder.c \
- zlib-encoder.h \
- $(NULL)
-
-if HAVE_LZ4
-libserver_la_SOURCES += \
- lz4-encoder.c \
- lz4-encoder.h \
- $(NULL)
-endif
-
-if HAVE_SMARTCARD
-libserver_la_SOURCES += \
- smartcard.c \
- smartcard.h \
- smartcard-channel-client.c \
- smartcard-channel-client.h \
- $(NULL)
-endif
-
-if HAVE_GSTREAMER
-libserver_la_SOURCES += \
- gstreamer-encoder.c \
- $(NULL)
-endif
-
-libspice_server_la_LIBADD = libserver.la
-libspice_server_la_SOURCES =
-
-spice-server-enums.c: spice-server.h spice-server-enums.c.tmpl
- $(AM_V_GEN)glib-mkenums --template $(srcdir)/spice-server-enums.c.tmpl $< > $@
-
-spice-server-enums.h: spice-server.h spice-server-enums.h.tmpl
- $(AM_V_GEN)glib-mkenums --template $(srcdir)/spice-server-enums.h.tmpl $< > $@
-
-EXTRA_DIST = \
- meson.build \
- spice-bitmap-utils.tmpl.c \
- cache-item.tmpl.c \
- glz-encode-match.tmpl.c \
- glz-encode.tmpl.c \
- spice-server.syms \
- spice-server-enums.h.tmpl \
- spice-server-enums.c.tmpl \
- $(NULL)
-
-BUILT_SOURCES = $(spice_built_sources)
diff --git a/server/spice-server-enums.c.tmpl b/server/spice-server-enums.c.tmpl
deleted file mode 100644
index 57b688d8..00000000
--- a/server/spice-server-enums.c.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*** BEGIN file-header ***/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib-object.h>
-
-#include "spice-server-enums.h"
-#include "spice-server.h"
-
-/*** END file-header ***/
-
-/*** BEGIN value-header ***/
-static const G at Type@Value _ at enum_name@_values[] = {
-/*** END value-header ***/
-
-/*** BEGIN value-production ***/
- { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
-/*** END value-production ***/
-
-/*** BEGIN value-tail ***/
- { 0, NULL, NULL }
-};
-
-GType
- at enum_name@_get_type (void)
-{
- static GType type = 0;
- static volatile gsize type_volatile = 0;
-
- if (g_once_init_enter(&type_volatile)) {
- type = g_ at type@_register_static ("@EnumName@", _ at enum_name@_values);
- g_once_init_leave(&type_volatile, type);
- }
-
- return type;
-}
-
-/*** END value-tail ***/
diff --git a/server/spice-server-enums.h.tmpl b/server/spice-server-enums.h.tmpl
deleted file mode 100644
index 6d6240e7..00000000
--- a/server/spice-server-enums.h.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*** BEGIN file-header ***/
-#ifndef SPICE_SERVER_ENUMS_H
-#define SPICE_SERVER_ENUMS_H
-
-G_BEGIN_DECLS
-
-/*** END file-header ***/
-
-/*** BEGIN enumeration-production ***/
-#define SPICE_TYPE_ at ENUMSHORT@ @enum_name at _get_type()
-GType @enum_name at _get_type (void);
-/*** END enumeration-production ***/
-
-/*** BEGIN file-tail ***/
-
-G_END_DECLS
-
-#endif /* SPICE_SERVER_ENUMS_H */
-/*** END file-tail ***/
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
deleted file mode 100644
index ea7074bf..00000000
--- a/server/tests/Makefile.am
+++ /dev/null
@@ -1,150 +0,0 @@
-NULL =
-
- at VALGRIND_CHECK_RULES@
-VALGRIND_SUPPRESSIONS_FILES = $(srcdir)/valgrind/glib.supp
-EXTRA_DIST = \
- $(VALGRIND_SUPPRESSIONS_FILES) \
- meson.build \
- pki/ca-cert.pem \
- pki/server-cert.pem \
- pki/server-key.pem \
- $(NULL)
-
-AM_CPPFLAGS = \
- -DSPICE_TOP_SRCDIR=\"$(abs_top_srcdir)\"\
- -I$(top_srcdir) \
- -I$(top_srcdir)/server \
- -I$(top_builddir)/server \
- -I$(top_srcdir)/server/tests \
- $(COMMON_CFLAGS) \
- $(GIO_UNIX_CFLAGS) \
- $(GLIB2_CFLAGS) \
- $(GOBJECT2_CFLAGS) \
- $(SMARTCARD_CFLAGS) \
- $(SPICE_NONPKGCONFIG_CFLAGS) \
- $(SPICE_PROTOCOL_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-
-noinst_LIBRARIES = libtest.a
-
-libtest_a_SOURCES = \
- basic-event-loop.c \
- basic-event-loop.h \
- test-display-base.c \
- test-display-base.h \
- test-glib-compat.c \
- test-glib-compat.h \
- $(NULL)
-
-LDADD = \
- libtest.a \
- $(top_builddir)/spice-common/common/libspice-common.la \
- $(top_builddir)/server/libserver.la \
- $(GIO_UNIX_LIBS) \
- $(GLIB2_LIBS) \
- $(GOBJECT2_LIBS) \
- $(SPICE_NONPKGCONFIG_LIBS) \
- $(NULL)
-
-check_PROGRAMS = \
- test-codecs-parsing \
- test-options \
- test-stat \
- test-stream \
- test-agent-msg-filter \
- test-loop \
- test-qxl-parsing \
- test-stat-file \
- test-leaks \
- test-vdagent \
- test-fail-on-null-core-interface \
- test-empty-success \
- test-channel \
- test-stream-device \
- test-listen \
- $(NULL)
-
-noinst_PROGRAMS = \
- test-display-no-ssl \
- test-display-streaming \
- test-playback \
- test-display-resolution-changes \
- test-two-servers \
- test-display-width-stride \
- $(check_PROGRAMS) \
- $(NULL)
-
-TESTS = $(check_PROGRAMS) \
- $(NULL)
-
-## spice-server-replay
-
-noinst_PROGRAMS += spice-server-replay
-
-spice_server_replay_SOURCES = replay.c \
- ../event-loop.c \
- basic-event-loop.c \
- basic-event-loop.h
-
-spice_server_replay_LDADD = \
- $(top_builddir)/spice-common/common/libspice-common.la \
- $(top_builddir)/server/libspice-server.la \
- $(GLIB2_LIBS) \
- $(GOBJECT2_LIBS) \
- $(SPICE_NONPKGCONFIG_LIBS) \
- $(NULL)
-
-## test-stat
-
-noinst_LIBRARIES += \
- libtest-stat1.a \
- libtest-stat2.a \
- libtest-stat3.a \
- libtest-stat4.a \
- $(NULL)
-
-test_stat_SOURCES = test-stat.c
-test_stat_LDADD = \
- libtest-stat1.a \
- libtest-stat2.a \
- libtest-stat3.a \
- libtest-stat4.a \
- $(LDADD) \
- $(NULL)
-
-libtest_stat1_a_SOURCES = stat-test.c
-libtest_stat1_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=0 -DTEST_RED_WORKER_STAT=0 -DTEST_NAME=stat_test1
-
-libtest_stat2_a_SOURCES = stat-test.c
-libtest_stat2_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=0 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test2
-
-libtest_stat3_a_SOURCES = stat-test.c
-libtest_stat3_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=0 -DTEST_NAME=stat_test3
-
-libtest_stat4_a_SOURCES = stat-test.c
-libtest_stat4_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test4
-
-## test-gst (helper) and video-encoders (test)
-
-if HAVE_GSTREAMER
-noinst_PROGRAMS += test-gst
-
-if ENABLE_EXTRA_CHECKS
-TESTS += video-encoders
-endif
-
-test_gst_SOURCES = test-gst.c \
- $(NULL)
-test_gst_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- $(GSTREAMER_0_10_CFLAGS) \
- $(GSTREAMER_1_0_CFLAGS) \
- $(NULL)
-endif
-
-EXTRA_DIST += video-encoders
-
-if HAVE_SASL
-check_PROGRAMS += test-sasl
-endif
diff --git a/spice-common b/spice-common
deleted file mode 160000
index 4c2d0e97..00000000
--- a/spice-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4c2d0e977272c5540634d24f485dd64c424f6748
diff --git a/spice-server.pc.in b/spice-server.pc.in
deleted file mode 100644
index 6514c44a..00000000
--- a/spice-server.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: spice
-Description: SPICE server library
-Version: @VERSION@
-
-Requires: spice-protocol >= @SPICE_PROTOCOL_MIN_VER@
-Requires.private: @SPICE_REQUIRES@
-Libs: -L${libdir} -lspice-server
-Libs.private: @SPICE_NONPKGCONFIG_LIBS@
-Cflags: -I${includedir}/spice-server
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index cfb0a213..00000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-NULL =
-
-AM_CPPFLAGS = \
- $(COMMON_CFLAGS) \
- $(SPICE_PROTOCOL_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-
-AM_LDFLAGS = \
- $(LIBRT) \
- $(NULL)
-
-noinst_PROGRAMS = \
- reds_stat \
- $(NULL)
-
-reds_stat_SOURCES = \
- reds_stat.c \
- $(NULL)
-
-EXTRA_DIST = \
- meson.build \
- $(NULL)
--
2.14.3
More information about the Spice-devel
mailing list