From 49f04c2ed6e4e15f609843643fc4f12c94bf855d Mon Sep 17 00:00:00 2001 From: Ralf Corsépius Date: Jul 27 2015 07:54:20 +0000 Subject: Update to 0.10.1, bump epoch (RHBZ#1229357). - Rebase patches. --- diff --git a/.gitignore b/.gitignore index 7cf78ee..217cb1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/gumbo-parser-1.0-20140503git3a61e9a.tar.gz +/gumbo-parser-0.10.1.tar.gz diff --git a/0001-Doxygen-tweaks.patch b/0001-Doxygen-tweaks.patch index 4303f9e..28944f1 100644 --- a/0001-Doxygen-tweaks.patch +++ b/0001-Doxygen-tweaks.patch @@ -1,25 +1,16 @@ -From 390e2c06b1f08b2f36456f70f5022ecaa8bc939b Mon Sep 17 00:00:00 2001 +From 4445c669843f111d06eb999b607b4d96c31eac10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Wed, 16 Oct 2013 09:37:03 +0200 -Subject: [PATCH 1/2] Doxygen tweaks +Subject: [PATCH 2/3] Doxygen tweaks --- - Doxyfile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + Doxyfile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doxyfile b/Doxyfile -index 7a5bb47..7ee25ba 100644 +index b411da6..3fda5a2 100644 --- a/Doxyfile +++ b/Doxyfile -@@ -32,7 +32,7 @@ PROJECT_NAME = "Gumbo" - # This could be handy for archiving the generated documentation or - # if some version control system is used. - --PROJECT_NUMBER = {{VERSION}} -+PROJECT_NUMBER = 1.0 - - # Using the PROJECT_BRIEF tag one can provide an optional one line description - # for a project that appears at the top of each page and should give viewer @@ -128,7 +128,7 @@ FULL_PATH_NAMES = NO # If left blank the directory from which doxygen is run is used as the # path to strip. @@ -39,5 +30,5 @@ index 7a5bb47..7ee25ba 100644 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to -- -1.8.3.1 +2.4.3 diff --git a/0002-Autotool-generated-sources.patch b/0002-Autotool-generated-sources.patch index 32841f0..4be7165 100644 --- a/0002-Autotool-generated-sources.patch +++ b/0002-Autotool-generated-sources.patch @@ -1,27 +1,29 @@ -From a42aaff3ca60ff00ab38390718c312fa2102ff5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Wed, 16 Oct 2013 09:37:48 +0200 -Subject: [PATCH 2/2] Autotool generated sources +From 85f561a4a5f9f615725ca6752f9919fecd246608 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= +Date: Sun, 15 Feb 2015 17:16:11 +0100 +Subject: [PATCH 3/3] Autotool generated sources --- - Makefile.in | 1723 +++++ - aclocal.m4 | 1044 +++ - config.guess | 1558 +++++ - config.sub | 1788 ++++++ - configure | 17954 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.in | 1799 ++++++ + aclocal.m4 | 1157 ++++ + compile | 347 + + config.guess | 1421 +++++ + config.sub | 1807 ++++++ + configure | 18061 ++++++++++++++++++++++++++++++++++++++++++++++++++++ depcomp | 791 +++ - install-sh | 527 ++ + install-sh | 501 ++ ltmain.sh | 9655 ++++++++++++++++++++++++++++ - m4/libtool.m4 | 7986 +++++++++++++++++++++++ + m4/libtool.m4 | 7992 +++++++++++++++++++++++ m4/ltoptions.m4 | 384 ++ m4/ltsugar.m4 | 123 + m4/ltversion.m4 | 23 + m4/lt~obsolete.m4 | 98 + missing | 215 + - test-driver | 127 + - 15 files changed, 43996 insertions(+) + test-driver | 148 + + 16 files changed, 44522 insertions(+) create mode 100644 Makefile.in create mode 100644 aclocal.m4 + create mode 100755 compile create mode 100755 config.guess create mode 100755 config.sub create mode 100755 configure @@ -38,14 +40,14 @@ Subject: [PATCH 2/2] Autotool generated sources diff --git a/Makefile.in b/Makefile.in new file mode 100644 -index 0000000..9335985 +index 0000000..f0212cf --- /dev/null +++ b/Makefile.in -@@ -0,0 +1,1723 @@ -+# Makefile.in generated by automake 1.13.4 from Makefile.am. +@@ -0,0 +1,1799 @@ ++# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -69,7 +71,17 @@ index 0000000..9335985 + + +VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ @@ -140,13 +152,9 @@ index 0000000..9335985 +@HAVE_SHARED_LIBGTEST_FALSE@am__append_2 = check-local +@HAVE_SHARED_LIBGTEST_FALSE@am__append_3 = gtest/lib/libgtest.la gtest/lib/libgtest_main.la +noinst_PROGRAMS = clean_text$(EXEEXT) find_links$(EXEEXT) \ -+ get_title$(EXEEXT) positions_of_class$(EXEEXT) ++ get_title$(EXEEXT) positions_of_class$(EXEEXT) \ ++ benchmark$(EXEEXT) serialize$(EXEEXT) prettyprint$(EXEEXT) +subdir = . -+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/configure $(am__configure_deps) \ -+ $(srcdir)/gumbo.pc.in depcomp $(include_HEADERS) test-driver \ -+ COPYING THANKS config.guess config.sub install-sh missing \ -+ ltmain.sh +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -154,6 +162,8 @@ index 0000000..9335985 + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ ++ $(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d @@ -206,6 +216,10 @@ index 0000000..9335985 + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgumbo_la_CFLAGS) \ + $(CFLAGS) $(libgumbo_la_LDFLAGS) $(LDFLAGS) -o $@ +PROGRAMS = $(noinst_PROGRAMS) ++am_benchmark_OBJECTS = benchmarks/benchmark.$(OBJEXT) ++benchmark_OBJECTS = $(am_benchmark_OBJECTS) ++benchmark_LDADD = $(LDADD) ++benchmark_DEPENDENCIES = libgumbo.la +am_clean_text_OBJECTS = examples/clean_text.$(OBJEXT) +clean_text_OBJECTS = $(am_clean_text_OBJECTS) +clean_text_LDADD = $(LDADD) @@ -233,6 +247,14 @@ index 0000000..9335985 +positions_of_class_OBJECTS = $(am_positions_of_class_OBJECTS) +positions_of_class_LDADD = $(LDADD) +positions_of_class_DEPENDENCIES = libgumbo.la ++am_prettyprint_OBJECTS = examples/prettyprint.$(OBJEXT) ++prettyprint_OBJECTS = $(am_prettyprint_OBJECTS) ++prettyprint_LDADD = $(LDADD) ++prettyprint_DEPENDENCIES = libgumbo.la ++am_serialize_OBJECTS = examples/serialize.$(OBJEXT) ++serialize_OBJECTS = $(am_serialize_OBJECTS) ++serialize_LDADD = $(LDADD) ++serialize_DEPENDENCIES = libgumbo.la +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false @@ -285,12 +307,16 @@ index 0000000..9335985 +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = -+SOURCES = $(libgumbo_la_SOURCES) $(clean_text_SOURCES) \ -+ $(find_links_SOURCES) $(get_title_SOURCES) \ -+ $(gumbo_test_SOURCES) $(positions_of_class_SOURCES) -+DIST_SOURCES = $(libgumbo_la_SOURCES) $(clean_text_SOURCES) \ -+ $(find_links_SOURCES) $(get_title_SOURCES) \ -+ $(gumbo_test_SOURCES) $(positions_of_class_SOURCES) ++SOURCES = $(libgumbo_la_SOURCES) $(benchmark_SOURCES) \ ++ $(clean_text_SOURCES) $(find_links_SOURCES) \ ++ $(get_title_SOURCES) $(gumbo_test_SOURCES) \ ++ $(positions_of_class_SOURCES) $(prettyprint_SOURCES) \ ++ $(serialize_SOURCES) ++DIST_SOURCES = $(libgumbo_la_SOURCES) $(benchmark_SOURCES) \ ++ $(clean_text_SOURCES) $(find_links_SOURCES) \ ++ $(get_title_SOURCES) $(gumbo_test_SOURCES) \ ++ $(positions_of_class_SOURCES) $(prettyprint_SOURCES) \ ++ $(serialize_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ @@ -495,6 +521,9 @@ index 0000000..9335985 +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) ++am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gumbo.pc.in COPYING \ ++ THANKS compile config.guess config.sub depcomp install-sh \ ++ ltmain.sh missing test-driver +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) @@ -650,6 +679,10 @@ index 0000000..9335985 + src/string_piece.c \ + src/string_piece.h \ + src/tag.c \ ++ src/tag_enum.h \ ++ src/tag_gperf.h \ ++ src/tag_strings.h \ ++ src/tag_sizes.h \ + src/token_type.h \ + src/tokenizer.c \ + src/tokenizer.h \ @@ -661,7 +694,7 @@ index 0000000..9335985 + src/vector.c \ + src/vector.h + -+include_HEADERS = src/gumbo.h ++include_HEADERS = src/gumbo.h src/tag_enum.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gumbo.pc +gumbo_test_CPPFLAGS = \ @@ -688,6 +721,9 @@ index 0000000..9335985 +find_links_SOURCES = examples/find_links.cc +get_title_SOURCES = examples/get_title.c +positions_of_class_SOURCES = examples/positions_of_class.cc ++benchmark_SOURCES = benchmarks/benchmark.cc ++serialize_SOURCES = examples/serialize.cc ++prettyprint_SOURCES = examples/prettyprint.cc +all: all-am + +.SUFFIXES: @@ -707,7 +743,6 @@ index 0000000..9335985 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile -+.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ @@ -812,6 +847,18 @@ index 0000000..9335985 + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list ++benchmarks/$(am__dirstamp): ++ @$(MKDIR_P) benchmarks ++ @: > benchmarks/$(am__dirstamp) ++benchmarks/$(DEPDIR)/$(am__dirstamp): ++ @$(MKDIR_P) benchmarks/$(DEPDIR) ++ @: > benchmarks/$(DEPDIR)/$(am__dirstamp) ++benchmarks/benchmark.$(OBJEXT): benchmarks/$(am__dirstamp) \ ++ benchmarks/$(DEPDIR)/$(am__dirstamp) ++ ++benchmark$(EXEEXT): $(benchmark_OBJECTS) $(benchmark_DEPENDENCIES) $(EXTRA_benchmark_DEPENDENCIES) ++ @rm -f benchmark$(EXEEXT) ++ $(AM_V_CXXLD)$(CXXLINK) $(benchmark_OBJECTS) $(benchmark_LDADD) $(LIBS) +examples/$(am__dirstamp): + @$(MKDIR_P) examples + @: > examples/$(am__dirstamp) @@ -870,9 +917,22 @@ index 0000000..9335985 +positions_of_class$(EXEEXT): $(positions_of_class_OBJECTS) $(positions_of_class_DEPENDENCIES) $(EXTRA_positions_of_class_DEPENDENCIES) + @rm -f positions_of_class$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(positions_of_class_OBJECTS) $(positions_of_class_LDADD) $(LIBS) ++examples/prettyprint.$(OBJEXT): examples/$(am__dirstamp) \ ++ examples/$(DEPDIR)/$(am__dirstamp) ++ ++prettyprint$(EXEEXT): $(prettyprint_OBJECTS) $(prettyprint_DEPENDENCIES) $(EXTRA_prettyprint_DEPENDENCIES) ++ @rm -f prettyprint$(EXEEXT) ++ $(AM_V_CXXLD)$(CXXLINK) $(prettyprint_OBJECTS) $(prettyprint_LDADD) $(LIBS) ++examples/serialize.$(OBJEXT): examples/$(am__dirstamp) \ ++ examples/$(DEPDIR)/$(am__dirstamp) ++ ++serialize$(EXEEXT): $(serialize_OBJECTS) $(serialize_DEPENDENCIES) $(EXTRA_serialize_DEPENDENCIES) ++ @rm -f serialize$(EXEEXT) ++ $(AM_V_CXXLD)$(CXXLINK) $(serialize_OBJECTS) $(serialize_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) ++ -rm -f benchmarks/*.$(OBJEXT) + -rm -f examples/*.$(OBJEXT) + -rm -f src/*.$(OBJEXT) + -rm -f src/*.lo @@ -881,10 +941,13 @@ index 0000000..9335985 +distclean-compile: + -rm -f *.tab.c + ++@AMDEP_TRUE@@am__include@ @am__quote@benchmarks/$(DEPDIR)/benchmark.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/clean_text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/find_links.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/get_title.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/positions_of_class.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/prettyprint.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/serialize.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libgumbo_la-attribute.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libgumbo_la-char_ref.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libgumbo_la-error.Plo@am__quote@ @@ -1298,7 +1361,7 @@ index 0000000..9335985 + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ -+ else \ ++ elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ @@ -1487,10 +1550,16 @@ index 0000000..9335985 + $(am__post_remove_distdir) + +dist-tarZ: distdir ++ @echo WARNING: "Support for distribution archives compressed with" \ ++ "legacy program 'compress' is deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir ++ @echo WARNING: "Support for shar distribution archives is" \ ++ "deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + @@ -1525,16 +1594,17 @@ index 0000000..9335985 + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) -+ mkdir $(distdir)/_build $(distdir)/_inst ++ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ -+ && $(am__cd) $(distdir)/_build \ -+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ && $(am__cd) $(distdir)/_build/sub \ ++ && ../../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ ++ --srcdir=../.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1626,6 +1696,8 @@ index 0000000..9335985 +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ -rm -f benchmarks/$(DEPDIR)/$(am__dirstamp) ++ -rm -f benchmarks/$(am__dirstamp) + -rm -f examples/$(DEPDIR)/$(am__dirstamp) + -rm -f examples/$(am__dirstamp) + -rm -f src/$(DEPDIR)/$(am__dirstamp) @@ -1644,7 +1716,7 @@ index 0000000..9335985 + +distclean: distclean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -rf examples/$(DEPDIR) src/$(DEPDIR) tests/$(DEPDIR) ++ -rm -rf benchmarks/$(DEPDIR) examples/$(DEPDIR) src/$(DEPDIR) tests/$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags @@ -1692,7 +1764,7 @@ index 0000000..9335985 +maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache -+ -rm -rf examples/$(DEPDIR) src/$(DEPDIR) tests/$(DEPDIR) ++ -rm -rf benchmarks/$(DEPDIR) examples/$(DEPDIR) src/$(DEPDIR) tests/$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + @@ -1735,6 +1807,8 @@ index 0000000..9335985 + uninstall-includeHEADERS uninstall-libLTLIBRARIES \ + uninstall-pkgconfigDATA + ++.PRECIOUS: Makefile ++ + +# Build gtest before we build protobuf tests.  We don't add gtest to SUBDIRS +# because then "make check" would also build and run all of gtest's own tests, @@ -1762,18 +1836,22 @@ index 0000000..9335985 +@HAVE_SHARED_LIBGTEST_FALSE@ cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ +@HAVE_SHARED_LIBGTEST_FALSE@ fi + ++gentags: src/tag.in ++ @python gentags.py $< ++ @gperf -LANSI-C --ignore-case -m200 $< |python genperf.py >src/tag_gperf.h ++ +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 -index 0000000..950b0d5 +index 0000000..3253aa3 --- /dev/null +++ b/aclocal.m4 -@@ -0,0 +1,1044 @@ -+# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +@@ -0,0 +1,1157 @@ ++# generated automatically by aclocal 1.15 -*- Autoconf -*- + -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++# Copyright (C) 1996-2014 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -1793,7 +1871,7 @@ index 0000000..950b0d5 +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + -+# Copyright (C) 2002-2013 Free Software Foundation, Inc. ++# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -1805,10 +1883,10 @@ index 0000000..950b0d5 +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.13' ++[am__api_version='1.15' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.13.4], [], ++m4_if([$1], [1.15], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + @@ -1824,14 +1902,14 @@ index 0000000..950b0d5 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+[AM_AUTOMAKE_VERSION([1.13.4])dnl ++[AM_AUTOMAKE_VERSION([1.15])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -1876,15 +1954,14 @@ index 0000000..950b0d5 +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` ++[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl ++# Expand $ac_aux_dir to an absolute path. ++am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + -+# Copyright (C) 1997-2013 Free Software Foundation, Inc. ++# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -1915,7 +1992,7 @@ index 0000000..950b0d5 +Usually this means the macro was only invoked conditionally.]]) +fi])]) + -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. ++# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2106,7 +2183,7 @@ index 0000000..950b0d5 + +# Generate code to set up dependency tracking. -*- Autoconf -*- + -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. ++# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2182,7 +2259,7 @@ index 0000000..950b0d5 + +# Do all the work for Automake. -*- Autoconf -*- + -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2191,6 +2268,12 @@ index 0000000..950b0d5 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + ++dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. ++m4_define([AC_PROG_CC], ++m4_defn([AC_PROG_CC]) ++[_AM_PROG_CC_C_O ++]) ++ +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- @@ -2266,8 +2349,8 @@ index 0000000..950b0d5 +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. ++# We need awk for the "check" target (and possibly the TAP driver). The ++# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -2299,6 +2382,51 @@ index 0000000..950b0d5 +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ++ ++# POSIX will say in a future version that running "rm -f" with no argument ++# is OK; and we want to be able to make that assumption in our Makefile ++# recipes. So use an aggressive probe to check that the usage we want is ++# actually supported "in the wild" to an acceptable degree. ++# See automake bug#10828. ++# To make any issue more visible, cause the running configure to be aborted ++# by default if the 'rm' program in use doesn't match our expectations; the ++# user can still override this though. ++if rm -f && rm -fr && rm -rf; then : OK; else ++ cat >&2 <<'END' ++Oops! ++ ++Your 'rm' program seems unable to run without file operands specified ++on the command line, even when the '-f' option is present. This is contrary ++to the behaviour of most rm programs out there, and not conforming with ++the upcoming POSIX standard: ++ ++Please tell bug-automake@gnu.org about your system, including the value ++of your $PATH and any error possibly output before this message. This ++can help us improve future automake versions. ++ ++END ++ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then ++ echo 'Configuration will proceed anyway, since you have set the' >&2 ++ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 ++ echo >&2 ++ else ++ cat >&2 <<'END' ++Aborting the configuration process, to ensure you take notice of the issue. ++ ++You can download and install GNU coreutils to get an 'rm' implementation ++that behaves properly: . ++ ++If you want to complete the configuration process using your problematic ++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM ++to "yes", and re-run configure. ++ ++END ++ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) ++ fi ++fi ++dnl The trailing newline in this macro's definition is deliberate, for ++dnl backward compatibility and to allow trailing 'dnl'-style comments ++dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -2307,7 +2435,6 @@ index 0000000..950b0d5 +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + -+ +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. @@ -2329,7 +2456,7 @@ index 0000000..950b0d5 +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2340,7 +2467,7 @@ index 0000000..950b0d5 +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+if test x"${install_sh}" != xset; then ++if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2350,7 +2477,7 @@ index 0000000..950b0d5 +fi +AC_SUBST([install_sh])]) + -+# Copyright (C) 2003-2013 Free Software Foundation, Inc. ++# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2371,7 +2498,7 @@ index 0000000..950b0d5 + +# Check to see how 'make' treats includes. -*- Autoconf -*- + -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2421,7 +2548,7 @@ index 0000000..950b0d5 + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + -+# Copyright (C) 1997-2013 Free Software Foundation, Inc. ++# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2460,7 +2587,7 @@ index 0000000..950b0d5 + +# Helper functions for option handling. -*- Autoconf -*- + -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2489,9 +2616,73 @@ index 0000000..950b0d5 +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + ++# Copyright (C) 1999-2014 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# _AM_PROG_CC_C_O ++# --------------- ++# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC ++# to automatically call this. ++AC_DEFUN([_AM_PROG_CC_C_O], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([compile])dnl ++AC_LANG_PUSH([C])dnl ++AC_CACHE_CHECK( ++ [whether $CC understands -c and -o together], ++ [am_cv_prog_cc_c_o], ++ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) ++ # Make sure it works both with $CC and with simple cc. ++ # Following AC_PROG_CC_C_O, we do the test twice because some ++ # compilers refuse to overwrite an existing .o file with -o, ++ # though they will create one. ++ am_cv_prog_cc_c_o=yes ++ for am_i in 1 2; do ++ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ ++ && test -f conftest2.$ac_objext; then ++ : OK ++ else ++ am_cv_prog_cc_c_o=no ++ break ++ fi ++ done ++ rm -f core conftest* ++ unset am_i]) ++if test "$am_cv_prog_cc_c_o" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++AC_LANG_POP([C])]) ++ ++# For backward compatibility. ++AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) ++ ++# Copyright (C) 2001-2014 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) ++ +# Check to make sure that the build environment is sane. -*- Autoconf -*- + -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2572,7 +2763,7 @@ index 0000000..950b0d5 +rm -f conftest.file +]) + -+# Copyright (C) 2009-2013 Free Software Foundation, Inc. ++# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2632,7 +2823,7 @@ index 0000000..950b0d5 +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + -+# Copyright (C) 2001-2013 Free Software Foundation, Inc. ++# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2660,7 +2851,7 @@ index 0000000..950b0d5 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + -+# Copyright (C) 2006-2013 Free Software Foundation, Inc. ++# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2679,7 +2870,7 @@ index 0000000..950b0d5 + +# Check how to create a tarball. -*- Autoconf -*- + -+# Copyright (C) 2004-2013 Free Software Foundation, Inc. ++# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, @@ -2815,17 +3006,370 @@ index 0000000..950b0d5 +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) +diff --git a/compile b/compile +new file mode 100755 +index 0000000..a85b723 +--- /dev/null ++++ b/compile +@@ -0,0 +1,347 @@ ++#! /bin/sh ++# Wrapper for compilers which do not understand '-c -o'. ++ ++scriptversion=2012-10-14.11; # UTC ++ ++# Copyright (C) 1999-2014 Free Software Foundation, Inc. ++# Written by Tom Tromey . ++# ++# 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 2, 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 to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . ++ ++nl=' ++' ++ ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent tools from complaining about whitespace usage. ++IFS=" "" $nl" ++ ++file_conv= ++ ++# func_file_conv build_file lazy ++# Convert a $build file to $host form and store it in $file ++# Currently only supports Windows hosts. If the determined conversion ++# type is listed in (the comma separated) LAZY, no conversion will ++# take place. ++func_file_conv () ++{ ++ file=$1 ++ case $file in ++ / | /[!/]*) # absolute file, and not a UNC file ++ if test -z "$file_conv"; then ++ # lazily determine how to convert abs files ++ case `uname -s` in ++ MINGW*) ++ file_conv=mingw ++ ;; ++ CYGWIN*) ++ file_conv=cygwin ++ ;; ++ *) ++ file_conv=wine ++ ;; ++ esac ++ fi ++ case $file_conv/,$2, in ++ *,$file_conv,*) ++ ;; ++ mingw/*) ++ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ++ ;; ++ cygwin/*) ++ file=`cygpath -m "$file" || echo "$file"` ++ ;; ++ wine/*) ++ file=`winepath -w "$file" || echo "$file"` ++ ;; ++ esac ++ ;; ++ esac ++} ++ ++# func_cl_dashL linkdir ++# Make cl look for libraries in LINKDIR ++func_cl_dashL () ++{ ++ func_file_conv "$1" ++ if test -z "$lib_path"; then ++ lib_path=$file ++ else ++ lib_path="$lib_path;$file" ++ fi ++ linker_opts="$linker_opts -LIBPATH:$file" ++} ++ ++# func_cl_dashl library ++# Do a library search-path lookup for cl ++func_cl_dashl () ++{ ++ lib=$1 ++ found=no ++ save_IFS=$IFS ++ IFS=';' ++ for dir in $lib_path $LIB ++ do ++ IFS=$save_IFS ++ if $shared && test -f "$dir/$lib.dll.lib"; then ++ found=yes ++ lib=$dir/$lib.dll.lib ++ break ++ fi ++ if test -f "$dir/$lib.lib"; then ++ found=yes ++ lib=$dir/$lib.lib ++ break ++ fi ++ if test -f "$dir/lib$lib.a"; then ++ found=yes ++ lib=$dir/lib$lib.a ++ break ++ fi ++ done ++ IFS=$save_IFS ++ ++ if test "$found" != yes; then ++ lib=$lib.lib ++ fi ++} ++ ++# func_cl_wrapper cl arg... ++# Adjust compile command to suit cl ++func_cl_wrapper () ++{ ++ # Assume a capable shell ++ lib_path= ++ shared=: ++ linker_opts= ++ for arg ++ do ++ if test -n "$eat"; then ++ eat= ++ else ++ case $1 in ++ -o) ++ # configure might choose to run compile as 'compile cc -o foo foo.c'. ++ eat=1 ++ case $2 in ++ *.o | *.[oO][bB][jJ]) ++ func_file_conv "$2" ++ set x "$@" -Fo"$file" ++ shift ++ ;; ++ *) ++ func_file_conv "$2" ++ set x "$@" -Fe"$file" ++ shift ++ ;; ++ esac ++ ;; ++ -I) ++ eat=1 ++ func_file_conv "$2" mingw ++ set x "$@" -I"$file" ++ shift ++ ;; ++ -I*) ++ func_file_conv "${1#-I}" mingw ++ set x "$@" -I"$file" ++ shift ++ ;; ++ -l) ++ eat=1 ++ func_cl_dashl "$2" ++ set x "$@" "$lib" ++ shift ++ ;; ++ -l*) ++ func_cl_dashl "${1#-l}" ++ set x "$@" "$lib" ++ shift ++ ;; ++ -L) ++ eat=1 ++ func_cl_dashL "$2" ++ ;; ++ -L*) ++ func_cl_dashL "${1#-L}" ++ ;; ++ -static) ++ shared=false ++ ;; ++ -Wl,*) ++ arg=${1#-Wl,} ++ save_ifs="$IFS"; IFS=',' ++ for flag in $arg; do ++ IFS="$save_ifs" ++ linker_opts="$linker_opts $flag" ++ done ++ IFS="$save_ifs" ++ ;; ++ -Xlinker) ++ eat=1 ++ linker_opts="$linker_opts $2" ++ ;; ++ -*) ++ set x "$@" "$1" ++ shift ++ ;; ++ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) ++ func_file_conv "$1" ++ set x "$@" -Tp"$file" ++ shift ++ ;; ++ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) ++ func_file_conv "$1" mingw ++ set x "$@" "$file" ++ shift ++ ;; ++ *) ++ set x "$@" "$1" ++ shift ++ ;; ++ esac ++ fi ++ shift ++ done ++ if test -n "$linker_opts"; then ++ linker_opts="-link$linker_opts" ++ fi ++ exec "$@" $linker_opts ++ exit 1 ++} ++ ++eat= ++ ++case $1 in ++ '') ++ echo "$0: No command. Try '$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: compile [--help] [--version] PROGRAM [ARGS] ++ ++Wrapper for compilers which do not understand '-c -o'. ++Remove '-o dest.o' from ARGS, run PROGRAM with the remaining ++arguments, and rename the output as expected. ++ ++If you are trying to build a whole package this is not the ++right script to run: please start by reading the file 'INSTALL'. ++ ++Report bugs to . ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "compile $scriptversion" ++ exit $? ++ ;; ++ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) ++ func_cl_wrapper "$@" # Doesn't return... ++ ;; ++esac ++ ++ofile= ++cfile= ++ ++for arg ++do ++ if test -n "$eat"; then ++ eat= ++ else ++ case $1 in ++ -o) ++ # configure might choose to run compile as 'compile cc -o foo foo.c'. ++ # So we strip '-o arg' only if arg is an object. ++ eat=1 ++ case $2 in ++ *.o | *.obj) ++ ofile=$2 ++ ;; ++ *) ++ set x "$@" -o "$2" ++ shift ++ ;; ++ esac ++ ;; ++ *.c) ++ cfile=$1 ++ set x "$@" "$1" ++ shift ++ ;; ++ *) ++ set x "$@" "$1" ++ shift ++ ;; ++ esac ++ fi ++ shift ++done ++ ++if test -z "$ofile" || test -z "$cfile"; then ++ # If no '-o' option was seen then we might have been invoked from a ++ # pattern rule where we don't need one. That is ok -- this is a ++ # normal compilation that the losing compiler can handle. If no ++ # '.c' file was seen then we are probably linking. That is also ++ # ok. ++ exec "$@" ++fi ++ ++# Name of file we expect compiler to create. ++cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` ++ ++# Create the lock directory. ++# Note: use '[/\\:.-]' here to ensure that we don't use the same name ++# that we are using for the .o file. Also, base the name on the expected ++# object file name, since that is what matters with a parallel build. ++lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d ++while true; do ++ if mkdir "$lockdir" >/dev/null 2>&1; then ++ break ++ fi ++ sleep 1 ++done ++# FIXME: race condition here if user kills between mkdir and trap. ++trap "rmdir '$lockdir'; exit 1" 1 2 15 ++ ++# Run the compile. ++"$@" ++ret=$? ++ ++if test -f "$cofile"; then ++ test "$cofile" = "$ofile" || mv "$cofile" "$ofile" ++elif test -f "${cofile}bj"; then ++ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" ++fi ++ ++rmdir "$lockdir" ++exit $ret ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" ++# End: diff --git a/config.guess b/config.guess new file mode 100755 -index 0000000..b79252d +index 0000000..dbfb978 --- /dev/null +++ b/config.guess -@@ -0,0 +1,1558 @@ +@@ -0,0 +1,1421 @@ +#! /bin/sh +# Attempt to guess a canonical system name. -+# Copyright 1992-2013 Free Software Foundation, Inc. ++# Copyright 1992-2015 Free Software Foundation, Inc. + -+timestamp='2013-06-10' ++timestamp='2015-01-01' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by @@ -2847,12 +3391,12 @@ index 0000000..b79252d +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# -+# Originally written by Per Bothner. ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++# Please send patches to . + + +me=`echo "$0" | sed -e 's,.*/,,'` @@ -2873,7 +3417,7 @@ index 0000000..b79252d +GNU config.guess ($timestamp) + +Originally written by Per Bothner. -+Copyright 1992-2013 Free Software Foundation, Inc. ++Copyright 1992-2015 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -2972,7 +3516,7 @@ index 0000000..b79252d + LIBC=gnu + #endif + EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + @@ -3402,8 +3946,9 @@ index 0000000..b79252d + else + IBM_ARCH=powerpc + fi -+ if [ -x /usr/bin/oslevel ] ; then -+ IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi @@ -3649,7 +4194,7 @@ index 0000000..b79252d + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; -+ i*:MSYS*:*) ++ *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) @@ -3792,10 +4337,10 @@ index 0000000..b79252d + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; -+ or1k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-${LIBC} + exit ;; -+ or32:Linux:*:*) ++ or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) @@ -4083,16 +4628,26 @@ index 0000000..b79252d + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ case $UNAME_PROCESSOR in -+ i386) UNAME_PROCESSOR=x86_64 ;; -+ powerpc) UNAME_PROCESSOR=powerpc64 ;; -+ esac ++ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi + fi ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # Avoid executing cc on OS X 10.9, as it ships with a stub ++ # that puts up a graphical alert prompting to install ++ # developer tools. Any system running Mac OS X 10.7 or ++ # later (Darwin 11 and later) is required to have a 64-bit ++ # processor. This is not true of the ARM version of Darwin ++ # that Apple uses in portable devices. ++ UNAME_PROCESSOR=x86_64 + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; @@ -4184,154 +4739,6 @@ index 0000000..b79252d + exit ;; +esac + -+eval $set_cc_for_build -+cat >$dummy.c < -+# include -+#endif -+main () -+{ -+#if defined (sony) -+#if defined (MIPSEB) -+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, -+ I don't know.... */ -+ printf ("mips-sony-bsd\n"); exit (0); -+#else -+#include -+ printf ("m68k-sony-newsos%s\n", -+#ifdef NEWSOS4 -+ "4" -+#else -+ "" -+#endif -+ ); exit (0); -+#endif -+#endif -+ -+#if defined (__arm) && defined (__acorn) && defined (__unix) -+ printf ("arm-acorn-riscix\n"); exit (0); -+#endif -+ -+#if defined (hp300) && !defined (hpux) -+ printf ("m68k-hp-bsd\n"); exit (0); -+#endif -+ -+#if defined (NeXT) -+#if !defined (__ARCHITECTURE__) -+#define __ARCHITECTURE__ "m68k" -+#endif -+ int version; -+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; -+ if (version < 4) -+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); -+ else -+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); -+ exit (0); -+#endif -+ -+#if defined (MULTIMAX) || defined (n16) -+#if defined (UMAXV) -+ printf ("ns32k-encore-sysv\n"); exit (0); -+#else -+#if defined (CMU) -+ printf ("ns32k-encore-mach\n"); exit (0); -+#else -+ printf ("ns32k-encore-bsd\n"); exit (0); -+#endif -+#endif -+#endif -+ -+#if defined (__386BSD__) -+ printf ("i386-pc-bsd\n"); exit (0); -+#endif -+ -+#if defined (sequent) -+#if defined (i386) -+ printf ("i386-sequent-dynix\n"); exit (0); -+#endif -+#if defined (ns32000) -+ printf ("ns32k-sequent-dynix\n"); exit (0); -+#endif -+#endif -+ -+#if defined (_SEQUENT_) -+ struct utsname un; -+ -+ uname(&un); -+ -+ if (strncmp(un.version, "V2", 2) == 0) { -+ printf ("i386-sequent-ptx2\n"); exit (0); -+ } -+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ -+ printf ("i386-sequent-ptx1\n"); exit (0); -+ } -+ printf ("i386-sequent-ptx\n"); exit (0); -+ -+#endif -+ -+#if defined (vax) -+# if !defined (ultrix) -+# include -+# if defined (BSD) -+# if BSD == 43 -+ printf ("vax-dec-bsd4.3\n"); exit (0); -+# else -+# if BSD == 199006 -+ printf ("vax-dec-bsd4.3reno\n"); exit (0); -+# else -+ printf ("vax-dec-bsd\n"); exit (0); -+# endif -+# endif -+# else -+ printf ("vax-dec-bsd\n"); exit (0); -+# endif -+# else -+ printf ("vax-dec-ultrix\n"); exit (0); -+# endif -+#endif -+ -+#if defined (alliant) && defined (i860) -+ printf ("i860-alliant-bsd\n"); exit (0); -+#endif -+ -+ exit (1); -+} -+EOF -+ -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } -+ -+# Apollos put the system type in the environment. -+ -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } -+ -+# Convex versions that predate uname can use getsysinfo(1) -+ -+if [ -x /usr/convex/getsysinfo ] -+then -+ case `getsysinfo -f cpu_type` in -+ c1*) -+ echo c1-convex-bsd -+ exit ;; -+ c2*) -+ if getsysinfo -f scalar_acc -+ then echo c32-convex-bsd -+ else echo c2-convex-bsd -+ fi -+ exit ;; -+ c34*) -+ echo c34-convex-bsd -+ exit ;; -+ c38*) -+ echo c38-convex-bsd -+ exit ;; -+ c4*) -+ echo c4-convex-bsd -+ exit ;; -+ esac -+fi -+ +cat >&2 <. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. @@ -4455,7 +4862,7 @@ index 0000000..c765b34 +version="\ +GNU config.sub ($timestamp) + -+Copyright 1992-2013 Free Software Foundation, Inc. ++Copyright 1992-2015 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -4644,14 +5051,15 @@ index 0000000..c765b34 + | avr | avr32 \ + | be32 | be64 \ + | bfin \ -+ | c4x | clipper \ ++ | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | epiphany \ -+ | fido | fr30 | frv \ ++ | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -4669,8 +5077,10 @@ index 0000000..c765b34 + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ @@ -4682,11 +5092,11 @@ index 0000000..c765b34 + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ -+ | open8 \ -+ | or1k | or32 \ ++ | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -4697,6 +5107,7 @@ index 0000000..c765b34 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ ++ | visium \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) @@ -4711,7 +5122,10 @@ index 0000000..c765b34 + c6x) + basic_machine=tic6x-unknown + ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) ++ leon|leon[3-9]) ++ basic_machine=sparc-$basic_machine ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; @@ -4759,7 +5173,7 @@ index 0000000..c765b34 + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ -+ | clipper-* | craynv-* | cydra-* \ ++ | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -4768,6 +5182,7 @@ index 0000000..c765b34 + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ @@ -4787,8 +5202,10 @@ index 0000000..c765b34 + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ @@ -4800,6 +5217,7 @@ index 0000000..c765b34 + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ ++ | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -4817,6 +5235,7 @@ index 0000000..c765b34 + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ ++ | visium-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ @@ -5154,6 +5573,9 @@ index 0000000..c765b34 + basic_machine=m68k-isi + os=-sysv + ;; ++ leon-*|leon[3-9]-*) ++ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` ++ ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux @@ -5181,7 +5603,7 @@ index 0000000..c765b34 + os=-mingw64 + ;; + mingw32) -+ basic_machine=i386-pc ++ basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) @@ -5209,6 +5631,10 @@ index 0000000..c765b34 + basic_machine=powerpc-unknown + os=-morphos + ;; ++ moxiebox) ++ basic_machine=moxie-unknown ++ os=-moxiebox ++ ;; + msdos) + basic_machine=i386-pc + os=-msdos @@ -5217,7 +5643,7 @@ index 0000000..c765b34 + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) -+ basic_machine=i386-pc ++ basic_machine=i686-pc + os=-msys + ;; + mvs) @@ -5754,14 +6180,14 @@ index 0000000..c765b34 + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) @@ -5933,6 +6359,9 @@ index 0000000..c765b34 + c4x-* | tic4x-*) + os=-coff + ;; ++ c8051-*) ++ os=-elf ++ ;; + hexagon-*) + os=-elf + ;; @@ -5976,9 +6405,6 @@ index 0000000..c765b34 + mips*-*) + os=-elf + ;; -+ or1k-*) -+ os=-elf -+ ;; + or32-*) + os=-coff + ;; @@ -6175,15 +6601,15 @@ index 0000000..c765b34 +# End: diff --git a/configure b/configure new file mode 100755 -index 0000000..d46f2ff +index 0000000..7b2716f --- /dev/null +++ b/configure -@@ -0,0 +1,17954 @@ +@@ -0,0 +1,18061 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. -+# Generated by GNU Autoconf 2.69 for gumbo 1.0. ++# Generated by GNU Autoconf 2.69 for gumbo 0.10.1. +# -+# Report bugs to . ++# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -6455,11 +6881,11 @@ index 0000000..d46f2ff + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else -+ $as_echo "$0: Please tell bug-autoconf@gnu.org and jdtang@google.com -+$0: about your system, including any error possibly output -+$0: before this message. Then install a modern shell, or -+$0: manually run the script under such a shell if you do -+$0: have one." ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and ++$0: jonathan.d.tang@gmail.com about your system, including ++$0: any error possibly output before this message. Then ++$0: install a modern shell, or manually run the script ++$0: under such a shell if you do have one." + fi + exit 1 +fi @@ -6771,9 +7197,9 @@ index 0000000..d46f2ff +# Identity of this package. +PACKAGE_NAME='gumbo' +PACKAGE_TARNAME='gumbo' -+PACKAGE_VERSION='1.0' -+PACKAGE_STRING='gumbo 1.0' -+PACKAGE_BUGREPORT='jdtang@google.com' ++PACKAGE_VERSION='0.10.1' ++PACKAGE_STRING='gumbo 0.10.1' ++PACKAGE_BUGREPORT='jonathan.d.tang@gmail.com' +PACKAGE_URL='' + +ac_unique_file="src/parser.c" @@ -7504,7 +7930,7 @@ index 0000000..d46f2ff + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF -+\`configure' configures gumbo 1.0 to adapt to many kinds of systems. ++\`configure' configures gumbo 0.10.1 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + @@ -7574,7 +8000,7 @@ index 0000000..d46f2ff + +if test -n "$ac_init_help"; then + case $ac_init_help in -+ short | recursive ) echo "Configuration of gumbo 1.0:";; ++ short | recursive ) echo "Configuration of gumbo 0.10.1:";; + esac + cat <<\_ACEOF + @@ -7619,7 +8045,7 @@ index 0000000..d46f2ff +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + -+Report bugs to . ++Report bugs to . +_ACEOF +ac_status=$? +fi @@ -7682,7 +8108,7 @@ index 0000000..d46f2ff +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF -+gumbo configure 1.0 ++gumbo configure 0.10.1 +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. @@ -7879,9 +8305,9 @@ index 0000000..d46f2ff +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+( $as_echo "## -------------------------------- ## -+## Report this to jdtang@google.com ## -+## -------------------------------- ##" ++( $as_echo "## ---------------------------------------- ## ++## Report this to jonathan.d.tang@gmail.com ## ++## ---------------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac @@ -8226,7 +8652,7 @@ index 0000000..d46f2ff +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + -+It was created by gumbo $as_me 1.0, which was ++It was created by gumbo $as_me 0.10.1, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ @@ -9088,6 +9514,38 @@ index 0000000..d46f2ff +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++ac_aux_dir= ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi ++done ++if test -z "$ac_aux_dir"; then ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++fi ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ ++ ++# Expand $ac_aux_dir to an absolute path. ++am_aux_dir=`cd "$ac_aux_dir" && pwd` ++ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9627,6 +10085,65 @@ index 0000000..d46f2ff +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 ++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } ++if ${am_cv_prog_cc_c_o+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ # Make sure it works both with $CC and with simple cc. ++ # Following AC_PROG_CC_C_O, we do the test twice because some ++ # compilers refuse to overwrite an existing .o file with -o, ++ # though they will create one. ++ am_cv_prog_cc_c_o=yes ++ for am_i in 1 2; do ++ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 ++ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } \ ++ && test -f conftest2.$ac_objext; then ++ : OK ++ else ++ am_cv_prog_cc_c_o=no ++ break ++ fi ++ done ++ rm -f core conftest* ++ unset am_i ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 ++$as_echo "$am_cv_prog_cc_c_o" >&6; } ++if test "$am_cv_prog_cc_c_o" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : @@ -10328,36 +10845,7 @@ index 0000000..d46f2ff + + +# Init Automake & libtool -+am__api_version='1.13' -+ -+ac_aux_dir= -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f "$ac_dir/install.sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ elif test -f "$ac_dir/shtool"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/shtool install -c" -+ break -+ fi -+done -+if test -z "$ac_aux_dir"; then -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ ++am__api_version='1.15' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or @@ -10529,9 +11017,6 @@ index 0000000..d46f2ff +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+ +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) @@ -10549,7 +11034,7 @@ index 0000000..d46f2ff +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + -+if test x"${install_sh}" != xset; then ++if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -10906,7 +11391,7 @@ index 0000000..d46f2ff + +# Define the identity of the package. + PACKAGE='gumbo' -+ VERSION='1.0' ++ VERSION='0.10.1' + + +cat >>confdefs.h <<_ACEOF @@ -10940,8 +11425,8 @@ index 0000000..d46f2ff +# +mkdir_p='$(MKDIR_P)' + -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. ++# We need awk for the "check" target (and possibly the TAP driver). The ++# system "awk" is bad on some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' @@ -11213,6 +11698,48 @@ index 0000000..d46f2ff + + + ++# POSIX will say in a future version that running "rm -f" with no argument ++# is OK; and we want to be able to make that assumption in our Makefile ++# recipes. So use an aggressive probe to check that the usage we want is ++# actually supported "in the wild" to an acceptable degree. ++# See automake bug#10828. ++# To make any issue more visible, cause the running configure to be aborted ++# by default if the 'rm' program in use doesn't match our expectations; the ++# user can still override this though. ++if rm -f && rm -fr && rm -rf; then : OK; else ++ cat >&2 <<'END' ++Oops! ++ ++Your 'rm' program seems unable to run without file operands specified ++on the command line, even when the '-f' option is present. This is contrary ++to the behaviour of most rm programs out there, and not conforming with ++the upcoming POSIX standard: ++ ++Please tell bug-automake@gnu.org about your system, including the value ++of your $PATH and any error possibly output before this message. This ++can help us improve future automake versions. ++ ++END ++ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then ++ echo 'Configuration will proceed anyway, since you have set the' >&2 ++ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 ++ echo >&2 ++ else ++ cat >&2 <<'END' ++Aborting the configuration process, to ensure you take notice of the issue. ++ ++You can download and install GNU coreutils to get an 'rm' implementation ++that behaves properly: . ++ ++If you want to complete the configuration process using your problematic ++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM ++to "yes", and re-run configure. ++ ++END ++ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 ++ fi ++fi ++ +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; @@ -13531,7 +14058,7 @@ index 0000000..d46f2ff + rm -rf conftest* + ;; + -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext @@ -13549,7 +14076,10 @@ index 0000000..d46f2ff + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; -+ ppc64-*linux*|powerpc64-*linux*) ++ powerpc64le-*linux*) ++ LD="${LD-ld} -m elf32lppclinux" ++ ;; ++ powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) @@ -13568,7 +14098,10 @@ index 0000000..d46f2ff + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; -+ ppc*-*linux*|powerpc*-*linux*) ++ powerpcle-*linux*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; ++ powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) @@ -22222,7 +22755,7 @@ index 0000000..d46f2ff +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" -+This file was extended by gumbo $as_me 1.0, which was ++This file was extended by gumbo $as_me 0.10.1, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES @@ -22273,13 +22806,13 @@ index 0000000..d46f2ff +Configuration commands: +$config_commands + -+Report bugs to ." ++Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ -+gumbo config.status 1.0 ++gumbo config.status 0.10.1 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + @@ -24135,7 +24668,7 @@ index 0000000..d46f2ff + diff --git a/depcomp b/depcomp new file mode 100755 -index 0000000..4ebd5b3 +index 0000000..fc98710 --- /dev/null +++ b/depcomp @@ -0,0 +1,791 @@ @@ -24144,7 +24677,7 @@ index 0000000..4ebd5b3 + +scriptversion=2013-05-30.07; # UTC + -+# Copyright (C) 1999-2013 Free Software Foundation, Inc. ++# Copyright (C) 1999-2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -24932,14 +25465,14 @@ index 0000000..4ebd5b3 +# End: diff --git a/install-sh b/install-sh new file mode 100755 -index 0000000..377bb86 +index 0000000..0b0fdcb --- /dev/null +++ b/install-sh -@@ -0,0 +1,527 @@ +@@ -0,0 +1,501 @@ +#!/bin/sh +# install - install a program, script, or datafile + -+scriptversion=2011-11-20.07; # UTC ++scriptversion=2013-12-25.23; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the @@ -24979,19 +25512,15 @@ index 0000000..377bb86 +# This script is compatible with the BSD install script, but was written +# from scratch. + ++tab=' ' +nl=' +' -+IFS=" "" $nl" ++IFS=" $tab$nl" + -+# set DOITPROG to echo to test this script ++# Set DOITPROG to "echo" to test this script. + -+# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} -+if test -z "$doit"; then -+ doit_exec=exec -+else -+ doit_exec=$doit -+fi ++doit_exec=${doit:-exec} + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. @@ -25006,17 +25535,6 @@ index 0000000..377bb86 +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + -+posix_glob='?' -+initialize_posix_glob=' -+ test "$posix_glob" != "?" || { -+ if (set -f) 2>/dev/null; then -+ posix_glob= -+ else -+ posix_glob=: -+ fi -+ } -+' -+ +posix_mkdir= + +# Desired mode of installed file. @@ -25035,7 +25553,7 @@ index 0000000..377bb86 +dst_arg= + +copy_on_change=false -+no_target_directory= ++is_target_a_directory=possibly + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -25075,46 +25593,57 @@ index 0000000..377bb86 + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" -+ shift;; ++ shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 -+ case $mode in -+ *' '* | *' '* | *' -+'* | *'*'* | *'?'* | *'['*) -+ echo "$0: invalid mode: $mode" >&2 -+ exit 1;; -+ esac -+ shift;; ++ case $mode in ++ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + + -o) chowncmd="$chownprog $2" -+ shift;; ++ shift;; + + -s) stripcmd=$stripprog;; + -+ -t) dst_arg=$2 -+ # Protect names problematic for 'test' and other utilities. -+ case $dst_arg in -+ -* | [=\(\)!]) dst_arg=./$dst_arg;; -+ esac -+ shift;; ++ -t) ++ is_target_a_directory=always ++ dst_arg=$2 ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac ++ shift;; + -+ -T) no_target_directory=true;; ++ -T) is_target_a_directory=never;; + + --version) echo "$0 $scriptversion"; exit $?;; + -+ --) shift -+ break;; ++ --) shift ++ break;; + -+ -*) echo "$0: invalid option: $1" >&2 -+ exit 1;; ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; + + *) break;; + esac + shift +done + ++# We allow the use of options -d and -T together, by making -d ++# take the precedence; this is for compatibility with GNU install. ++ ++if test -n "$dir_arg"; then ++ if test -n "$dst_arg"; then ++ echo "$0: target directory not allowed when installing a directory." >&2 ++ exit 1 ++ fi ++fi ++ +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. @@ -25146,6 +25675,15 @@ index 0000000..377bb86 +fi + +if test -z "$dir_arg"; then ++ if test $# -gt 1 || test "$is_target_a_directory" = always; then ++ if test ! -d "$dst_arg"; then ++ echo "$0: $dst_arg: Is not a directory." >&2 ++ exit 1 ++ fi ++ fi ++fi ++ ++if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 @@ -25161,16 +25699,16 @@ index 0000000..377bb86 + + *[0-7]) + if test -z "$stripcmd"; then -+ u_plus_rw= ++ u_plus_rw= + else -+ u_plus_rw='% 200' ++ u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then -+ u_plus_rw= ++ u_plus_rw= + else -+ u_plus_rw=,u+rw ++ u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac @@ -25207,41 +25745,15 @@ index 0000000..377bb86 + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then -+ if test -n "$no_target_directory"; then -+ echo "$0: $dst_arg: Is a directory" >&2 -+ exit 1 ++ if test "$is_target_a_directory" = never; then ++ echo "$0: $dst_arg: Is a directory" >&2 ++ exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else -+ # Prefer dirname, but fall back on a substitute if dirname fails. -+ dstdir=` -+ (dirname "$dst") 2>/dev/null || -+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$dst" : 'X\(//\)[^/]' \| \ -+ X"$dst" : 'X\(//\)$' \| \ -+ X"$dst" : 'X\(/\)' \| . 2>/dev/null || -+ echo X"$dst" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q' -+ ` -+ ++ dstdir=`dirname "$dst"` + test -d "$dstdir" + dstdir_status=$? + fi @@ -25252,74 +25764,74 @@ index 0000000..377bb86 + if test $dstdir_status != 0; then + case $posix_mkdir in + '') -+ # Create intermediate dirs using mode 755 as modified by the umask. -+ # This is like FreeBSD 'install' as of 1997-10-28. -+ umask=`umask` -+ case $stripcmd.$umask in -+ # Optimize common cases. -+ *[2367][2367]) mkdir_umask=$umask;; -+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; -+ -+ *[0-7]) -+ mkdir_umask=`expr $umask + 22 \ -+ - $umask % 100 % 40 + $umask % 20 \ -+ - $umask % 10 % 4 + $umask % 2 -+ `;; -+ *) mkdir_umask=$umask,go-w;; -+ esac -+ -+ # With -d, create the new directory with the user-specified mode. -+ # Otherwise, rely on $mkdir_umask. -+ if test -n "$dir_arg"; then -+ mkdir_mode=-m$mode -+ else -+ mkdir_mode= -+ fi ++ # Create intermediate dirs using mode 755 as modified by the umask. ++ # This is like FreeBSD 'install' as of 1997-10-28. ++ umask=`umask` ++ case $stripcmd.$umask in ++ # Optimize common cases. ++ *[2367][2367]) mkdir_umask=$umask;; ++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; ++ ++ *[0-7]) ++ mkdir_umask=`expr $umask + 22 \ ++ - $umask % 100 % 40 + $umask % 20 \ ++ - $umask % 10 % 4 + $umask % 2 ++ `;; ++ *) mkdir_umask=$umask,go-w;; ++ esac + -+ posix_mkdir=false -+ case $umask in -+ *[123567][0-7][0-7]) -+ # POSIX mkdir -p sets u+wx bits regardless of umask, which -+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. -+ ;; -+ *) -+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ # With -d, create the new directory with the user-specified mode. ++ # Otherwise, rely on $mkdir_umask. ++ if test -n "$dir_arg"; then ++ mkdir_mode=-m$mode ++ else ++ mkdir_mode= ++ fi + -+ if (umask $mkdir_umask && -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 -+ then -+ if test -z "$dir_arg" || { -+ # Check for POSIX incompatibilities with -m. -+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or -+ # other-writable bit of parent directory when it shouldn't. -+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -+ ls_ld_tmpdir=`ls -ld "$tmpdir"` -+ case $ls_ld_tmpdir in -+ d????-?r-*) different_mode=700;; -+ d????-?--*) different_mode=755;; -+ *) false;; -+ esac && -+ $mkdirprog -m$different_mode -p -- "$tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` -+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" -+ } -+ } -+ then posix_mkdir=: -+ fi -+ rmdir "$tmpdir/d" "$tmpdir" -+ else -+ # Remove any dirs left behind by ancient mkdir implementations. -+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null -+ fi -+ trap '' 0;; -+ esac;; ++ posix_mkdir=false ++ case $umask in ++ *[123567][0-7][0-7]) ++ # POSIX mkdir -p sets u+wx bits regardless of umask, which ++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ++ ;; ++ *) ++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ ++ if (umask $mkdir_umask && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ then ++ if test -z "$dir_arg" || { ++ # Check for POSIX incompatibilities with -m. ++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ++ # other-writable bit of parent directory when it shouldn't. ++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ case $ls_ld_tmpdir in ++ d????-?r-*) different_mode=700;; ++ d????-?--*) different_mode=755;; ++ *) false;; ++ esac && ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ++ } ++ } ++ then posix_mkdir=: ++ fi ++ rmdir "$tmpdir/d" "$tmpdir" ++ else ++ # Remove any dirs left behind by ancient mkdir implementations. ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ fi ++ trap '' 0;; ++ esac;; + esac + + if + $posix_mkdir && ( -+ umask $mkdir_umask && -+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ++ umask $mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else @@ -25329,53 +25841,51 @@ index 0000000..377bb86 + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in -+ /*) prefix='/';; -+ [-=\(\)!]*) prefix='./';; -+ *) prefix='';; ++ /*) prefix='/';; ++ [-=\(\)!]*) prefix='./';; ++ *) prefix='';; + esac + -+ eval "$initialize_posix_glob" -+ + oIFS=$IFS + IFS=/ -+ $posix_glob set -f ++ set -f + set fnord $dstdir + shift -+ $posix_glob set +f ++ set +f + IFS=$oIFS + + prefixes= + + for d + do -+ test X"$d" = X && continue ++ test X"$d" = X && continue + -+ prefix=$prefix$d -+ if test -d "$prefix"; then -+ prefixes= -+ else -+ if $posix_mkdir; then -+ (umask=$mkdir_umask && -+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break -+ # Don't fail if two instances are running concurrently. -+ test -d "$prefix" || exit 1 -+ else -+ case $prefix in -+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; -+ *) qprefix=$prefix;; -+ esac -+ prefixes="$prefixes '$qprefix'" -+ fi -+ fi -+ prefix=$prefix/ ++ prefix=$prefix$d ++ if test -d "$prefix"; then ++ prefixes= ++ else ++ if $posix_mkdir; then ++ (umask=$mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ++ # Don't fail if two instances are running concurrently. ++ test -d "$prefix" || exit 1 ++ else ++ case $prefix in ++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) qprefix=$prefix;; ++ esac ++ prefixes="$prefixes '$qprefix'" ++ fi ++ fi ++ prefix=$prefix/ + done + + if test -n "$prefixes"; then -+ # Don't fail if two instances are running concurrently. -+ (umask $mkdir_umask && -+ eval "\$doit_exec \$mkdirprog $prefixes") || -+ test -d "$dstdir" || exit 1 -+ obsolete_mkdir_used=true ++ # Don't fail if two instances are running concurrently. ++ (umask $mkdir_umask && ++ eval "\$doit_exec \$mkdirprog $prefixes") || ++ test -d "$dstdir" || exit 1 ++ obsolete_mkdir_used=true + fi + fi + fi @@ -25410,15 +25920,12 @@ index 0000000..377bb86 + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && -+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && -+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && -+ -+ eval "$initialize_posix_glob" && -+ $posix_glob set -f && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ++ set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && -+ $posix_glob set +f && -+ ++ set +f && + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then @@ -25431,24 +25938,24 @@ index 0000000..377bb86 + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { -+ # Now remove or move aside any old file at destination location. -+ # We try this two ways since rm can't unlink itself on some -+ # systems and the destination file might be busy for other -+ # reasons. In this case, the final cleanup might fail but the new -+ # file should still install successfully. -+ { -+ test ! -f "$dst" || -+ $doit $rmcmd -f "$dst" 2>/dev/null || -+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && -+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } -+ } || -+ { echo "$0: cannot unlink or rename $dst" >&2 -+ (exit 1); exit 1 -+ } -+ } && -+ -+ # Now rename the file to the real destination. -+ $doit $mvcmd "$dsttmp" "$dst" ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + @@ -35126,10 +35633,10 @@ index 0000000..63ae69d + diff --git a/m4/libtool.m4 b/m4/libtool.m4 new file mode 100644 -index 0000000..56666f0 +index 0000000..f12cfdf --- /dev/null +++ b/m4/libtool.m4 -@@ -0,0 +1,7986 @@ +@@ -0,0 +1,7992 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -36444,7 +36951,7 @@ index 0000000..56666f0 + rm -rf conftest* + ;; + -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext @@ -36458,7 +36965,10 @@ index 0000000..56666f0 + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; -+ ppc64-*linux*|powerpc64-*linux*) ++ powerpc64le-*linux*) ++ LD="${LD-ld} -m elf32lppclinux" ++ ;; ++ powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) @@ -36477,7 +36987,10 @@ index 0000000..56666f0 + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; -+ ppc*-*linux*|powerpc*-*linux*) ++ powerpcle-*linux*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; ++ powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) @@ -43770,16 +44283,16 @@ index 0000000..c573da9 +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/missing b/missing new file mode 100755 -index 0000000..cdea514 +index 0000000..f62bbae --- /dev/null +++ b/missing @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + -+scriptversion=2012-06-26.16; # UTC ++scriptversion=2013-10-28.13; # UTC + -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify @@ -43936,7 +44449,7 @@ index 0000000..cdea514 + ;; + autom4te*) + echo "You might have modified some maintainer files that require" -+ echo "the 'automa4te' program to be rebuilt." ++ echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) @@ -43991,16 +44504,16 @@ index 0000000..cdea514 +# End: diff --git a/test-driver b/test-driver new file mode 100755 -index 0000000..32bf39e +index 0000000..8e575b0 --- /dev/null +++ b/test-driver -@@ -0,0 +1,127 @@ +@@ -0,0 +1,148 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + -+scriptversion=2012-06-27.10; # UTC ++scriptversion=2013-07-13.22; # UTC + -+# Copyright (C) 2011-2013 Free Software Foundation, Inc. ++# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -44041,13 +44554,12 @@ index 0000000..32bf39e +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] -+ [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT ++ [--enable-hard-errors={yes|no}] [--] ++ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + -+# TODO: better error handling in option parsing (in particular, ensure -+# TODO: $log_file, $trs_file and $test_name are defined). +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. @@ -44066,10 +44578,23 @@ index 0000000..32bf39e + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; ++ *) break;; + esac + shift +done + ++missing_opts= ++test x"$test_name" = x && missing_opts="$missing_opts --test-name" ++test x"$log_file" = x && missing_opts="$missing_opts --log-file" ++test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" ++if test x"$missing_opts" != x; then ++ usage_error "the following mandatory options are missing:$missing_opts" ++fi ++ ++if test $# -eq 0; then ++ usage_error "missing argument" ++fi ++ +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='' # Red. @@ -44091,11 +44616,14 @@ index 0000000..32bf39e +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? ++ +if test $enable_hard_errors = no && test $estatus -eq 99; then -+ estatus=1 ++ tweaked_estatus=1 ++else ++ tweaked_estatus=$estatus +fi + -+case $estatus:$expect_failure in ++case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -44104,6 +44632,12 @@ index 0000000..32bf39e + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + ++# Report the test outcome and exit status in the logs, so that one can ++# know whether the test passed or failed simply by looking at the '.log' ++# file, without the need of also peaking into the corresponding '.trs' ++# file (automake bug#11814). ++echo "$res $test_name (exit status: $estatus)" >>$log_file ++ +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + @@ -44123,5 +44657,5 @@ index 0000000..32bf39e +# time-stamp-end: "; # UTC" +# End: -- -1.8.3.1 +2.4.3 diff --git a/gumbo-parser.spec b/gumbo-parser.spec index 99267fa..84b5143 100644 --- a/gumbo-parser.spec +++ b/gumbo-parser.spec @@ -1,16 +1,13 @@ -%global snapdate 20140503 -%global commit 3a61e9ad963cacfb3246468feab28c5058f621c1 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: gumbo-parser -Version: 1.0 -Release: 0.7.%{snapdate}git%{shortcommit}%{?dist} +Epoch: 1 +Version: 0.10.1 +Release: 1%{?dist} Summary: A HTML5 parser License: ASL 2.0 URL: https://github.com/google/gumbo-parser -Source0: https://github.com/google/gumbo-parser/archive/%{commit}/gumbo-parser-1.0-%{snapdate}git%{shortcommit}.tar.gz +Source0: https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz#/gumbo-parser-0.10.1.tar.gz # Fix up Doxyfile Patch1: 0001-Doxygen-tweaks.patch # Autotool generated sources @@ -34,7 +31,7 @@ validators, templating languages, and refactoring and analysis tools. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -42,14 +39,14 @@ developing applications that use %{name}. %package python Summary: Python bindings to %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} BuildArch: noarch %description python Python bindings to %{name}. %prep -%setup -q -n %{name}-%{commit} +%setup -q -n %{name}-%{version} %patch1 -p1 # Package has autotools compatibility issues @@ -123,6 +120,10 @@ install -m 644 {COPYING,*.md} ${RPM_BUILD_ROOT}%{_pkgdocdir} %{python3_sitelib}/* %changelog +* Mon Jul 27 2015 Ralf Corsépius - 1:0.10.1-1 +- Update to 0.10.1, bump epoch (RHBZ#1229357). +- Rebase patches. + * Wed Jun 17 2015 Fedora Release Engineering - 1.0-0.7.20140503git3a61e9a - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index cd72722..45be325 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b17624d8ddc0dd37c4c0e278e89008ac gumbo-parser-1.0-20140503git3a61e9a.tar.gz +c6f75c9eda65e897c242f8958a34aed0 gumbo-parser-0.10.1.tar.gz