diff options
author | Jens Georg <mail@jensge.org> | 2021-06-12 21:44:11 +0200 |
---|---|---|
committer | Jens Georg <mail@jensge.org> | 2021-06-12 21:44:19 +0200 |
commit | 4a1e42fce8c7e515977c5b14ab59f0cecc9e727e (patch) | |
tree | 1d8c7ad54e24e8af706c6d9fbc84799961f2cc92 | |
parent | 8b01d2c7f85e78933c6972446666a84914717136 (diff) | |
download | gupnp-av-4a1e42fce8c7e515977c5b14ab59f0cecc9e727e.tar.gz |
build: Drop autotools
-rw-r--r-- | ChangeLog | 0 | ||||
-rw-r--r-- | Makefile.am | 12 | ||||
-rwxr-xr-x | autogen.sh | 45 | ||||
-rw-r--r-- | configure.ac | 94 | ||||
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | doc/Makefile.am | 90 | ||||
-rw-r--r-- | gupnp-av-1.0-uninstalled.pc.in | 10 | ||||
-rw-r--r-- | gupnp-av-1.0.pc.in | 10 | ||||
-rw-r--r-- | libgupnp-av/Makefile.am | 142 | ||||
-rw-r--r-- | m4/ax_append_compile_flags.m4 | 65 | ||||
-rw-r--r-- | m4/ax_append_flag.m4 | 71 | ||||
-rw-r--r-- | m4/ax_check_compile_flag.m4 | 74 | ||||
-rw-r--r-- | m4/ax_check_enable_debug.m4 | 113 | ||||
-rw-r--r-- | m4/ax_compiler_flags.m4 | 158 | ||||
-rw-r--r-- | m4/ax_compiler_flags_cflags.m4 | 133 | ||||
-rw-r--r-- | m4/ax_compiler_flags_gir.m4 | 60 | ||||
-rw-r--r-- | m4/ax_compiler_flags_ldflags.m4 | 75 | ||||
-rw-r--r-- | m4/ax_is_release.m4 | 69 | ||||
-rw-r--r-- | m4/ax_require_defined.m4 | 37 | ||||
-rw-r--r-- | m4/introspection.m4 | 94 | ||||
-rw-r--r-- | m4/vapigen.m4 | 43 | ||||
-rw-r--r-- | tests/Makefile.am | 40 | ||||
-rw-r--r-- | tests/gtest/Makefile.am | 50 | ||||
-rw-r--r-- | vala/Makefile.am | 23 |
24 files changed, 0 insertions, 1510 deletions
diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 --- a/ChangeLog +++ /dev/null diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 8932111..0000000 --- a/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -SUBDIRS = libgupnp-av tests doc vala data - -pkgconfig_DATA= gupnp-av-1.0.pc -pkgconfigdir = $(libdir)/pkgconfig - -ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS} - -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection - -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing config.h.in -EXTRA_DIST = meson.build meson_options.txt diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 26308b4..0000000 --- a/autogen.sh +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2011 Javier Jardón <jjardon@gnome.org> -# -# This file is part of GUPnP-AV. -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This library 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` -cd "$srcdir" - -GTKDOCIZE=`which gtkdocize` -if test -z $GTKDOCIZE; then - echo "*** No GTK-Doc found, please install it ***" - exit 1 -fi - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please install it ***" - exit 1 -fi - -mkdir -p m4 - -gtkdocize || exit $? -autoreconf --force --install --verbose || exit $? - -cd "$olddir" -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/configure.ac b/configure.ac deleted file mode 100644 index adb6860..0000000 --- a/configure.ac +++ /dev/null @@ -1,94 +0,0 @@ -AC_PREREQ([2.63]) -AC_INIT([gupnp-av], - [0.12.12], - [https://bugzilla.gnome.org/enter_bug.cgi?product=GUPnP], - [gupnp-av], - [http://www.gupnp.org/]) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SRCDIR(libgupnp-av/gupnp-av.h) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) - -AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz -Wno-portability]) -AM_MAINTAINER_MODE([enable]) - -AM_SILENT_RULES([yes]) - -AX_REQUIRE_DEFINED([GTK_DOC_CHECK]) -AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK]) -AX_CHECK_ENABLE_DEBUG([yes]) - -# Check for programs -AC_PROG_CC -AM_PROG_CC_C_O -AC_HEADER_STDC -AC_FUNC_MMAP - -AX_IS_RELEASE([git-directory]) -AX_COMPILER_FLAGS([WARN_CFLAGS]) - -# Initialize libtool -LT_PREREQ([2.2]) -LT_INIT([win32-dll]) - -PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.58 \ - libxml-2.0) - -# glib-genmarshal -GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` -AC_SUBST(GLIB_GENMARSHAL) - -# Debugging -AC_ARG_ENABLE(debug, - [ --enable-debug enable debugging],, - enable_debug=no) -if test "x$enable_debug" = "xyes"; then - CFLAGS="$CFLAGS -g -Wall" -fi - -GOBJECT_INTROSPECTION_CHECK([0.9.5]) - -# vapigen -have_vapigen=no -AS_IF([test "x$found_introspection" = "xyes"], - [ - dnl output of g-i >= 1.36.0 needs vapigen >= 0.20 to process - AC_MSG_CHECKING([whether G-I is 1.36 or newer]) - VAPIGEN_MIN_VERSION=0.14 - AS_IF([pkg-config --atleast-version=1.36.0 gobject-introspection-1.0], - [ - AC_MSG_RESULT([yes]) - VAPIGEN_MIN_VERSION=0.22 - ],[AC_MSG_RESULT([no])] - ) - GUPNP_PROG_VAPIGEN([$VAPIGEN_MIN_VERSION]) - ] -) -AS_IF([test "x$VAPIGEN" != "x"], [have_vapigen=yes]) -AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VAPIGEN" != "x"]) - -GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) - -AC_CONFIG_FILES([ -Makefile -libgupnp-av/Makefile -tests/Makefile -tests/gtest/Makefile -doc/Makefile -doc/version.xml -data/Makefile -vala/Makefile -gupnp-av-1.0.pc -gupnp-av-1.0-uninstalled.pc -]) -AC_OUTPUT - -echo " - ${PACKAGE} ${VERSION} - --------------------- - - Prefix: ${prefix} - GObject-Introspection: ${found_introspection} - VALA bindings: ${have_vapigen} -" diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 625d366..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = meson.build -dist_pkgdata_DATA = didl-lite-v2.xsd upnp.xsd av.xsd xml.xsd simpledc20021212.xsd diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index eae5f5a..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -## Process this file with automake to produce Makefile.in - -# We require automake 1.6 at least. -AUTOMAKE_OPTIONS = 1.6 - -export GUPNP_AV_DATADIR := $(top_srcdir)/data - -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name of the module, e.g. 'glib'. -DOC_MODULE=gupnp-av - -# The top-level SGML file. You can change this if you want to. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml - -# The directory containing the source code. Relative to $(srcdir). -# gtk-doc will search all .c & .h files beneath here for inline comments -# documenting the functions and macros. -# e.g. DOC_SOURCE_DIR=../../../gtk -DOC_SOURCE_DIR=../libgupnp-av - -# Extra options to pass to gtkdoc-scangobj. Not normally needed. -SCANGOBJ_OPTIONS= - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--deprecated-guards="GUPNP_DISABLE_DEPRECATED" - -# Extra options to supply to gtkdoc-mkdb. -# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mktmpl -# e.g. MKTMPL_OPTIONS=--only-section-tmpl -MKTMPL_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Not normally needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS= - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/libgupnp-av/*.h -CFILE_GLOB=$(top_srcdir)/libgupnp-av/*.c - -# Header files to ignore when scanning. -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES= \ - xml-util.h \ - xsd-data.h \ - fragment-util.h \ - gvalue-util.h \ - gupnp-av-marshal.h \ - gupnp-didl-lite-contributor-private.h \ - gupnp-didl-lite-descriptor-private.h \ - gupnp-didl-lite-object-private.h \ - gupnp-didl-lite-resource-private.h - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES= - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files=version.xml - -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded -# These files must be listed here *and* in content_files -# e.g. expand_content_files=running.sgml -expand_content_files= - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -AM_CPPFLAGS = -I$(top_srcdir) -AM_CFLAGS = $(LIBGUPNP_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/libgupnp-av/libgupnp-av-1.0.la $(LIBGUPNP_LIBS) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -# e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST += version.xml.in meson.build diff --git a/gupnp-av-1.0-uninstalled.pc.in b/gupnp-av-1.0-uninstalled.pc.in deleted file mode 100644 index a98028a..0000000 --- a/gupnp-av-1.0-uninstalled.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix= -exec_prefix= -libdir=${pcfiledir}/libgupnp-av -includedir=${pcfiledir}/ - -Name: gupnp-av-1.0 -Description: GObject-based AV specific UPnP library -Version: @VERSION@ -Libs: ${libdir}/libgupnp-av-1.0.la -Cflags: -I${includedir} diff --git a/gupnp-av-1.0.pc.in b/gupnp-av-1.0.pc.in deleted file mode 100644 index 8db8b4f..0000000 --- a/gupnp-av-1.0.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: gupnp-av-1.0 -Description: GObject-based AV specific UPnP library -Version: @VERSION@ -Libs: -L${libdir} -lgupnp-av-1.0 -Cflags: -I${includedir}/gupnp-av-1.0 diff --git a/libgupnp-av/Makefile.am b/libgupnp-av/Makefile.am deleted file mode 100644 index a379526..0000000 --- a/libgupnp-av/Makefile.am +++ /dev/null @@ -1,142 +0,0 @@ -# Version format current:revision:age -# 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 since the last public release, then set -# age to 0. -LTVERSION = 2:0:0 - -AM_CFLAGS = $(LIBGUPNP_CFLAGS) -I$(top_srcdir) -DDATADIR="\"$(pkgdatadir)\"" $(WARN_CFLAGS) - -libgupnp_av_incdir = $(includedir)/gupnp-av-1.0/libgupnp-av - -lib_LTLIBRARIES = libgupnp-av-1.0.la - -libgupnp_av_inc_HEADERS = gupnp-didl-lite-object.h \ - gupnp-didl-lite-item.h \ - gupnp-didl-lite-container.h \ - gupnp-didl-lite-createclass.h \ - gupnp-didl-lite-parser.h \ - gupnp-didl-lite-resource.h \ - gupnp-didl-lite-descriptor.h \ - gupnp-didl-lite-contributor.h \ - gupnp-didl-lite-writer.h \ - gupnp-protocol-info.h \ - gupnp-search-criteria-parser.h \ - gupnp-last-change-parser.h \ - gupnp-cds-last-change-parser.h \ - gupnp-media-collection.h \ - gupnp-feature.h \ - gupnp-feature-list-parser.h \ - gupnp-dlna.h \ - gupnp-av-error.h \ - gupnp-av.h \ - gupnp-av-enums.h - - -gupnp-av-marshal.c: gupnp-av-marshal.list - $(AM_V_GEN) \ - $(GLIB_GENMARSHAL) --prefix=gupnp_av_marshal $(srcdir)/gupnp-av-marshal.list --header --body > gupnp-av-marshal.c - -gupnp-av-marshal.h: gupnp-av-marshal.list - $(AM_V_GEN) \ - $(GLIB_GENMARSHAL) --prefix=gupnp_av_marshal $(srcdir)/gupnp-av-marshal.list --header > gupnp-av-marshal.h - -BUILT_SOURCES = gupnp-av-marshal.c gupnp-av-marshal.h - -libgupnp_av_1_0_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined $(WARN_LDFLAGS) - -libgupnp_av_1_0_la_SOURCES = gupnp-didl-lite-object.c \ - gupnp-didl-lite-object-private.h \ - gupnp-didl-lite-item.c \ - gupnp-didl-lite-container.c \ - gupnp-didl-lite-createclass.c \ - gupnp-didl-lite-createclass-private.h \ - gupnp-didl-lite-parser.c \ - gupnp-didl-lite-parser-private.h \ - gupnp-didl-lite-resource.c \ - gupnp-didl-lite-resource-private.h \ - gupnp-didl-lite-descriptor.c \ - gupnp-didl-lite-descriptor-private.h \ - gupnp-didl-lite-contributor.c \ - gupnp-didl-lite-contributor-private.h \ - gupnp-didl-lite-writer.c \ - gupnp-didl-lite-writer-private.h \ - gupnp-protocol-info.c \ - gupnp-search-criteria-parser.c \ - gupnp-last-change-parser.c \ - gupnp-cds-last-change-parser.c \ - gupnp-media-collection.c \ - gupnp-feature.c \ - gupnp-feature-list-parser.c \ - gupnp-dlna.c \ - gupnp-av-error.c \ - xml-util.c \ - xml-util.h \ - gvalue-util.c \ - gvalue-util.h \ - fragment-util.c \ - fragment-util.h \ - time-utils.c \ - time-utils.h \ - xsd-data.c \ - xsd-data.h \ - $(BUILT_SOURCES) - -libgupnp_av_1_0_la_LIBADD = $(LIBGUPNP_LIBS) - -EXTRA_DIST = gupnp-av-marshal.list meson.build - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -if HAVE_INTROSPECTION -export GUPNP_AV_DATADIR := $(top_srcdir)/data - -introspection_sources = \ - $(addprefix $(top_srcdir)/libgupnp-av/, \ - $(libgupnp_av_inc_HEADERS)) \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-object.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-item.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-container.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-parser.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-resource.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-descriptor.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-contributor.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-writer.c \ - $(top_srcdir)/libgupnp-av/gupnp-didl-lite-createclass.c \ - $(top_srcdir)/libgupnp-av/gupnp-protocol-info.c \ - $(top_srcdir)/libgupnp-av/gupnp-search-criteria-parser.c \ - $(top_srcdir)/libgupnp-av/gupnp-last-change-parser.c \ - $(top_srcdir)/libgupnp-av/gupnp-cds-last-change-parser.c \ - $(top_srcdir)/libgupnp-av/gupnp-media-collection.c \ - $(top_srcdir)/libgupnp-av/gupnp-feature.c \ - $(top_srcdir)/libgupnp-av/gupnp-feature-list-parser.c \ - $(top_srcdir)/libgupnp-av/gupnp-dlna.c \ - $(top_srcdir)/libgupnp-av/gupnp-av-error.c - -GUPnPAV-1.0.gir: libgupnp-av-1.0.la -GUPnPAV_1_0_gir_INCLUDES = GObject-2.0 libxml2-2.0 -GUPnPAV_1_0_gir_CFLAGS = $(AM_CFLAGS) -GUPnPAV_1_0_gir_LIBS = libgupnp-av-1.0.la -GUPnPAV_1_0_gir_NAMESPACE = GUPnPAV -GUPnPAV_1_0_gir_SCANNERFLAGS = --identifier-prefix=GUPnP --symbol-prefix=gupnp --pkg-export=gupnp-av-1.0 $(WARN_SCANNERFLAGS) -GUPnPAV_1_0_gir_FILES = $(introspection_sources) -INTROSPECTION_GIRS += GUPnPAV-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -endif - -CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) -DISTCLEANFILES = $(BUILT_SOURCES) -MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES) - diff --git a/m4/ax_append_compile_flags.m4 b/m4/ax_append_compile_flags.m4 deleted file mode 100644 index dc7b866..0000000 --- a/m4/ax_append_compile_flags.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) -# -# DESCRIPTION -# -# For every FLAG1, FLAG2 it is checked whether the compiler works with the -# flag. If it does, the flag is added FLAGS-VARIABLE -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. During the check the flag is always added to the -# current language's flags. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# NOTE: This macro depends on the AX_APPEND_FLAG and -# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with -# AX_APPEND_LINK_FLAGS. -# -# LICENSE -# -# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> -# -# 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/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 4 - -AC_DEFUN([AX_APPEND_COMPILE_FLAGS], -[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) -AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) -for flag in $1; do - AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) -done -])dnl AX_APPEND_COMPILE_FLAGS diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4 deleted file mode 100644 index aeab899..0000000 --- a/m4/ax_append_flag.m4 +++ /dev/null @@ -1,71 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) -# -# DESCRIPTION -# -# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space -# added in between. -# -# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. -# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains -# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly -# FLAG. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> -# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> -# -# 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/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 5 - -AC_DEFUN([AX_APPEND_FLAG], -[dnl -AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF -AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) -AS_VAR_SET_IF(FLAGS,[ - AS_CASE([" AS_VAR_GET(FLAGS) "], - [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], - [ - AS_VAR_APPEND(FLAGS," $1") - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) - ], - [ - AS_VAR_SET(FLAGS,[$1]) - AC_RUN_LOG([: FLAGS="$FLAGS"]) - ]) -AS_VAR_POPDEF([FLAGS])dnl -])dnl AX_APPEND_FLAG diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 deleted file mode 100644 index ca36397..0000000 --- a/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> -# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> -# -# 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/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 4 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/m4/ax_check_enable_debug.m4 b/m4/ax_check_enable_debug.m4 deleted file mode 100644 index 37add91..0000000 --- a/m4/ax_check_enable_debug.m4 +++ /dev/null @@ -1,113 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_check_enable_debug.html -# =========================================================================== -# -# SYNOPSIS -# -# Check for the presence of an --enable-debug option to configure and -# allow/avoid compiled debugging flags appropriately. -# -# AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], -# [ENABLE DEBUG VARIABLES …], -# [DISABLE DEBUG VARIABLES NDEBUG …]) -# -# DESCRIPTION -# -# Check for the presence of an --enable-debug option to configure, with the -# specified default value used when the option is not present. Return the -# value in the variable $ax_enable_debug. -# -# Specifying 'yes' adds '-g -O0' to the compilation flags for all languages. -# Specifying 'info' adds '-g' to the compilation flags. Specifying 'profile' -# adds '-g -pg' to the compilation flags and '-pg' to the linking flags. -# Otherwise, nothing is added. -# -# Define the variables listed in the second argument if debug is enabled, -# defaulting to no variables. Defines the variables listed in the third -# argument if debug is disabled, defaulting to NDEBUG. All lists of -# variables should be space-separated. -# -# If debug is not enabled, ensure AC_PROG_* will not add debugging flags. -# Should be invoked prior to any AC_PROG_* compiler checks. -# -# LAST MODIFICATION -# -# 2014-05-12 -# -# COPYLEFT -# -# Copyright (c) 2011 Rhys Ulerich <rhys.ulerich@gmail.com> -# Copyright © 2014 Philip Withnall <philip@tecnocode.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. - -AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[ - AC_BEFORE([$0],[AC_PROG_CC])dnl - AC_BEFORE([$0],[AC_PROG_CXX])dnl - AC_BEFORE([$0],[AC_PROG_F77])dnl - AC_BEFORE([$0],[AC_PROG_FC])dnl - - AC_MSG_CHECKING(whether to enable debugging) - - m4_define(ax_enable_debug_default,[m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))]) - m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))]) - m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))]) - - AC_ARG_ENABLE(debug, - [AS_HELP_STRING([--enable-debug]@<:@=ax_enable_debug_default@:>@,[compile with debugging; one of yes/info/profile/no])], - [],enable_debug=ax_enable_debug_default) - if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then - AC_MSG_RESULT(yes) - CFLAGS="${CFLAGS} -g -O0" - CXXFLAGS="${CXXFLAGS} -g -O0" - FFLAGS="${FFLAGS} -g -O0" - FCFLAGS="${FCFLAGS} -g -O0" - OBJCFLAGS="${OBJCFLAGS} -g -O0" - - dnl Define various variables if debugging is enabled. - m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])]) - else - if test "x$enable_debug" = "xinfo"; then - AC_MSG_RESULT(info) - CFLAGS="${CFLAGS} -g" - CXXFLAGS="${CXXFLAGS} -g" - FFLAGS="${FFLAGS} -g" - FCFLAGS="${FCFLAGS} -g" - OBJCFLAGS="${OBJCFLAGS} -g" - elif test "x$enable_debug" = "xprofile"; then - AC_MSG_RESULT(profile) - CFLAGS="${CFLAGS} -g -pg" - CXXFLAGS="${CXXFLAGS} -g -pg" - FFLAGS="${FFLAGS} -g -pg" - FCFLAGS="${FCFLAGS} -g -pg" - OBJCFLAGS="${OBJCFLAGS} -g -pg" - LDFLAGS="${LDFLAGS} -pg" - else - AC_MSG_RESULT(no) - dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags - dnl by setting any unset environment flag variables - if test "x${CFLAGS+set}" != "xset"; then - CFLAGS="" - fi - if test "x${CXXFLAGS+set}" != "xset"; then - CXXFLAGS="" - fi - if test "x${FFLAGS+set}" != "xset"; then - FFLAGS="" - fi - if test "x${FCFLAGS+set}" != "xset"; then - FCFLAGS="" - fi - if test "x${OBJCFLAGS+set}" != "xset"; then - OBJCFLAGS="" - fi - fi - - dnl Define various variables if debugging is disabled. - dnl assert.h is a NOP if NDEBUG is defined, so define it by default. - m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])]) - fi - ax_enable_debug=$enable_debug -]) diff --git a/m4/ax_compiler_flags.m4 b/m4/ax_compiler_flags.m4 deleted file mode 100644 index 6cfe398..0000000 --- a/m4/ax_compiler_flags.m4 +++ /dev/null @@ -1,158 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [IS-RELEASE], [EXTRA-BASE-CFLAGS], [EXTRA-YES-CFLAGS], [UNUSED], [UNUSED], [UNUSED], [EXTRA-BASE-LDFLAGS], [EXTRA-YES-LDFLAGS], [UNUSED], [UNUSED], [UNUSED]) -# -# DESCRIPTION -# -# Check for the presence of an --enable-compile-warnings option to -# configure, defaulting to "error" in normal operation, or "yes" if -# IS-RELEASE is equal to "yes". Return the value in the variable -# $ax_enable_compile_warnings. -# -# Depending on the value of --enable-compile-warnings, different compiler -# warnings are checked to see if they work with the current compiler and, -# if so, are appended to CFLAGS-VARIABLE and LDFLAGS-VARIABLE. This -# allows a consistent set of baseline compiler warnings to be used across -# a code base, irrespective of any warnings enabled locally by individual -# developers. By standardising the warnings used by all developers of a -# project, the project can commit to a zero-warnings policy, using -Werror -# to prevent compilation if new warnings are introduced. This makes -# catching bugs which are flagged by warnings a lot easier. -# -# By providing a consistent --enable-compile-warnings argument across all -# projects using this macro, continuous integration systems can easily be -# configured the same for all projects. Automated systems or build -# systems aimed at beginners may want to pass the --disable-Werror -# argument to unconditionally prevent warnings being fatal. -# -# --enable-compile-warnings can take the values: -# -# * no: Base compiler warnings only; not even -Wall. -# * yes: The above, plus a broad range of useful warnings. -# * error: The above, plus -Werror so that all warnings are fatal. -# Use --disable-Werror to override this and disable fatal -# warnings. -# -# The set of base and enabled flags can be augmented using the -# EXTRA-*-CFLAGS and EXTRA-*-LDFLAGS variables, which are tested and -# appended to the output variable if --enable-compile-warnings is not -# "no". Flags should not be disabled using these arguments, as the entire -# point of AX_COMPILER_FLAGS is to enforce a consistent set of useful -# compiler warnings on code, using warnings which have been chosen for low -# false positive rates. If a compiler emits false positives for a -# warning, a #pragma should be used in the code to disable the warning -# locally. See: -# -# https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas -# -# The EXTRA-* variables should only be used to supply extra warning flags, -# and not general purpose compiler flags, as they are controlled by -# configure options such as --disable-Werror. -# -# IS-RELEASE can be used to disable -Werror when making a release, which -# is useful for those hairy moments when you just want to get the release -# done as quickly as possible. Set it to "yes" to disable -Werror. By -# default, it uses the value of $ax_is_release, so if you are using the -# AX_IS_RELEASE macro, there is no need to pass this parameter. For -# example: -# -# AX_IS_RELEASE([git-directory]) -# AX_COMPILER_FLAGS() -# -# CFLAGS-VARIABLE defaults to WARN_CFLAGS, and LDFLAGS-VARIABLE defaults -# to WARN_LDFLAGS. Both variables are AC_SUBST-ed by this macro, but must -# be manually added to the CFLAGS and LDFLAGS variables for each target in -# the code base. -# -# If C++ language support is enabled with AC_PROG_CXX, which must occur -# before this macro in configure.ac, warning flags for the C++ compiler -# are AC_SUBST-ed as WARN_CXXFLAGS, and must be manually added to the -# CXXFLAGS variables for each target in the code base. EXTRA-*-CFLAGS can -# be used to augment the base and enabled flags. -# -# Warning flags for g-ir-scanner (from GObject Introspection) are -# AC_SUBST-ed as WARN_SCANNERFLAGS. This variable must be manually added -# to the SCANNERFLAGS variable for each GIR target in the code base. If -# extra g-ir-scanner flags need to be enabled, the AX_COMPILER_FLAGS_GIR -# macro must be invoked manually. -# -# AX_COMPILER_FLAGS may add support for other tools in future, in addition -# to the compiler and linker. No extra EXTRA-* variables will be added -# for those tools, and all extra support will still use the single -# --enable-compile-warnings configure option. For finer grained control -# over the flags for individual tools, use AX_COMPILER_FLAGS_CFLAGS, -# AX_COMPILER_FLAGS_LDFLAGS and AX_COMPILER_FLAGS_* for new tools. -# -# The UNUSED variables date from a previous version of this macro, and are -# automatically appended to the preceding non-UNUSED variable. They should -# be left empty in new uses of the macro. -# -# LICENSE -# -# Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.co.uk> -# Copyright (c) 2015 David King <amigadave@amigadave.com> -# -# 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 13 - -# _AX_COMPILER_FLAGS_LANG([LANGNAME]) -m4_defun([_AX_COMPILER_FLAGS_LANG], -[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [], - [m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl - AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl -]) - -AC_DEFUN([AX_COMPILER_FLAGS],[ - # C support is enabled by default. - _AX_COMPILER_FLAGS_LANG([C]) - # Only enable C++ support if AC_PROG_CXX is called. The redefinition of - # AC_PROG_CXX is so that a fatal error is emitted if this macro is called - # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be - # checked. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AX_COMPILER_FLAGS_LANG([CXX])], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AX_COMPILER_FLAGS_LANG([CXX])])]) - AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_LDFLAGS]) - - # Default value for IS-RELEASE is $ax_is_release - ax_compiler_flags_is_release=m4_tolower(m4_normalize(ifelse([$3],, - [$ax_is_release], - [$3]))) - - AC_ARG_ENABLE([compile-warnings], - AS_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@], - [Enable compiler warnings and errors]),, - [AS_IF([test "$ax_compiler_flags_is_release" = "yes"], - [enable_compile_warnings="yes"], - [enable_compile_warnings="error"])]) - AC_ARG_ENABLE([Werror], - AS_HELP_STRING([--disable-Werror], - [Unconditionally make all compiler warnings non-fatal]),, - [enable_Werror=maybe]) - - # Return the user's chosen warning level - AS_IF([test "$enable_Werror" = "no" -a \ - "$enable_compile_warnings" = "error"],[ - enable_compile_warnings="yes" - ]) - - ax_enable_compile_warnings=$enable_compile_warnings - - AX_COMPILER_FLAGS_CFLAGS([$1],[$ax_compiler_flags_is_release], - [$4],[$5 $6 $7 $8]) - m4_ifdef([_AX_COMPILER_FLAGS_LANG_CXX_enabled], - [AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS], - [$ax_compiler_flags_is_release], - [$4],[$5 $6 $7 $8])]) - AX_COMPILER_FLAGS_LDFLAGS([$2],[$ax_compiler_flags_is_release], - [$9],[$10 $11 $12 $13]) - AX_COMPILER_FLAGS_GIR([WARN_SCANNERFLAGS],[$ax_compiler_flags_is_release]) -])dnl AX_COMPILER_FLAGS diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4 deleted file mode 100644 index f470f8f..0000000 --- a/m4/ax_compiler_flags_cflags.m4 +++ /dev/null @@ -1,133 +0,0 @@ -# ============================================================================ -# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_cflags.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_COMPILER_FLAGS_CFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) -# -# DESCRIPTION -# -# Add warning flags for the C compiler to VARIABLE, which defaults to -# WARN_CFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be -# manually added to the CFLAGS variable for each target in the code base. -# -# This macro depends on the environment set up by AX_COMPILER_FLAGS. -# Specifically, it uses the value of $ax_enable_compile_warnings to decide -# which flags to enable. -# -# LICENSE -# -# Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.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 11 - -AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ - AC_REQUIRE([AC_PROG_SED]) - AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) - AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) - AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) - - # Variable names - m4_define(ax_warn_cflags_variable, - [m4_normalize(ifelse([$1],,[WARN_CFLAGS],[$1]))]) - - AC_LANG_PUSH([C]) - - # Always pass -Werror=unknown-warning-option to get Clang to fail on bad - # flags, otherwise they are always appended to the warn_cflags variable, and - # Clang warns on them for every compilation unit. - # If this is passed to GCC, it will explode, so the flag must be enabled - # conditionally. - AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ - ax_compiler_flags_test="-Werror=unknown-warning-option" - ],[ - ax_compiler_flags_test="" - ]) - - # Base flags - AX_APPEND_COMPILE_FLAGS([ dnl - -fno-strict-aliasing dnl - $3 dnl - ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) - - AS_IF([test "$ax_enable_compile_warnings" != "no"],[ - # "yes" flags - AX_APPEND_COMPILE_FLAGS([ dnl - -Wall dnl - -Wextra dnl - -Wundef dnl - -Wnested-externs dnl - -Wwrite-strings dnl - -Wpointer-arith dnl - -Wmissing-declarations dnl - -Wmissing-prototypes dnl - -Wstrict-prototypes dnl - -Wredundant-decls dnl - -Wno-unused-parameter dnl - -Wno-missing-field-initializers dnl - -Wdeclaration-after-statement dnl - -Wformat=2 dnl - -Wold-style-definition dnl - -Wcast-align dnl - -Wformat-nonliteral dnl - -Wformat-security dnl - -Wsign-compare dnl - -Wstrict-aliasing dnl - -Wshadow dnl - -Winline dnl - -Wpacked dnl - -Wmissing-format-attribute dnl - -Wmissing-noreturn dnl - -Winit-self dnl - -Wredundant-decls dnl - -Wmissing-include-dirs dnl - -Wunused-but-set-variable dnl - -Warray-bounds dnl - -Wimplicit-function-declaration dnl - -Wreturn-type dnl - -Wswitch-enum dnl - -Wswitch-default dnl - $4 dnl - $5 dnl - $6 dnl - $7 dnl - ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) - ]) - AS_IF([test "$ax_enable_compile_warnings" = "error"],[ - # "error" flags; -Werror has to be appended unconditionally because - # it's not possible to test for - # - # suggest-attribute=format is disabled because it gives too many false - # positives - AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable) - - AX_APPEND_COMPILE_FLAGS([ dnl - -Wno-suggest-attribute=format dnl - ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) - ]) - - # In the flags below, when disabling specific flags, always add *both* - # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) - # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, - # which effectively turns that flag back on again as an error. - for flag in $ax_warn_cflags_variable; do - AS_CASE([$flag], - [-Wno-*=*],[], - [-Wno-*],[ - AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], - ax_warn_cflags_variable, - [$ax_compiler_flags_test]) - ]) - done - - AC_LANG_POP([C]) - - # Substitute the variables - AC_SUBST(ax_warn_cflags_variable) -])dnl AX_COMPILER_FLAGS diff --git a/m4/ax_compiler_flags_gir.m4 b/m4/ax_compiler_flags_gir.m4 deleted file mode 100644 index 180f50d..0000000 --- a/m4/ax_compiler_flags_gir.m4 +++ /dev/null @@ -1,60 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) -# -# DESCRIPTION -# -# Add warning flags for the g-ir-scanner (from GObject Introspection) to -# VARIABLE, which defaults to WARN_SCANNERFLAGS. VARIABLE is AC_SUBST-ed -# by this macro, but must be manually added to the SCANNERFLAGS variable -# for each GIR target in the code base. -# -# This macro depends on the environment set up by AX_COMPILER_FLAGS. -# Specifically, it uses the value of $ax_enable_compile_warnings to decide -# which flags to enable. -# -# LICENSE -# -# Copyright (c) 2015 Philip Withnall <philip@tecnocode.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 4 - -AC_DEFUN([AX_COMPILER_FLAGS_GIR],[ - AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) - - # Variable names - m4_define(ax_warn_scannerflags_variable, - [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))]) - - # Base flags - AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable) - - AS_IF([test "$ax_enable_compile_warnings" != "no"],[ - # "yes" flags - AX_APPEND_FLAG([ dnl - --warn-all dnl - $4 dnl - $5 dnl - $6 dnl - $7 dnl - ],ax_warn_scannerflags_variable) - ]) - AS_IF([test "$ax_enable_compile_warnings" = "error"],[ - # "error" flags - AX_APPEND_FLAG([ dnl - --warn-error dnl - ],ax_warn_scannerflags_variable) - ]) - - # Substitute the variables - AC_SUBST(ax_warn_scannerflags_variable) -])dnl AX_COMPILER_FLAGS diff --git a/m4/ax_compiler_flags_ldflags.m4 b/m4/ax_compiler_flags_ldflags.m4 deleted file mode 100644 index f393ba4..0000000 --- a/m4/ax_compiler_flags_ldflags.m4 +++ /dev/null @@ -1,75 +0,0 @@ -# ============================================================================= -# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html -# ============================================================================= -# -# SYNOPSIS -# -# AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) -# -# DESCRIPTION -# -# Add warning flags for the linker to VARIABLE, which defaults to -# WARN_LDFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be -# manually added to the LDFLAGS variable for each target in the code base. -# -# This macro depends on the environment set up by AX_COMPILER_FLAGS. -# Specifically, it uses the value of $ax_enable_compile_warnings to decide -# which flags to enable. -# -# LICENSE -# -# Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.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 4 - -AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ - AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) - AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) - AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) - - # Variable names - m4_define(ax_warn_ldflags_variable, - [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))]) - - # Always pass -Werror=unknown-warning-option to get Clang to fail on bad - # flags, otherwise they are always appended to the warn_ldflags variable, - # and Clang warns on them for every compilation unit. - # If this is passed to GCC, it will explode, so the flag must be enabled - # conditionally. - AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ - ax_compiler_flags_test="-Werror=unknown-warning-option" - ],[ - ax_compiler_flags_test="" - ]) - - # Base flags - AX_APPEND_COMPILE_FLAGS([ dnl - -Wl,--no-as-needed dnl - $3 dnl - ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) - - AS_IF([test "$ax_enable_compile_warnings" != "no"],[ - # "yes" flags - AX_APPEND_COMPILE_FLAGS([$4 $5 $6 $7], - ax_warn_ldflags_variable, - [$ax_compiler_flags_test]) - ]) - AS_IF([test "$ax_enable_compile_warnings" = "error"],[ - # "error" flags; -Werror has to be appended unconditionally because - # it's not possible to test for - # - # suggest-attribute=format is disabled because it gives too many false - # positives - AX_APPEND_COMPILE_FLAGS([ dnl - -Wl,--fatal-warnings dnl - ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) - ]) - - # Substitute the variables - AC_SUBST(ax_warn_ldflags_variable) -])dnl AX_COMPILER_FLAGS diff --git a/m4/ax_is_release.m4 b/m4/ax_is_release.m4 deleted file mode 100644 index 9ec6746..0000000 --- a/m4/ax_is_release.m4 +++ /dev/null @@ -1,69 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_is_release.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_IS_RELEASE(POLICY) -# -# DESCRIPTION -# -# Determine whether the code is being configured as a release, or from -# git. Set the ax_is_release variable to 'yes' or 'no'. -# -# If building a release version, it is recommended that the configure -# script disable compiler errors and debug features, by conditionalising -# them on the ax_is_release variable. If building from git, these -# features should be enabled. -# -# The POLICY parameter specifies how ax_is_release is determined. It can -# take the following values: -# -# * git-directory: ax_is_release will be 'no' if a '.git' directory exists -# * minor-version: ax_is_release will be 'no' if the minor version number -# in $PACKAGE_VERSION is odd; this assumes -# $PACKAGE_VERSION follows the 'major.minor.micro' scheme -# * micro-version: ax_is_release will be 'no' if the micro version number -# in $PACKAGE_VERSION is odd; this assumes -# $PACKAGE_VERSION follows the 'major.minor.micro' scheme -# * always: ax_is_release will always be 'yes' -# * never: ax_is_release will always be 'no' -# -# Other policies may be added in future. -# -# LICENSE -# -# Copyright (c) 2015 Philip Withnall <philip@tecnocode.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. - -#serial 3 - -AC_DEFUN([AX_IS_RELEASE],[ - AC_BEFORE([AC_INIT],[$0]) - - m4_case([$1], - [git-directory],[ - # $is_release = (.git directory does not exist) - AS_IF([test -d .git],[ax_is_release=no],[ax_is_release=yes]) - ], - [minor-version],[ - # $is_release = ($minor_version is even) - minor_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` - AS_IF([test "$(( $minor_version % 2 ))" -ne 0], - [ax_is_release=no],[ax_is_release=yes]) - ], - [micro-version],[ - # $is_release = ($micro_version is even) - micro_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]]*\.[[^.]]*\.\([[^.]]*\).*/\1/'` - AS_IF([test "$(( $micro_version % 2 ))" -ne 0], - [ax_is_release=no],[ax_is_release=yes]) - ], - [always],[ax_is_release=yes], - [never],[ax_is_release=no], - [ - AC_MSG_ERROR([Invalid policy. Valid policies: git-directory, minor-version.]) - ]) -]) diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 deleted file mode 100644 index cae1111..0000000 --- a/m4/ax_require_defined.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_REQUIRE_DEFINED(MACRO) -# -# DESCRIPTION -# -# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have -# been defined and thus are available for use. This avoids random issues -# where a macro isn't expanded. Instead the configure script emits a -# non-fatal: -# -# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found -# -# It's like AC_REQUIRE except it doesn't expand the required macro. -# -# Here's an example: -# -# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -# -# LICENSE -# -# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org> -# -# 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 1 - -AC_DEFUN([AX_REQUIRE_DEFINED], [dnl - m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) -])dnl AX_REQUIRE_DEFINED diff --git a/m4/introspection.m4 b/m4/introspection.m4 deleted file mode 100644 index bfc52be..0000000 --- a/m4/introspection.m4 +++ /dev/null @@ -1,94 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 deleted file mode 100644 index c909726..0000000 --- a/m4/vapigen.m4 +++ /dev/null @@ -1,43 +0,0 @@ - -dnl vala.m4 -dnl -dnl Copyright 2010 Marc-Andre Lureau -dnl Copyright 2011 Rodney Dawes <dobey.pwns@gmail.com> -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, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg <mail@jensge.org> - -# Check whether the Vala API Generator exists in `PATH'. If it is found, -# the variable VAPIGEN is set. Optionally a minimum release number of the -# generator can be requested. -# -# VALA_PROG_VAPIGEN([MINIMUM-VERSION]) -# ------------------------------------ -AC_DEFUN([GUPNP_PROG_VAPIGEN], -[AC_PATH_PROG([VAPIGEN], [vapigen], []) - AS_IF([test -z "$VAPIGEN"], - [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], - [AS_IF([test -n "$1"], - [AC_MSG_CHECKING([$VAPIGEN is at least version $1]) - am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` - AS_VERSION_COMPARE([$1], ["$am__vapigen_version"], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_MSG_WARN([Vala API Generator $1 not found.]) - VAPIGEN="" - ])])]) -]) diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 7ae8a67..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -SUBDIRS = gtest - -common_cflags = \ - $(LIBGUPNP_CFLAGS) \ - -I$(top_srcdir) \ - $(WARN_CFLAGS) \ - -Wno-unused-parameter -common_ldadd = \ - $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la \ - $(LIBGUPNP_LIBS) - -noinst_PROGRAMS = test-search-criteria-parser - -test_search_criteria_parser_SOURCES = test-search-criteria-parser.c -test_search_criteria_parser_LDADD = $(common_ldadd) -test_search_criteria_parser_CFLAGS = $(common_cflags) - -check_PROGRAMS = \ - check-search \ - check-feature-list-parser \ - fragments - -check_search_SOURCES = check-search.c -check_search_LDADD = $(common_ldadd) -check_search_CFLAGS = $(common_cflags) -check_search_LDFLAGS = $(WARN_LDFLAGS) - -check_feature_list_parser_SOURCES = check-feature-list-parser.c -check_feature_list_parser_LDADD = $(common_ldadd) -check_feature_list_parser_CFLAGS = $(common_cflags) -check_feature_list_parser_LDFLAGS = $(WARN_LDFLAGS) - -fragments_SOURCES = fragments.c -fragments_LDADD = $(common_ldadd) -fragments_CFLAGS = $(common_cflags) -DABS_TOP_SRCDIR="\"$(abs_top_srcdir)\"" -fragments_LDFLAGS = $(WARN_LDFLAGS) - -TESTS = $(check_PROGRAMS) - -EXTRA_DIST = meson.build diff --git a/tests/gtest/Makefile.am b/tests/gtest/Makefile.am deleted file mode 100644 index 9431d0d..0000000 --- a/tests/gtest/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -TESTS_ENVIRONMENT = G_SLICE=debug-blocks \ - LD_LIBRARY_PATH=$(top_builddir)/libgupnp-av/.libs:$(LD_LIBRARY_PATH) \ - GUPNP_AV_DATADIR=$(top_srcdir)/data - -TESTS=$(check_PROGRAMS) - -check_PROGRAMS = \ - test-regression \ - test-didl-lite-object \ - test-media-collection \ - test-last-change-parser \ - test-cds-last-change-parser - -test_regression_SOURCES = test-regression.c -test_regression_LDFLAGS = $(WARN_LDFLAGS) - -test_didl_lite_object_SOURCES = test-didl-lite-object.c -test_didl_lite_object_LDFLAGS = $(WARN_LDFLAGS) - -test_media_collection_SOURCES = \ - test-media-collection.c -test_media_collection_LDFLAGS = $(WARN_LDFLAGS) - -test_last_change_parser_SOURCES = \ - test-last-change-parser.c -test_last_change_parser_LDFLAGS = $(WARN_LDFLAGS) - -test_cds_last_change_parser_SOURCES = \ - test-cds-last-change-parser.c -test_cds_last_change_parser_LDFLAGS = $(WARN_LDFLAGS) - -LDADD = \ - $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la \ - $(LIBGUPNP_LIBS) - -AM_CFLAGS = \ - $(LIBGUPNP_CFLAGS) \ - -I $(top_srcdir) \ - -DDATA_PATH="\"$(srcdir)\"" \ - $(WARN_CFLAGS) - -EXTRA_DIST = data/cds-last-change/00-cds-last-change.xml \ - data/cds-last-change/01-cds-last-change.xml \ - data/cds-last-change/02-cds-last-change.xml \ - data/cds-last-change/03-cds-last-change.xml \ - data/cds-last-change/04-cds-last-change.xml \ - data/cds-last-change/05-cds-last-change.xml \ - data/cds-last-change/06-cds-last-change.xml \ - data/cds-last-change/07-cds-last-change.xml \ - meson.build diff --git a/vala/Makefile.am b/vala/Makefile.am deleted file mode 100644 index 0b5d6d6..0000000 --- a/vala/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -EXTRA_DIST = meson.build -if HAVE_INTROSPECTION -if HAVE_VAPIGEN -gupnp-av-1.0.vapi: gupnp-av-1.0.stamp - @true - -gupnp-av-1.0.stamp: $(top_builddir)/libgupnp-av/GUPnPAV-1.0.gir \ - $(srcdir)/GUPnPAV-1.0.metadata \ - $(srcdir)/gupnp-av-1.0-custom.vala - rm -f $(@F) - $(AM_V_GEN)$(VAPIGEN) --metadatadir=$(srcdir) \ - --pkg=libsoup-2.4 \ - --library=gupnp-av-1.0 --pkg=gio-2.0 --pkg=libxml-2.0 \ - $(top_builddir)/libgupnp-av/GUPnPAV-1.0.gir \ - $(srcdir)/gupnp-av-1.0-custom.vala && \ - echo timestmap > $(@F) - -vapidir = $(datadir)/vala/vapi -vapi_DATA = gupnp-av-1.0.vapi $(srcdir)/gupnp-av-1.0.deps -CLEANFILES = gupnp-av-1.0.vapi gupnp-av-1.0.stamp -EXTRA_DIST += gupnp-av-1.0.deps GUPnPAV-1.0.metadata gupnp-av-1.0-custom.vala gupnp-av-1.0.vapi gupnp-av-1.0.stamp -endif -endif |