From c1a125ce6200ae6345abc642a6e5ba725ff161dd Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 9 Oct 2019 21:46:01 +0200 Subject: [PATCH] Remove GNU Autotools --- expat/.gitignore | 13 - expat/Makefile.am | 154 --------- expat/acinclude.m4 | 12 - expat/buildconf.sh | 2 - expat/configure-ac-style.md | 85 ----- expat/configure.ac | 319 ------------------ expat/conftools/.gitignore | 11 - expat/conftools/PrintPath | 116 ------- expat/conftools/ax-append-compile-flags.m4 | 46 --- expat/conftools/ax-append-flag.m4 | 50 --- expat/conftools/ax-append-link-flags.m4 | 44 --- expat/conftools/ax-check-compile-flag.m4 | 74 ---- expat/conftools/ax-check-link-flag.m4 | 53 --- expat/conftools/ax-require-defined.m4 | 37 -- .../expatcfg-compiler-supports-visibility.m4 | 39 --- expat/doc/Makefile.am | 59 ---- expat/examples/Makefile.am | 39 --- expat/lib/Makefile.am | 75 ---- expat/tests/Makefile.am | 66 ---- expat/tests/benchmark/Makefile.am | 40 --- expat/xmlwf/Makefile.am | 59 ---- 21 files changed, 1393 deletions(-) delete mode 100644 expat/Makefile.am delete mode 100644 expat/acinclude.m4 delete mode 100755 expat/buildconf.sh delete mode 100644 expat/configure-ac-style.md delete mode 100644 expat/configure.ac delete mode 100644 expat/conftools/.gitignore delete mode 100755 expat/conftools/PrintPath delete mode 100644 expat/conftools/ax-append-compile-flags.m4 delete mode 100644 expat/conftools/ax-append-flag.m4 delete mode 100644 expat/conftools/ax-append-link-flags.m4 delete mode 100644 expat/conftools/ax-check-compile-flag.m4 delete mode 100644 expat/conftools/ax-check-link-flag.m4 delete mode 100644 expat/conftools/ax-require-defined.m4 delete mode 100644 expat/conftools/expatcfg-compiler-supports-visibility.m4 delete mode 100644 expat/doc/Makefile.am delete mode 100644 expat/examples/Makefile.am delete mode 100644 expat/lib/Makefile.am delete mode 100644 expat/tests/Makefile.am delete mode 100644 expat/tests/benchmark/Makefile.am delete mode 100644 expat/xmlwf/Makefile.am diff --git a/expat/.gitignore b/expat/.gitignore index 5ff05e09..30d40933 100644 --- a/expat/.gitignore +++ b/expat/.gitignore @@ -1,24 +1,12 @@ -/autom4te.cache/ -m4/ CMakeFiles/ Testing/ -aclocal.m4 CMakeCache.txt cmake_install.cmake CTestTestfile.cmake install_manifest.txt Makefile -.deps -Makefile.in -.libs -*.la -configure -config.cache -config.log -config.status expat_config.h.in expat_config.h -libtool expat.ncb expat.opt .project @@ -36,6 +24,5 @@ coverage__R* source__R* /expat-*.tar.bz2 /expat-*.tar.bz2.asc -/stamp-h1 /libexpat*.dll /changelog diff --git a/expat/Makefile.am b/expat/Makefile.am deleted file mode 100644 index 5e1d37dd..00000000 --- a/expat/Makefile.am +++ /dev/null @@ -1,154 +0,0 @@ -# -# __ __ _ -# ___\ \/ /_ __ __ _| |_ -# / _ \\ /| '_ \ / _` | __| -# | __// \| |_) | (_| | |_ -# \___/_/\_\ .__/ \__,_|\__| -# |_| XML parser -# -# Copyright (c) 2017 Expat development team -# Licensed under the MIT license: -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS IN THE SOFTWARE. - -AUTOMAKE_OPTIONS = \ - dist-bzip2 \ - dist-lzip \ - dist-xz \ - foreign \ - subdir-objects - -ACLOCAL_AMFLAGS = -I m4 -LIBTOOLFLAGS = --verbose - -SUBDIRS = lib # lib goes first to build first -if WITH_EXAMPLES -SUBDIRS += examples -endif -if WITH_TESTS -SUBDIRS += tests -endif -if WITH_XMLWF -SUBDIRS += xmlwf doc -endif - -pkgconfig_DATA = expat.pc -pkgconfigdir = $(libdir)/pkgconfig - - -_EXTRA_DIST_CMAKE = \ - cmake/expat-config.cmake.in \ - cmake/mingw-toolchain.cmake \ - \ - CMakeLists.txt \ - CMake.README \ - ConfigureChecks.cmake \ - expat_config.h.cmake - -_EXTRA_DIST_WINDOWS = \ - win32/build_expat_iss.bat \ - win32/expat.iss \ - win32/MANIFEST.txt \ - win32/README.txt - -EXTRA_DIST = \ - $(_EXTRA_DIST_CMAKE) \ - $(_EXTRA_DIST_WINDOWS) \ - \ - conftools/expat.m4 \ - conftools/get-version.sh \ - conftools/PrintPath \ - \ - xmlwf/xmlwf_helpgen.py \ - xmlwf/xmlwf_helpgen.sh \ - \ - Changes \ - README.md \ - \ - fix-xmltest-log.sh \ - test-driver-wrapper.sh - - -.PHONY: buildlib -buildlib: - @echo 'ERROR: Running "make buildlib LIBRARY=libexpatw.la"' >&2 - @echo 'ERROR: is no longer supported. INSTEAD please:' >&2 - @echo 'ERROR:' >&2 - @echo 'ERROR: * Mass-patch Makefile.am, e.g.' >&2 - @echo 'ERROR: # find -name Makefile.am -exec sed \' >&2 - @echo 'ERROR: -e "s,libexpat\.la,libexpatw.la," \' >&2 - @echo 'ERROR: -e "s,libexpat_la,libexpatw_la," \' >&2 - @echo 'ERROR: -i {} +' >&2 - @echo 'ERROR:' >&2 - @echo 'ERROR: * Run automake to re-generate Makefile.in files' >&2 - @echo 'ERROR:' >&2 - @echo 'ERROR: * Use "./configure --without-xmlwf" and/or' >&2 - @echo 'ERROR: "make -C lib all install" to bypass compilation' >&2 - @echo 'ERROR: of xmlwf (e.g. with -DXML_UNICODE)' >&2 - @echo 'ERROR:' >&2 - @false - - -.PHONY: run-benchmark -run-benchmark: - $(MAKE) -C tests/benchmark - ./run.sh tests/benchmark/benchmark@EXEEXT@ -n $(top_srcdir)/../testdata/largefiles/recset.xml 65535 3 - -.PHONY: download-xmlts-zip -download-xmlts-zip: - if test "$(XMLTS_ZIP)" = ""; then \ - wget --output-document=tests/xmlts.zip \ - https://www.w3.org/XML/Test/xmlts20080827.zip; \ - else \ - cp $(XMLTS_ZIP) tests/xmlts.zip; \ - fi - -tests/xmlts.zip: - $(MAKE) download-xmlts-zip - -.PHONY: extract-xmlts-zip -extract-xmlts-zip: tests/xmlts.zip - [ -f $(builddir)/tests/xmlts.zip ] || $(MAKE) download-xmlts-zip # vpath workaround - cd tests && unzip -q xmlts.zip - -tests/xmlconf: tests/xmlts.zip - $(MAKE) extract-xmlts-zip - -.PHONY: run-xmltest -run-xmltest: tests/xmlconf -if WITH_XMLWF - [ -d $(builddir)/tests/xmlconf ] || $(MAKE) extract-xmlts-zip # vpath workaround - $(MAKE) -C lib - $(MAKE) -C xmlwf - $(srcdir)/tests/xmltest.sh "$(abs_builddir)/run.sh $(abs_builddir)/xmlwf/xmlwf@EXEEXT@" 2>&1 | tee $(builddir)/tests/xmltest.log - $(srcdir)/fix-xmltest-log.sh $(builddir)/tests/xmltest.log - diff -u $(srcdir)/tests/xmltest.log.expected $(builddir)/tests/xmltest.log -else - @echo 'ERROR: xmlwf is needed for "make run-xmltest".' >&2 - @echo 'ERROR: Please re-configure without --without-xmlwf.' >&2 - @false -endif - -.PHONY: qa -qa: - QA_COMPILER=clang QA_SANITIZER=address ./qa.sh - QA_COMPILER=clang QA_SANITIZER=memory ./qa.sh - QA_COMPILER=clang QA_SANITIZER=undefined ./qa.sh - QA_COMPILER=gcc QA_PROCESSOR=gcov ./qa.sh diff --git a/expat/acinclude.m4 b/expat/acinclude.m4 deleted file mode 100644 index 7277ab29..00000000 --- a/expat/acinclude.m4 +++ /dev/null @@ -1,12 +0,0 @@ -# acinclude.m4 -- -# - -m4_include(conftools/ax-require-defined.m4) -m4_include(conftools/ax-check-compile-flag.m4) -m4_include(conftools/ax-check-link-flag.m4) -m4_include(conftools/ax-append-flag.m4) -m4_include(conftools/ax-append-compile-flags.m4) -m4_include(conftools/ax-append-link-flags.m4) -m4_include(conftools/expatcfg-compiler-supports-visibility.m4) - -### end of file diff --git a/expat/buildconf.sh b/expat/buildconf.sh deleted file mode 100755 index c3c2edaf..00000000 --- a/expat/buildconf.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -exec autoreconf --warnings=all --install --verbose "$@" diff --git a/expat/configure-ac-style.md b/expat/configure-ac-style.md deleted file mode 100644 index 5f0eeb5c..00000000 --- a/expat/configure-ac-style.md +++ /dev/null @@ -1,85 +0,0 @@ -# Style guidelines for `configure.ac` - -Version `2019.08.09.21.54` - - -## Purpose - -Define a small set of rules for style used in Expat's `configure.ac` -so that we have a commen ground and something documented to refer to -in pull requests, when style is off. - - -## 1. Quoting -Quote "everything": -``` -AC_DEFINE([HAVE_FOO], [1], [Define to 1 if you have the `foo' function.]) -``` - -## 2. Parameter indentation - -Parameters to functions either go -- (a) on the the same line or -- (b) align vertically or -- (c) go to the next line, with the first character indented 2 spaces more - than the first *non-`[`*(!) parent level character, - i.e. 2 or [3 columns further right](https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Autoconf-Language.html): - -``` -CALL([parameter], [parameter], [parameter]) - -CALL([parameter], - [parameter], - [parameter]) - -CALL([parameter], [parameter], - [CALL( - [CALL()])]) - - ^ ^ - | 2 + 3(!) spaces - 2 spaces -``` - -## 3. Consecutive call / multi-line indentation - -Consecutive calls to macros (= on the the same nesting level) are aligned vertically: - -``` -CALL([parameter], - [CALL([]) - CALL([]) - CALL([])]) -``` - -## 4. Closing bracket placement -Closing braces accumulate on the same line in general... - -``` -CALL( - [CALL([CALL([])], - [CALL([])]) - CALL([])]) -``` - -...but can go a new line (e.g. with `AC_LANG_SOURCE`) to match parameter indentation rule (2), i.e. either - -``` -CALL([CALL([ - one - two - ])], - [CALL()]) -``` - -.. or .. -``` -CALL([CALL([ - one - two - ])], - [CALL()]) -``` - - -EOF diff --git a/expat/configure.ac b/expat/configure.ac deleted file mode 100644 index e2b9a114..00000000 --- a/expat/configure.ac +++ /dev/null @@ -1,319 +0,0 @@ -dnl configuration script for expat -dnl Process this file with autoconf to produce a configure script. -dnl -dnl Copyright 2000 Clark Cooper -dnl -dnl This file is part of EXPAT. -dnl -dnl EXPAT is free software; you can redistribute it and/or modify it -dnl under the terms of the License (based on the MIT/X license) contained -dnl in the file COPYING that comes with this distribution. -dnl - -dnl Ensure that Expat is configured with autoconf 2.69 or newer. -AC_PREREQ(2.69) - -dnl Get the version number of Expat, using m4's esyscmd() command to run -dnl the command at m4-generation time. This allows us to create an m4 -dnl symbol holding the correct version number. AC_INIT() requires the -dnl version number at m4-time, rather than when ./configure is run, so -dnl all this must happen as part of m4, not as part of the shell code -dnl contained in ./configure. -dnl -dnl NOTE: esyscmd() is a GNU M4 extension. Thus, we wrap it in an appropriate -dnl test. I believe this test will work, but I don't have a place with non- -dnl GNU M4 to test it right now. -m4_define([expat_version], - m4_ifdef([__gnu__], - [esyscmd(conftools/get-version.sh lib/expat.h)], - [2.2.x])) -AC_INIT(expat, expat_version, expat-bugs@libexpat.org) -m4_undefine([expat_version]) - -AC_CONFIG_SRCDIR([Makefile.in]) -AC_CONFIG_AUX_DIR([conftools]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CANONICAL_HOST -AM_INIT_AUTOMAKE - - -dnl -dnl Increment LIBREVISION if source code has changed at all -dnl -dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0 -dnl -dnl If the API changes compatibly (i.e. simply adding a new function -dnl without changing or removing earlier interfaces), then increment LIBAGE. -dnl -dnl If the API changes incompatibly set LIBAGE back to 0 -dnl - -LIBCURRENT=7 # sync -LIBREVISION=11 # with -LIBAGE=6 # CMakeLists.txt! - -AX_APPEND_FLAG([-DHAVE_EXPAT_CONFIG_H], [CPPFLAGS]) -AC_CONFIG_HEADER([expat_config.h]) - -AM_PROG_AR -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -LT_PREREQ([2.4]) -LT_INIT([win32-dll]) - -AC_SUBST(LIBCURRENT) -AC_SUBST(LIBREVISION) -AC_SUBST(LIBAGE) - -AC_LANG([C]) -AC_PROG_CC_C99 -AS_IF([test "$GCC" = yes], - [AX_APPEND_COMPILE_FLAGS([-Wall -Wextra], [CFLAGS]) - dnl Be careful about adding the -fexceptions option; some versions of - dnl GCC don't support it and it causes extra warnings that are only - dnl distracting; avoid. - AX_APPEND_COMPILE_FLAGS([-fexceptions], [CFLAGS]) - AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes], [CFLAGS]) - AX_APPEND_COMPILE_FLAGS([-pedantic -Wduplicated-cond -Wduplicated-branches -Wlogical-op], [CFLAGS]) - AX_APPEND_COMPILE_FLAGS([-Wrestrict -Wnull-dereference -Wjump-misses-init -Wdouble-promotion], [CFLAGS]) - AX_APPEND_COMPILE_FLAGS([-Wshadow -Wformat=2 -Wmisleading-indentation], [CFLAGS])]) - -AC_LANG_PUSH([C++]) -AC_PROG_CXX -AS_IF([test "$GCC" = yes], - [AX_APPEND_COMPILE_FLAGS([-Wall -Wextra], [CXXFLAGS]) - dnl Be careful about adding the -fexceptions option; some versions of - dnl GCC don't support it and it causes extra warnings that are only - dnl distracting; avoid. - AX_APPEND_COMPILE_FLAGS([-fexceptions], [CXXFLAGS]) - AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing], [CXXFLAGS])]) -AC_LANG_POP([C++]) - -AS_IF([test "$GCC" = yes], - [AX_APPEND_LINK_FLAGS([-fno-strict-aliasing],[LDFLAGS])]) - -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang (issue #312) -AS_CASE(["$LD"],[*clang*], - [AS_CASE(["${host_os}"], - [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) - -EXPATCFG_COMPILER_SUPPORTS_VISIBILITY([ - AX_APPEND_FLAG([-fvisibility=hidden], [CFLAGS]) - AX_APPEND_FLAG([-DXML_ENABLE_VISIBILITY=1], [CFLAGS])]) - -dnl Checks for header files. -AC_HEADER_STDC - -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl We define BYTEORDER to 1234 when the platform is little endian; it -dnl defines it to 4321 when the platform is big endian. We also define -dnl WORDS_BIGENDIAN to 1 when the platform is big endian. -dnl -dnl A long time ago (early 2000 years) AC_C_BIGENDIAN was considered -dnl wrong when cross compiling, now (2018, GNU Autoconf 2.69) we assume -dnl it is fine. -AC_C_BIGENDIAN([AC_DEFINE([WORDS_BIGENDIAN], 1) - AS_VAR_SET([BYTEORDER], 4321)], - [AS_VAR_SET([BYTEORDER], 1234)]) -AC_DEFINE_UNQUOTED([BYTEORDER], $BYTEORDER, [1234 = LILENDIAN, 4321 = BIGENDIAN]) - -AC_C_CONST -AC_TYPE_SIZE_T - -AC_ARG_WITH([xmlwf], - [AS_HELP_STRING([--without-xmlwf], [do not build xmlwf])], - [], - [with_xmlwf=yes]) -AM_CONDITIONAL([WITH_XMLWF], [test x${with_xmlwf} = xyes]) - -AC_ARG_WITH([examples], - [AS_HELP_STRING([--without-examples], [do not build examples @<:@default=included@:>@])], - [], - [with_examples=yes]) -AM_CONDITIONAL([WITH_EXAMPLES], [test x${with_examples} = xyes]) - -AC_ARG_WITH([tests], - [AS_HELP_STRING([--without-tests], [do not build tests @<:@default=included@:>@])], - [], - [with_tests=yes]) -AM_CONDITIONAL([WITH_TESTS], [test x${with_tests} = xyes]) - - -AS_VAR_SET([EXPATCFG_ON_MINGW],[no]) -AS_CASE("${host_os}", - [mingw*], - [AS_VAR_SET([EXPATCFG_ON_MINGW],[yes]) - AC_MSG_NOTICE([detected OS: MinGW])]) -AM_CONDITIONAL([MINGW], [test x${EXPATCFG_ON_MINGW} = xyes]) - -AM_CONDITIONAL([UNICODE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_UNICODE >/dev/null]) - - -AC_ARG_WITH([libbsd], - [AS_HELP_STRING([--with-libbsd], [utilize libbsd (for arc4random_buf)])], - [], - [with_libbsd=no]) -AS_IF([test "x${with_libbsd}" != xno], - [AC_CHECK_LIB([bsd], - [arc4random_buf], - [], - [AS_IF([test "x${with_libbsd}" = xyes], - [AC_MSG_ERROR([Enforced use of libbsd cannot be satisfied.])])])]) -AC_MSG_CHECKING([for arc4random_buf (BSD or libbsd)]) -AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include /* for arc4random_buf on BSD, for NULL */ - #if defined(HAVE_LIBBSD) - # include - #endif - int main() { - arc4random_buf(NULL, 0U); - return 0; - } - ])], - [AC_DEFINE([HAVE_ARC4RANDOM_BUF], [1], [Define to 1 if you have the `arc4random_buf' function.]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - - AC_MSG_CHECKING([for arc4random (BSD, macOS or libbsd)]) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #if defined(HAVE_LIBBSD) - # include - #else - # include - #endif - int main() { - arc4random(); - return 0; - } - ])], - [AC_DEFINE([HAVE_ARC4RANDOM], [1], [Define to 1 if you have the `arc4random' function.]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])])]) - -AC_ARG_WITH([getrandom], - [AS_HELP_STRING([--with-getrandom], - [enforce the use of getrandom function in the system @<:@default=check@:>@]) -AS_HELP_STRING([--without-getrandom], - [skip auto detect of getrandom @<:@default=check@:>@])], - [], - [with_getrandom=check]) - -AS_IF([test "x$with_getrandom" != xno], - [AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include /* for NULL */ - #include - int main() { - return getrandom(NULL, 0U, 0U); - } - ])], - [AC_DEFINE([HAVE_GETRANDOM], [1], [Define to 1 if you have the `getrandom' function.]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AS_IF([test "x$with_getrandom" = xyes], - [AC_MSG_ERROR([enforced the use of getrandom --with-getrandom, but not detected])])])]) - -AC_ARG_WITH([sys_getrandom], - [AS_HELP_STRING([--with-sys-getrandom], - [enforce the use of syscall SYS_getrandom function in the system @<:@default=check@:>@]) -AS_HELP_STRING([--without-sys-getrandom], - [skip auto detect of syscall SYS_getrandom @<:@default=check@:>@])], - [], - [with_sys_getrandom=check]) - -AS_IF([test "x$with_sys_getrandom" != xno], - [AC_MSG_CHECKING([for syscall SYS_getrandom (Linux 3.17+)]) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include /* for NULL */ - #include /* for syscall */ - #include /* for SYS_getrandom */ - int main() { - syscall(SYS_getrandom, NULL, 0, 0); - return 0; - } - ])], - [AC_DEFINE([HAVE_SYSCALL_GETRANDOM], [1], [Define to 1 if you have `syscall' and `SYS_getrandom'.]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AS_IF([test "x$with_sys_getrandom" = xyes], - [AC_MSG_ERROR([enforced the use of syscall SYS_getrandom --with-sys-getrandom, but not detected])])])]) - -dnl Only needed for xmlwf: -AC_CHECK_HEADERS(fcntl.h unistd.h) -AC_TYPE_OFF_T -AC_FUNC_MMAP - -AS_IF([test "$ac_cv_func_mmap_fixed_mapped" = "yes"], - [AS_VAR_SET(FILEMAP,unixfilemap)], - [AS_VAR_SET(FILEMAP,readfilemap)]) -AC_SUBST(FILEMAP) - - -dnl Some basic configuration: -AC_DEFINE([XML_NS], 1, - [Define to make XML Namespaces functionality available.]) -AC_DEFINE([XML_DTD], 1, - [Define to make parameter entity parsing functionality available.]) -AC_DEFINE([XML_DEV_URANDOM], 1, - [Define to include code reading entropy from `/dev/urandom'.]) - -AC_ARG_ENABLE([xml-attr-info], - [AS_HELP_STRING([--enable-xml-attr-info], - [Enable retrieving the byte offsets for attribute names and values @<:@default=no@:>@])], - [], - [enable_xml_attr_info=no]) -AS_IF([test "x${enable_xml_attr_info}" = "xyes"], - [AC_DEFINE([XML_ATTR_INFO], 1, - [Define to allow retrieving the byte offsets for attribute names and values.])]) - -AC_ARG_ENABLE([xml-context], - AS_HELP_STRING([--enable-xml-context @<:@COUNT@:>@], - [Retain context around the current parse point; - default is enabled and a size of 1024 bytes]) -AS_HELP_STRING([--disable-xml-context], - [Do not retain context around the current parse point]), - [enable_xml_context=${enableval}]) -AS_IF([test "x${enable_xml_context}" != "xno"], - [AS_IF([test "x${enable_xml_context}" = "xyes" \ - -o "x${enable_xml_context}" = "x"], - [AS_VAR_SET(enable_xml_context,1024)]) - AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}], - [Define to specify how much context to retain around the current parse point.])]) - -AC_ARG_WITH([docbook], - [AS_HELP_STRING([--with-docbook], - [enforce XML to man page compilation @<:@default=check@:>@]) -AS_HELP_STRING([--without-docbook], - [skip XML to man page compilation @<:@default=check@:>@])], - [], - [with_docbook=check]) - -AC_ARG_VAR([DOCBOOK_TO_MAN], [docbook2x-man command]) -AS_IF([test "x$with_docbook" != xno], - [AC_CHECK_PROGS([DOCBOOK_TO_MAN], [docbook2x-man db2x_docbook2man docbook2man docbook-to-man])]) -AS_IF([test "x${DOCBOOK_TO_MAN}" = x -a "x$with_docbook" = xyes], - [AC_MSG_ERROR([Required program 'docbook2x-man' not found.])]) -AS_IF([test "x${DOCBOOK_TO_MAN}" != x -a "x$with_docbook" != xno], - [AS_IF([${DOCBOOK_TO_MAN} --help | grep -i -q -F sgmlbase], - [AC_MSG_ERROR([Your local ${DOCBOOK_TO_MAN} was found to work with SGML rather - than XML. Please install docbook2X and use variable DOCBOOK_TO_MAN to point - configure to command docbook2x-man of docbook2X. - Or use DOCBOOK_TO_MAN="xmlto man --skip-validation" if you have xmlto around. - You can also configure using --without-docbook if you can do without a man - page for xmlwf.])])]) - -AM_CONDITIONAL(WITH_DOCBOOK, [test "x${DOCBOOK_TO_MAN}" != x]) - -AC_CONFIG_FILES([Makefile] - [expat.pc] - [doc/Makefile] - [examples/Makefile] - [lib/Makefile] - [tests/Makefile] - [tests/benchmark/Makefile] - [xmlwf/Makefile]) -AC_CONFIG_FILES([run.sh], [chmod +x run.sh]) -AC_OUTPUT diff --git a/expat/conftools/.gitignore b/expat/conftools/.gitignore deleted file mode 100644 index c214f69d..00000000 --- a/expat/conftools/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -compile -config.guess -config.sub -depcomp -install-sh -libtool.m4 -ltconfig -ltmain.sh -missing -test-driver -ar-lib diff --git a/expat/conftools/PrintPath b/expat/conftools/PrintPath deleted file mode 100755 index e8559a3d..00000000 --- a/expat/conftools/PrintPath +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh -# Look for program[s] somewhere in $PATH. -# -# Options: -# -s -# Do not print out full pathname. (silent) -# -pPATHNAME -# Look in PATHNAME instead of $PATH -# -# Usage: -# PrintPath [-s] [-pPATHNAME] program [program ...] -# -# Initially written by Jim Jagielski for the Apache configuration mechanism -# (with kudos to Kernighan/Pike) -# -# This script falls under the Apache License. -# See http://www.apache.org/licenses/LICENSE - -## -# Some "constants" -## -pathname=$PATH -echo="yes" - -## -# Find out what OS we are running for later on -## -os=`(uname) 2>/dev/null` - -## -# Parse command line -## -for args in $* -do - case $args in - -s ) echo="no" ;; - -p* ) pathname="`echo $args | sed 's/^..//'`" ;; - * ) programs="$programs $args" ;; - esac -done - -## -# Now we make the adjustments required for OS/2 and everyone -# else :) -# -# First of all, all OS/2 programs have the '.exe' extension. -# Next, we adjust PATH (or what was given to us as PATH) to -# be whitespace separated directories. -# Finally, we try to determine the best flag to use for -# test/[] to look for an executable file. OS/2 just has '-r' -# but with other OSs, we do some funny stuff to check to see -# if test/[] knows about -x, which is the preferred flag. -## - -if [ "x$os" = "xOS/2" ] -then - ext=".exe" - pathname=`echo -E $pathname | - sed 's/^;/.;/ - s/;;/;.;/g - s/;$/;./ - s/;/ /g - s/\\\\/\\//g' ` - test_exec_flag="-r" -else - ext="" # No default extensions - pathname=`echo $pathname | - sed 's/^:/.:/ - s/::/:.:/g - s/:$/:./ - s/:/ /g' ` - # Here is how we test to see if test/[] can handle -x - testfile="pp.t.$$" - - cat > $testfile </dev/null`; then - test_exec_flag="-x" - else - test_exec_flag="-r" - fi - rm -f $testfile -fi - -for program in $programs -do - for path in $pathname - do - if [ $test_exec_flag $path/${program}${ext} ] && \ - [ ! -d $path/${program}${ext} ]; then - if [ "x$echo" = "xyes" ]; then - echo $path/${program}${ext} - fi - exit 0 - fi - -# Next try without extension (if one was used above) - if [ "x$ext" != "x" ]; then - if [ $test_exec_flag $path/${program} ] && \ - [ ! -d $path/${program} ]; then - if [ "x$echo" = "xyes" ]; then - echo $path/${program} - fi - exit 0 - fi - fi - done -done -exit 1 - diff --git a/expat/conftools/ax-append-compile-flags.m4 b/expat/conftools/ax-append-compile-flags.m4 deleted file mode 100644 index 9c856356..00000000 --- a/expat/conftools/ax-append-compile-flags.m4 +++ /dev/null @@ -1,46 +0,0 @@ -# ============================================================================ -# https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) -# -# 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. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# 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 -# -# 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 7 - -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], [$4]) -done -])dnl AX_APPEND_COMPILE_FLAGS diff --git a/expat/conftools/ax-append-flag.m4 b/expat/conftools/ax-append-flag.m4 deleted file mode 100644 index dd6d8b61..00000000 --- a/expat/conftools/ax-append-flag.m4 +++ /dev/null @@ -1,50 +0,0 @@ -# =========================================================================== -# https://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 -# Copyright (c) 2011 Maarten Bosmans -# -# 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 8 - -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/expat/conftools/ax-append-link-flags.m4 b/expat/conftools/ax-append-link-flags.m4 deleted file mode 100644 index 99b9fa5b..00000000 --- a/expat/conftools/ax-append-link-flags.m4 +++ /dev/null @@ -1,44 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# For every FLAG1, FLAG2 it is checked whether the linker works with the -# flag. If it does, the flag is added FLAGS-VARIABLE -# -# If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is -# used. During the check the flag is always added to the linker's flags. -# -# If EXTRA-FLAGS is defined, it is added to the linker's default flags -# when the check is done. The check is thus made with the flags: "LDFLAGS -# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -# issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG. -# Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS. -# -# LICENSE -# -# Copyright (c) 2011 Maarten Bosmans -# -# 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 7 - -AC_DEFUN([AX_APPEND_LINK_FLAGS], -[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) -for flag in $1; do - AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4]) -done -])dnl AX_APPEND_LINK_FLAGS diff --git a/expat/conftools/ax-check-compile-flag.m4 b/expat/conftools/ax-check-compile-flag.m4 deleted file mode 100644 index ca363971..00000000 --- a/expat/conftools/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 -# Copyright (c) 2011 Maarten Bosmans -# -# 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 . -# -# 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/expat/conftools/ax-check-link-flag.m4 b/expat/conftools/ax-check-link-flag.m4 deleted file mode 100644 index 03a30ce4..00000000 --- a/expat/conftools/ax-check-link-flag.m4 +++ /dev/null @@ -1,53 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the linker 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 linker's default flags -# when the check is done. The check is thus made with the flags: "LDFLAGS -# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -# issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_LINK_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2011 Maarten Bosmans -# -# 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 6 - -AC_DEFUN([AX_CHECK_LINK_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl -AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ - ax_check_save_flags=$LDFLAGS - LDFLAGS="$LDFLAGS $4 $1" - AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - LDFLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_LINK_FLAGS diff --git a/expat/conftools/ax-require-defined.m4 b/expat/conftools/ax-require-defined.m4 deleted file mode 100644 index 17c3eab7..00000000 --- a/expat/conftools/ax-require-defined.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# =========================================================================== -# https://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 -# -# 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 2 - -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/expat/conftools/expatcfg-compiler-supports-visibility.m4 b/expat/conftools/expatcfg-compiler-supports-visibility.m4 deleted file mode 100644 index 45d07edf..00000000 --- a/expat/conftools/expatcfg-compiler-supports-visibility.m4 +++ /dev/null @@ -1,39 +0,0 @@ -# expatcfg-compiler-supports-visibility.m4 -- -# -# SYNOPSIS -# -# EXPATCFG_COMPILER_SUPPORTS_VISIBILITY([ACTION-IF-YES], -# [ACTION-IF-NO]) -# -# DESCRIPTION -# -# Check if the selected compiler supports the "visibility" attribute -# and set the variable "expatcfg_cv_compiler_supports_visibility" -# accordingly to "yes" or "no". -# -# In addition, execute ACTION-IF-YES or ACTION-IF-NO. -# -# LICENSE -# -# Copyright (c) 2018 The Expat Authors. -# -# 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. - -AC_DEFUN([EXPATCFG_COMPILER_SUPPORTS_VISIBILITY], - [AC_CACHE_CHECK([whether compiler supports visibility], - [expatcfg_cv_compiler_supports_visibility], - [AS_VAR_SET([expatcfg_cv_compiler_supports_visibility],[no]) - AS_VAR_COPY([OLDFLAGS],[CFLAGS]) - AS_VAR_APPEND([CFLAGS],[" -fvisibility=hidden -Wall -Werror -Wno-unknown-warning-option"]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - void __attribute__((visibility("default"))) foo(void); - void foo(void) {} - ]])], - [AS_VAR_SET([expatcfg_cv_compiler_supports_visibility],[yes])]) - AS_VAR_COPY([CFLAGS],[OLDFLAGS])]) - AS_IF([test "$expatcfg_cv_compiler_supports_visibility" = yes],[$1],[$2])]) - -# end of file diff --git a/expat/doc/Makefile.am b/expat/doc/Makefile.am deleted file mode 100644 index e2f02983..00000000 --- a/expat/doc/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -# -# __ __ _ -# ___\ \/ /_ __ __ _| |_ -# / _ \\ /| '_ \ / _` | __| -# | __// \| |_) | (_| | |_ -# \___/_/\_\ .__/ \__,_|\__| -# |_| XML parser -# -# Copyright (c) 2017 Expat development team -# Licensed under the MIT license: -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS IN THE SOFTWARE. - -.PHONY: dist-hook # not inside conditional to avoid automake warning - -if WITH_DOCBOOK -dist_man_MANS = xmlwf.1 - -xmlwf.1: xmlwf.xml - -rm -f $@ - $(DOCBOOK_TO_MAN) $< - test -f $@ || mv XMLWF.1 $@ -else -dist-hook: - @echo 'ERROR: Configure with --with-docbook for "make dist".' 1>&2 - @false -endif - -# https://www.gnu.org/software/automake/manual/automake.html#What-Gets-Cleaned -.PHONY: clean-local -clean-local: clean-local-check - -.PHONY: clean-local-check -clean-local-check: - $(RM) xmlwf.1 - -EXTRA_DIST = \ - expat.png \ - reference.html \ - style.css \ - valid-xhtml10.png \ - xmlwf.xml diff --git a/expat/examples/Makefile.am b/expat/examples/Makefile.am deleted file mode 100644 index 99edf212..00000000 --- a/expat/examples/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# -# __ __ _ -# ___\ \/ /_ __ __ _| |_ -# / _ \\ /| '_ \ / _` | __| -# | __// \| |_) | (_| | |_ -# \___/_/\_\ .__/ \__,_|\__| -# |_| XML parser -# -# Copyright (c) 2017 Expat development team -# Licensed under the MIT license: -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS IN THE SOFTWARE. - -AM_CPPFLAGS = -I$(srcdir)/../lib - -noinst_PROGRAMS = elements outline - -elements_SOURCES = elements.c -elements_LDADD = ../lib/libexpat.la - -outline_SOURCES = outline.c -outline_LDADD = ../lib/libexpat.la diff --git a/expat/lib/Makefile.am b/expat/lib/Makefile.am deleted file mode 100644 index 8cb451ed..00000000 --- a/expat/lib/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -# -# __ __ _ -# ___\ \/ /_ __ __ _| |_ -# / _ \\ /| '_ \ / _` | __| -# | __// \| |_) | (_| | |_ -# \___/_/\_\ .__/ \__,_|\__| -# |_| XML parser -# -# Copyright (c) 2017 Expat development team -# Licensed under the MIT license: -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS IN THE SOFTWARE. - -include_HEADERS = \ - ../expat_config.h \ - expat.h \ - expat_external.h - -lib_LTLIBRARIES = libexpat.la - -libexpat_la_LDFLAGS = \ - -no-undefined \ - -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@ - -libexpat_la_SOURCES = \ - xmlparse.c \ - xmltok.c \ - xmlrole.c - -doc_DATA = \ - ../AUTHORS \ - ../Changes - -install-data-hook: - cd "$(DESTDIR)$(docdir)" && $(am__mv) Changes changelog - -uninstall-local: - $(RM) "$(DESTDIR)$(docdir)/changelog" - -EXTRA_DIST = \ - ascii.h \ - asciitab.h \ - expat_external.h \ - expat.h \ - iasciitab.h \ - internal.h \ - latin1tab.h \ - libexpat.def \ - libexpatw.def \ - nametab.h \ - siphash.h \ - utf8tab.h \ - winconfig.h \ - xmlrole.h \ - xmltok.h \ - xmltok_impl.c \ - xmltok_impl.h \ - xmltok_ns.c diff --git a/expat/tests/Makefile.am b/expat/tests/Makefile.am deleted file mode 100644 index 742ed437..00000000 --- a/expat/tests/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -# -# __ __ _ -# ___\ \/ /_ __ __ _| |_ -# / _ \\ /| '_ \ / _` | __| -# | __// \| |_) | (_| | |_ -# \___/_/\_\ .__/ \__,_|\__| -# |_| XML parser -# -# Copyright (c) 2017 Expat development team -# Licensed under the MIT license: -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS IN THE SOFTWARE. - -SUBDIRS = . benchmark - -AM_CPPFLAGS = -I$(srcdir)/../lib - -noinst_LIBRARIES = libruntests.a - -check_PROGRAMS = runtests runtestspp -TESTS = runtests runtestspp - -# To support MinGW and Non-MinGW at the same time: -LOG_DRIVER = $(srcdir)/../test-driver-wrapper.sh - -libruntests_a_SOURCES = \ - chardata.c \ - structdata.c \ - memcheck.c \ - minicheck.c - -runtests_SOURCES = \ - runtests.c - -runtestspp_SOURCES = \ - runtestspp.cpp - -runtests_LDADD = libruntests.a ../lib/libexpat.la -runtestspp_LDADD = libruntests.a ../lib/libexpat.la - -EXTRA_DIST = \ - chardata.h \ - structdata.h \ - minicheck.h \ - memcheck.h \ - README.txt \ - udiffer.py \ - xmltest.log.expected \ - xmltest.sh diff --git a/expat/tests/benchmark/Makefile.am b/expat/tests/benchmark/Makefile.am deleted file mode 100644 index f4d7a8e2..00000000 --- a/expat/tests/benchmark/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# -# __ __ _ -# ___\ \/ /_ __ __ _| |_ -# / _ \\ /| '_ \ / _` | __| -# | __// \| |_) | (_| | |_ -# \___/_/\_\ .__/ \__,_|\__| -# |_| XML parser -# -# Copyright (c) 2017 Expat development team -# Licensed under the MIT license: -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS IN THE SOFTWARE. - -AM_CPPFLAGS = -I$(srcdir)/../../lib - -noinst_PROGRAMS = benchmark - -benchmark_SOURCES = benchmark.c - -benchmark_LDADD = ../../lib/libexpat.la - -EXTRA_DIST = \ - README.txt diff --git a/expat/xmlwf/Makefile.am b/expat/xmlwf/Makefile.am deleted file mode 100644 index 4b41c2cb..00000000 --- a/expat/xmlwf/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -# -# __ __ _ -# ___\ \/ /_ __ __ _| |_ -# / _ \\ /| '_ \ / _` | __| -# | __// \| |_) | (_| | |_ -# \___/_/\_\ .__/ \__,_|\__| -# |_| XML parser -# -# Copyright (c) 2017 Expat development team -# Licensed under the MIT license: -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the -# following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS IN THE SOFTWARE. - -bin_PROGRAMS = xmlwf - -xmlwf_LDADD = ../lib/libexpat.la -xmlwf_SOURCES = \ - xmlwf.c \ - xmlfile.c \ - codepage.c \ - @FILEMAP@.c - -xmlwf_CPPFLAGS = -I$(srcdir)/../lib - -if MINGW -if UNICODE -xmlwf_CPPFLAGS += -mwindows -xmlwf_LDFLAGS = -municode -endif -endif - -EXTRA_DIST = \ - codepage.h \ - ct.c \ - filemap.h \ - readfilemap.c \ - unixfilemap.c \ - win32filemap.c \ - xmlfile.h \ - xmlmime.c \ - xmlmime.h \ - xmltchar.h -- 2.40.0