summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL8
-rw-r--r--Makefile.in320
-rw-r--r--NEWS8
-rw-r--r--README62
-rw-r--r--aclocal.m4836
-rwxr-xr-xar-lib15
-rwxr-xr-xcompile99
-rwxr-xr-xconfig.guess185
-rwxr-xr-xconfig.sub101
-rwxr-xr-xconfigure770
-rw-r--r--configure.ac9
-rwxr-xr-xdepcomp487
-rw-r--r--doc/Makefile.in200
-rw-r--r--doc/knot.info327
-rwxr-xr-xdoc/mdate-sh15
-rw-r--r--doc/reference.texi10
-rw-r--r--doc/stamp-vti8
-rw-r--r--doc/texinfo.tex560
-rw-r--r--doc/version.texi8
-rwxr-xr-xinstall-sh14
-rw-r--r--ltmain.sh97
-rw-r--r--m4/libtool.m427
-rw-r--r--man/Makefile.in167
-rw-r--r--man/kdig.12
-rw-r--r--man/khost.12
-rw-r--r--man/knot.conf.57
-rw-r--r--man/knot.conf.5.in5
-rw-r--r--man/knotc.82
-rw-r--r--man/knotd.82
-rw-r--r--man/knsupdate.12
-rwxr-xr-xmissing414
-rw-r--r--samples/Makefile.in97
-rw-r--r--samples/knot.full.conf3
-rw-r--r--src/Makefile.in574
-rw-r--r--src/common/errcode.c1
-rw-r--r--src/common/errcode.h1
-rw-r--r--src/config.h.in6
-rw-r--r--src/knot/conf/cf-lex.l21
-rw-r--r--src/knot/conf/cf-parse.y10
-rw-r--r--src/knot/conf/conf.c16
-rw-r--r--src/knot/conf/conf.h1
-rw-r--r--src/knot/conf/extra.c3
-rw-r--r--src/knot/conf/includes.c68
-rw-r--r--src/knot/conf/includes.h21
-rw-r--r--src/knot/conf/libknotd_la-cf-lex.c988
-rw-r--r--src/knot/conf/libknotd_la-cf-parse.c1750
-rw-r--r--src/knot/conf/libknotd_la-cf-parse.h205
-rw-r--r--src/knot/main.c6
-rw-r--r--src/knot/server/zones.c2
-rw-r--r--src/libknot/edns.h4
-rw-r--r--src/libknot/nameserver/name-server.c6
-rw-r--r--src/libknot/packet/response.c16
-rw-r--r--src/libknot/packet/response.h8
-rw-r--r--src/libknot/util/endian.h12
-rw-r--r--src/tests/Makefile.in643
-rw-r--r--src/utils/dig/dig_exec.c2
-rw-r--r--src/zscanner/scanner.c7
-rw-r--r--src/zscanner/scanner.rl7
-rw-r--r--src/zscanner/test/cases/00-0_general.in (renamed from src/zscanner/test/cases/00_general.in)0
-rw-r--r--src/zscanner/test/cases/00-0_general.out (renamed from src/zscanner/test/cases/00_general.out)0
-rw-r--r--src/zscanner/test/cases/00-1_general.in7
-rw-r--r--src/zscanner/test/cases/00-1_general.out2
-rw-r--r--src/zscanner/test/cases/06-0_INCLUDE.in4
-rw-r--r--src/zscanner/test/cases/06-3_INCLUDE.in2
-rw-r--r--src/zscanner/test/cases/06-4_INCLUDE.in2
-rw-r--r--src/zscanner/test/processing.c1
-rw-r--r--src/zscanner/test/run_tests.sh4
-rwxr-xr-xtest-driver127
-rwxr-xr-xylwrap205
69 files changed, 4359 insertions, 5242 deletions
diff --git a/INSTALL b/INSTALL
index 007e939..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
@@ -309,10 +309,9 @@ causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
+an Autoconf bug. Until the bug is fixed you can use this workaround:
- CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@@ -368,3 +367,4 @@ operates.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
+
diff --git a/Makefile.in b/Makefile.in
index a40ca08..244afca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in 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.
@@ -14,51 +15,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -78,15 +34,15 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog THANKS \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(top_srcdir)/src/zscanner/test/run_tests.sh.in \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure \
+ $(top_srcdir)/src/zscanner/test/cases/06-0_INCLUDE.inin \
$(top_srcdir)/src/zscanner/test/cases/06-3_INCLUDE.inin \
$(top_srcdir)/src/zscanner/test/cases/06-4_INCLUDE.inin \
- $(top_srcdir)/src/zscanner/test/cases/06-0_INCLUDE.inin \
- COPYING ar-lib compile config.guess config.sub depcomp \
- install-sh missing ylwrap ltmain.sh
+ $(top_srcdir)/src/zscanner/test/run_tests.sh.in AUTHORS \
+ COPYING ChangeLog INSTALL NEWS THANKS ar-lib compile \
+ config.guess config.sub depcomp install-sh ltmain.sh missing \
+ ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -104,61 +60,28 @@ CONFIG_CLEAN_FILES = src/zscanner/test/run_tests.sh \
src/zscanner/test/cases/06-4_INCLUDE.in \
src/zscanner/test/cases/06-0_INCLUDE.in
CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
+am__v_GEN_0 = @echo " GEN " $@;
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
-am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
- install-exec-recursive install-html-recursive \
- install-info-recursive install-pdf-recursive \
- install-ps-recursive install-recursive installcheck-recursive \
- installdirs-recursive pdf-recursive ps-recursive \
- tags-recursive uninstall-recursive
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
- $(RECURSIVE_TARGETS) \
- $(RECURSIVE_CLEAN_TARGETS) \
- $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -169,7 +92,6 @@ am__remove_distdir = \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -197,7 +119,6 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz
GZIP_ENV = --best
-DIST_TARGETS = dist-xz dist-bzip2 dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -395,25 +316,22 @@ distclean-libtool:
-rm -f libtool config.lt
# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-# (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
- @fail=; \
- if $(am__make_keepgoing); then \
- failcom='fail=yes'; \
- else \
- failcom='exit 1'; \
- fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- for subdir in $$list; do \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -428,12 +346,57 @@ $(am__recursive_targets):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -449,7 +412,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- $(am__define_uniq_tagged_files); \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -461,11 +429,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
$$unique; \
fi; \
fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -474,31 +446,9 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
- test ! -s cscope.files \
- || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
- -rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
@case `sed 15q $(srcdir)/NEWS` in \
@@ -540,10 +490,13 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- $(am__make_dryrun) \
- || test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -572,40 +525,40 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
+
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives 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)
+ $(am__remove_distdir)
dist-shar: 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
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
-dist dist-all:
- $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
- $(am__post_remove_distdir)
+dist dist-all: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -616,6 +569,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
@@ -627,9 +582,9 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir)
- chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -661,7 +616,7 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -796,13 +751,14 @@ ps-am:
uninstall-am:
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-cscope clean-generic \
- clean-libtool cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-generic \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
@@ -812,7 +768,7 @@ uninstall-am:
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-am uninstall uninstall-am
+ ps ps-am tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/NEWS b/NEWS
index 5a52e63..cff8b81 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
Knot DNS NEWS
+v1.3.2 - Sep 30, 2013
+---------------------
+Bugfixes:
+ * Configuration option for EDNS0 max UDP payload.
+ * Max UDP payload from EDNS0 affected TCP responses.
+ * Fixed build on SLE 10.
+ * knotc reload did not close files included from config.
+
v1.3.1 - Aug 26, 2013
---------------------
Bugfixes:
diff --git a/README b/README
index 74dea58..2d88034 100644
--- a/README
+++ b/README
@@ -23,7 +23,7 @@ Clang supports atomics since version 2.9.
By default Knot DNS is distributed with a slower zone file parser because of
smaller source file and quick compile time. In most cases it is sufficient.
-If you plan to process large zone files, it is recomended to build Knot DNS
+If you plan to process large zone files, we recommend to build Knot DNS
using ./configure --enable-fastparser. In this case Ragel compiler is required
and it is normal if the C compiler takes much more time (minutes).
@@ -41,7 +41,7 @@ Installation on Debian based distributions
==========================================
The following steps should work (verified in VirtualBox only)
-on the distribution/architecture/release combinations as listed bellow.
+for the distribution/architecture/release combinations as listed bellow.
----------------------------------------------
Debian (AMD64, I386) 6.0.2.1 (squeeze)
@@ -59,30 +59,17 @@ $ sudo apt-get install git-core autoconf libtool flex bison libssl-dev liburcu-d
# Install optional packages (POSIX 1003.1e capabilities)
$ sudo apt-get install libcap-ng-dev
-# If the liburcu-dev package is not present, install directly
-$ wget http://bd.archive.ubuntu.com/ubuntu/pool/universe/libu/liburcu/liburcu0_0.5.4-1_amd64.deb
-$ wget http://bd.archive.ubuntu.com/ubuntu/pool/universe/libu/liburcu/liburcu-dev_0.5.4-1_amd64.deb
-$ sudo dpkg -i liburcu0_0.5.4-1_amd64.deb
-$ sudo dpkg -i liburcu-dev_0.5.4-1_amd64.deb
+# If the liburcu-dev package is not present, install it directly
-# Go for the real thing
+# Get the source code
$ git clone git://git.nic.cz/knot-dns.git
-$ cd knot
+$ cd knot-dns
$ autoreconf -if
$ ./configure
$ make
$ sudo make install
$ sudo ldconfig
-Alternative packages for I386:
-$ # the required version of liburcu is not available in the default package
-$ # sources.
-$
-$ wget http://bd.archive.ubuntu.com/ubuntu/pool/universe/libu/liburcu/liburcu0_0.5.4-1_i386.deb
-$ wget http://bd.archive.ubuntu.com/ubuntu/pool/universe/libu/liburcu/liburcu-dev_0.5.4-1_i386.deb
-$ sudo dpkg -i liburcu0_0.5.4-1_i386.deb
-$ sudo dpkg -i liburcu-dev_0.5.4-1_i386.deb
-
Installation on Fedora
======================
@@ -142,15 +129,10 @@ Installation on OpenBSD/NetBSD
Also works for OS X, if you don't want to install gcc from ports.
Prerequisites:
-- liburcu needs patch for absent compiler TLS capability
- - patch is located in "scripts/urcu-tls-compat.patch"
-- patch compatible with liburcu-0.6.7
-- liburcu >= 0.7.0 works out of the box
- flex and bison from packages
$ mkdir liburcu && cd liburcu
-$ wget "http://lttng.org/files/urcu/userspace-rcu-0.6.7.tar.bz2"
-$ patch -p1 < ../scripts/urcu-tls-compat.patch
+$ wget "http://lttng.org/files/urcu/userspace-rcu-0.8.0.tar.bz2"
$ autoconf && ./configure && make && sudo make install
$ # or follow installation instructions in INSTALL
@@ -175,35 +157,27 @@ Running
First, each server needs configuration file.
Please see samples/knot.sample.conf for reference.
-Minimal configuration can be found in samples/knot.min.conf
-Configuration zone has to specify:
-* storage for PID files, compiled zones etc.
+More examples can be found in samples/knot.full.conf
+Configuration file has to specify:
+* storage for PID files, journal files etc.
* network interfaces
* served zones
-$ cp samples/knot.min.conf myserver.conf
+$ cp samples/knot.sample.conf myserver.conf
$ vim myserver.conf # or your favourite text editor
-$ knotc -h # see what it can do
+$ knotd -h # see what it can do
-Prepare working directory.
+Second, prepare working directory.
$ mkdir -p /tmp/knot-minimal/samples; cp samples/example.com.zone /tmp/knot-minimal/samples/
-Third, lets load server. You can do this by running 'knotd' directly, or with
-'knotc' as well. Server is able to run in daemonized or interactive mode.
-Lets start our server in interactive mode (parameter '-i') to see if it runs.
+Third, let's start the server. This can be done by running the 'knotd' command.
+Alternatively, your distribution should have an init script available, if you've
+installed Knot using a binary package.
-$ knotc -c myserver.conf -i start # start server in interactive mode
+Lets start our server in foreground to see if it runs:
-Running as daemon
-=================
+$ knotd -c myserver.conf
-Controller runs server in daemonized mode as default. Disadvantage is, that
-it closes stdout/stderr so you need to set up either syslog or logging to
-own files in the configuration. Controller parameter '-w' waits for the
-operation to finish. Let's test server functionality.
+For more information, refer to the user manual.
-$ knotc -c myserver.conf -w start # start server
-$ dig @$ADDR -p $PORT example.com # issue a query and see result
-$ ...
-$ knotc -c myserver.conf -w stop # stop server
diff --git a/aclocal.m4 b/aclocal.m4
index b3963f8..b28237c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -11,14 +12,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
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'.])])
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
@@ -180,150 +180,25 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
- [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
- [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
-# PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-# [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-# [DESCRIPTION], [DEFAULT])
-#
-# Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX]
-# name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single
-# macro
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_WITH_MODULES],
-[
-m4_pushdef([with_arg], m4_tolower([$1]))
-
-m4_pushdef([description],
- [m4_default([$5], [build with ]with_arg[ support])])
-
-m4_pushdef([def_arg], [m4_default([$6], [auto])])
-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-
-m4_case(def_arg,
- [yes],[m4_pushdef([with_without], [--without-]with_arg)],
- [m4_pushdef([with_without],[--with-]with_arg)])
-
-AC_ARG_WITH(with_arg,
- AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
- [AS_TR_SH([with_]with_arg)=def_arg])
-
-AS_CASE([$AS_TR_SH([with_]with_arg)],
- [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
- [auto],[PKG_CHECK_MODULES([$1],[$2],
- [m4_n([def_action_if_found]) $3],
- [m4_n([def_action_if_not_found]) $4])])
-
-m4_popdef([with_arg])
-m4_popdef([description])
-m4_popdef([def_arg])
-
-]) dnl PKG_WITH_MODULES
-
-# PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-# [DESCRIPTION], [DEFAULT])
-#
-# Convenience macro to trigger AM_CONDITIONAL after
-# PKG_WITH_MODULES check.
-#
-# HAVE_[VARIABLE-PREFIX] is exported as make variable.
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_HAVE_WITH_MODULES],
-[
-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
-
-AM_CONDITIONAL([HAVE_][$1],
- [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])
-
-# PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-# [DESCRIPTION], [DEFAULT])
-#
-# Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-# PKG_WITH_MODULES check.
-#
-# HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable.
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-[
-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
-
-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
- [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])
-
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# 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.14'
+[am__api_version='1.11'
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.14], [],
+m4_if([$1], [1.11.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -339,17 +214,19 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# 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.14])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011 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.
+# serial 1
+
# AM_PROG_AR([ACT-IF-FAIL])
# -------------------------
# Try to determine the archiver interface, and trigger the ar-lib wrapper
@@ -364,8 +241,7 @@ AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
: ${AR=ar}
AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
- [AC_LANG_PUSH([C])
- am_cv_ar_interface=ar
+ [am_cv_ar_interface=ar
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
[am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([am_ar_try])
@@ -382,7 +258,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
fi
rm -f conftest.lib libconftest.a
])
- AC_LANG_POP([C])])
+ ])
case $am_cv_ar_interface in
ar)
@@ -406,15 +282,17 @@ AC_SUBST([AR])dnl
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 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.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -433,7 +311,7 @@ AC_SUBST([AR])dnl
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
+# harmless because $srcdir is `.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -459,19 +337,22 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# 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.
+# serial 9
+
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -490,14 +371,16 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 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.
+# serial 12
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@ -507,7 +390,7 @@ fi])])
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -520,13 +403,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
- [$1], [CXX], [depcc="$CXX" am_compiler_list=],
- [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
- [$1], [UPC], [depcc="$UPC" am_compiler_list=],
- [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@ -534,8 +416,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named 'D' -- because '-MD' means "put the output
- # in D".
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -575,16 +457,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
- # Solaris 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle '-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs.
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -593,8 +475,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
test "$am__universal" = false || continue
;;
nosideeffect)
- # After this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested.
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -602,7 +484,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
+ # This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -650,7 +532,7 @@ AM_CONDITIONAL([am__fastdep$1], [
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -660,13 +542,9 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
- [--enable-dependency-tracking],
- [do not reject slow dependency extractors])
-AS_HELP_STRING(
- [--disable-dependency-tracking],
- [speeds up one-time build])])
+[AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -681,18 +559,20 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# 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.
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Older Autoconf quotes --file arguments for eval, but not when files
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -705,7 +585,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
+ # We used to match only the files named `Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -717,19 +597,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
+ # from the Makefile without running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
+ test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@ -747,7 +629,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
+# is enabled. FIXME. This creates each `.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@ -757,21 +639,18 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 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.
+# serial 16
+
# 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])
# -----------------------------------------------
@@ -784,7 +663,7 @@ m4_defn([AC_PROG_CC])
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -813,40 +692,31 @@ AC_SUBST([CYGPATH_W])
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
- [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
- [ok:ok],,
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility. To be removed once Automake 1.9.x
-# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -857,78 +727,34 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES([CC])],
- [m4_define([AC_PROG_CC],
- m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES([CXX])],
- [m4_define([AC_PROG_CXX],
- m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES([OBJC])],
- [m4_define([AC_PROG_OBJC],
- m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
- [_AM_DEPENDENCIES([OBJCXX])],
- [m4_define([AC_PROG_OBJCXX],
- m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
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: <http://austingroupbugs.net/view.php?id=542>
-
-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: <http://www.gnu.org/software/coreutils/>.
-
-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 Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
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.
@@ -950,12 +776,15 @@ for _am_header in $config_headers :; do
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, 2003, 2005, 2008, 2011 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.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -969,14 +798,16 @@ if test x"${install_sh}" != xset; then
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST([install_sh])])
+AC_SUBST(install_sh)])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005 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.
+# serial 2
+
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -990,18 +821,21 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+# 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.
+# serial 5
+
# AM_PROG_LEX
# -----------
# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
# "missing" invocation, for better error output.
AC_DEFUN([AM_PROG_LEX],
-[AC_PREREQ([2.50])dnl
+[AC_PREREQ(2.50)dnl
AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
AC_REQUIRE([AC_PROG_LEX])dnl
if test "$LEX" = :; then
@@ -1010,12 +844,14 @@ fi])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 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.
+# serial 4
+
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -1033,7 +869,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -1058,14 +894,52 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
+
+# serial 6
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != 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
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# 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.
+# serial 6
+
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -1073,10 +947,11 @@ AC_DEFUN([AM_MISSING_PROG],
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
+
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@ -1089,22 +964,54 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
- am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
else
am_missing_run=
- AC_MSG_WARN(['missing' script is too old or missing])
+ AC_MSG_WARN([`missing' script is too old or missing])
fi
])
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 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.
+
+# serial 1
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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.
+# serial 5
+
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -1114,7 +1021,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
# ------------------------
@@ -1128,82 +1035,24 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 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-2013 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, 1997, 2000, 2001, 2003, 2005, 2008
+# 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.
+# serial 5
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -1214,40 +1063,32 @@ case `pwd` in
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
esac
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
test "$[2]" = conftest.file
)
then
@@ -1257,50 +1098,31 @@ else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
- am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
- [AC_MSG_CHECKING([that generated files are newer than configure])
- if test -n "$am_sleep_pid"; then
- # Hide warnings about reused PIDs.
- wait $am_sleep_pid 2>/dev/null
- fi
- AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
+AC_MSG_RESULT(yes)])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 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.
+# serial 2
+
# AM_SILENT_RULES([DEFAULT])
# --------------------------
# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
+# (`yes' being less verbose, `no' or empty being verbose).
AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
- [--enable-silent-rules],
- [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
- [--disable-silent-rules],
- [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules],
+[ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
dnl See automake bug#9928 and bug#10237.
am_make=${MAKE-make}
@@ -1318,7 +1140,7 @@ else
am_cv_make_support_nested_variables=no
fi])
if test $am_cv_make_support_nested_variables = yes; then
- dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ dnl Using `$V' instead of `$(V)' breaks IRIX make.
AM_V='$(V)'
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
else
@@ -1335,40 +1157,44 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 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.
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
+# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
+# always use install-sh in `make install-strip', and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip". However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 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.
+# serial 3
+
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1382,16 +1208,18 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 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.
+# serial 2
+
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+# FORMAT should be one of `v7', `ustar', or `pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@ -1401,114 +1229,76 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
-#
AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
-m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
- [m4_case([$1],
- [ustar],
- [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
- # There is notably a 21 bits limit for the UID and the GID. In fact,
- # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
- # and bug#13588).
- am_max_uid=2097151 # 2^21 - 1
- am_max_gid=$am_max_uid
- # The $UID and $GID variables are not portable, so we need to resort
- # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
- # below are definitely unexpected, so allow the users to see them
- # (that is, avoid stderr redirection).
- am_uid=`id -u || echo unknown`
- am_gid=`id -g || echo unknown`
- AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- _am_tools=none
- fi
- AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- _am_tools=none
- fi],
-
- [pax],
- [],
-
- [m4_fatal([Unknown tar format])])
-
- AC_MSG_CHECKING([how to create a $1 tar archive])
-
- # Go ahead even if we have the value already cached. We do so because we
- # need to set the values for the 'am__tar' and 'am__untar' variables.
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
- for _am_tool in $_am_tools; do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar; do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works.
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- AM_RUN_LOG([cat conftest.dir/file])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
- done
+ # tar/untar a dummy directory, and stop if the command works
rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
- AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
diff --git a/ar-lib b/ar-lib
index fe2301e..c0286a4 100755
--- a/ar-lib
+++ b/ar-lib
@@ -2,9 +2,9 @@
# Wrapper for Microsoft lib.exe
me=ar-lib
-scriptversion=2012-03-01.08; # UTC
+scriptversion=2012-01-30.22; # UTC
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
# Written by Peter Rosin <peda@lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
@@ -153,9 +153,7 @@ action=${action#-}
delete=
extract=
list=
-quick=
replace=
-index=
create=
while test -n "$action"
@@ -164,10 +162,7 @@ do
d*) delete=yes ;;
x*) extract=yes ;;
t*) list=yes ;;
- q*) quick=yes ;;
r*) replace=yes ;;
- s*) index=yes ;;
- S*) ;; # the index is always updated implicitly
c*) create=yes ;;
u*) ;; # TODO: don't ignore the update modifier
v*) ;; # TODO: don't ignore the verbose modifier
@@ -178,8 +173,8 @@ do
action=${action#?}
done
-case $delete$extract$list$quick$replace,$index in
- yes,* | ,yes)
+case $delete$extract$list$replace in
+ yes)
;;
yesyes*)
func_error "more than one action specified"
@@ -230,7 +225,7 @@ elif test -n "$extract"; then
done
fi
-elif test -n "$quick$replace"; then
+elif test -n "$replace"; then
if test ! -f "$orig_archive"; then
if test -z "$create"; then
echo "$me: creating $orig_archive"
diff --git a/compile b/compile
index 531136b..b1f4749 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,10 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2012-01-04.17; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -78,53 +79,6 @@ func_file_conv ()
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 ()
@@ -155,34 +109,43 @@ func_cl_wrapper ()
;;
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"
+ lib=${1#-l}
+ 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
+ set x "$@" "$dir/$lib.dll.lib"
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ set x "$@" "$dir/$lib.lib"
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ test "$found" != yes && set x "$@" "$lib.lib"
shift
;;
- -L)
- eat=1
- func_cl_dashL "$2"
- ;;
-L*)
- func_cl_dashL "${1#-L}"
+ func_file_conv "${1#-L}"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
;;
-static)
shared=false
diff --git a/config.guess b/config.guess
index 5a328aa..d622a44 100755
--- a/config.guess
+++ b/config.guess
@@ -1,12 +1,14 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2013-05-16'
+timestamp='2012-02-10'
# 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
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -20,17 +22,19 @@ timestamp='2013-05-16'
# 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 Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
#
-# Originally written by Per Bothner.
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
#
# 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.
-
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +54,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+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."
@@ -132,27 +138,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
- # If the system lacks a compiler, then just pick glibc.
- # We could probably try harder.
- LIBC=gnu
-
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
- #include <features.h>
- #if defined(__UCLIBC__)
- LIBC=uclibc
- #elif defined(__dietlibc__)
- LIBC=dietlibc
- #else
- LIBC=gnu
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- ;;
-esac
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -215,10 +200,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
- *:Bitrig:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
- exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -321,7 +302,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm*:riscos:*:*|arm*:RISCOS:*:*)
+ arm:riscos:*:*|arm:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -810,14 +791,16 @@ EOF
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ case ${UNAME_PROCESSOR} in
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- *:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
- exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
@@ -869,21 +852,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -896,54 +879,59 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -962,57 +950,54 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1216,9 +1201,6 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
- x86_64:Haiku:*:*)
- echo x86_64-unknown-haiku
- exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1245,21 +1227,19 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
- 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
- fi
- fi
+ case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ 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
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1276,7 +1256,7 @@ EOF
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-*:NONSTOP_KERNEL:*:*)
+ NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1350,6 +1330,9 @@ EOF
exit ;;
esac
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
diff --git a/config.sub b/config.sub
index 68e6582..c894da4 100755
--- a/config.sub
+++ b/config.sub
@@ -1,18 +1,24 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2013-04-24'
+timestamp='2012-02-10'
-# 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
-# the Free Software Foundation; either version 3 of the License, or
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# 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
+# the Free Software Foundation; either version 2 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.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -20,12 +26,11 @@ timestamp='2013-04-24'
# 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 Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -68,7 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+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."
@@ -116,7 +123,7 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
@@ -149,7 +156,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze*)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
@@ -218,12 +225,6 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
- -lynx*178)
- os=-lynxos178
- ;;
- -lynx*5)
- os=-lynxos5
- ;;
-lynx*)
os=-lynxos
;;
@@ -252,10 +253,8 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- | avr | avr32 \
- | be32 | be64 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -268,7 +267,7 @@ case $basic_machine in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -286,17 +285,16 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
+ | nios | nios2 \
| ns16k | ns32k \
| open8 \
- | or1k | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -366,7 +364,7 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* | arceb-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
@@ -385,8 +383,7 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | microblaze-* | microblazeel-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -404,13 +401,12 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@@ -473,6 +469,12 @@ case $basic_machine in
basic_machine=a29k-none
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -780,13 +782,9 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze*)
+ microblaze)
basic_machine=microblaze-xilinx
;;
- mingw64)
- basic_machine=x86_64-pc
- os=-mingw64
- ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1015,11 +1013,7 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
- rdos | rdos64)
- basic_machine=x86_64-pc
- os=-rdos
- ;;
- rdos32)
+ rdos)
basic_machine=i386-pc
os=-rdos
;;
@@ -1346,21 +1340,21 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* \
+ | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1492,6 +1486,9 @@ case $os in
-aros*)
os=-aros
;;
+ -kaos*)
+ os=-kaos
+ ;;
-zvmoe)
os=-zvmoe
;;
@@ -1540,9 +1537,6 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
- hexagon-*)
- os=-elf
- ;;
tic54x-*)
os=-coff
;;
@@ -1583,9 +1577,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/configure b/configure
index e2def65..0f1f8e7 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for knot 1.3.1.
+# Generated by GNU Autoconf 2.68 for knot 1.3.2.
#
# Report bugs to <knot-dns@labs.nic.cz>.
#
#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -134,31 +136,6 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# Use a proper internal environment variable to ensure we don't fall
- # into an infinite loop, continuously re-executing ourselves.
- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
- _as_can_reexec=no; export _as_can_reexec;
- # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
- fi
- # We don't want this to propagate to other subprocesses.
- { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -246,25 +222,21 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- export CONFIG_SHELL
- # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+ esac
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -367,14 +339,6 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
- test -f "$1" && test -x "$1"
-} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -496,10 +460,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
- # already done that, so ensure we don't try to do so again and fall
- # in an infinite loop. This has already happened in practice.
- _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -534,16 +494,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -555,8 +515,28 @@ else
as_mkdir_p=false
fi
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -590,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='knot'
PACKAGE_TARNAME='knot'
-PACKAGE_VERSION='1.3.1'
-PACKAGE_STRING='knot 1.3.1'
+PACKAGE_VERSION='1.3.2'
+PACKAGE_STRING='knot 1.3.2'
PACKAGE_BUGREPORT='knot-dns@labs.nic.cz'
PACKAGE_URL=''
@@ -1269,6 +1249,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1354,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures knot 1.3.1 to adapt to many kinds of systems.
+\`configure' configures knot 1.3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1424,7 +1406,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of knot 1.3.1:";;
+ short | recursive ) echo "Configuration of knot 1.3.2:";;
esac
cat <<\_ACEOF
@@ -1432,12 +1414,10 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-silent-rules less verbose build output (undo: "make V=1")
- --disable-silent-rules verbose build output (undo: "make V=0")
- --enable-dependency-tracking
- do not reject slow dependency extractors
- --disable-dependency-tracking
- speeds up one-time build
+ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
@@ -1571,10 +1551,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-knot configure 1.3.1
-generated by GNU Autoconf 2.69
+knot configure 1.3.2
+generated by GNU Autoconf 2.68
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1851,7 +1831,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
+ $as_test_x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1994,8 +1974,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by knot $as_me 1.3.1, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+It was created by knot $as_me 1.3.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2350,7 +2330,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.14'
+am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2418,7 +2398,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2476,6 +2456,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -2486,40 +2469,32 @@ case `pwd` in
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
-# Do 'set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+ fi
+
test "$2" = conftest.file
)
then
@@ -2531,16 +2506,6 @@ Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
- am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@ -2563,12 +2528,12 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
- am_missing_run="$MISSING "
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@ -2580,10 +2545,10 @@ if test x"${install_sh}" != xset; then
esac
fi
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip". However 'strip' might not be the right
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
+# will honor the `STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2602,7 +2567,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2642,7 +2607,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2693,7 +2658,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2722,6 +2687,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2740,7 +2711,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2804,45 +2775,6 @@ else
fi
rmdir .tst 2>/dev/null
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
- enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
- @$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -2865,7 +2797,7 @@ fi
# Define the identity of the package.
PACKAGE='knot'
- VERSION='1.3.1'
+ VERSION='1.3.2'
cat >>confdefs.h <<_ACEOF
@@ -2893,79 +2825,27 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-# For better backward compatibility. To be removed once Automake 1.9.x
-# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
# We need awk for the "check" target. 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}'
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar pax cpio none'
-
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-# 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: <http://austingroupbugs.net/view.php?id=542>
-
-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: <http://www.gnu.org/software/coreutils/>.
-
-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;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=0;;
esac
am_make=${MAKE-make}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -3019,7 +2899,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
+# Ignore all kinds of additional output from `make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -3085,7 +2965,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3125,7 +3005,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3178,7 +3058,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3219,7 +3099,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3277,7 +3157,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3321,7 +3201,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3767,7 +3647,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3852,65 +3733,6 @@ 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
-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
-
-
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -3922,8 +3744,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named 'D' -- because '-MD' means "put the output
- # in D".
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -3958,16 +3780,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
- # Solaris 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle '-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs.
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -3976,8 +3798,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # After this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested.
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -3985,7 +3807,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
+ # This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -4194,7 +4016,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4260,7 +4082,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -4467,8 +4289,8 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-# define __EXTENSIONS__ 1
- $ac_includes_default
+# define __EXTENSIONS__ 1
+ $ac_includes_default
int
main ()
{
@@ -4651,7 +4473,7 @@ main ()
return 0;
}
_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
do
CC="$ac_save_CC $ac_arg"
if ac_fn_c_try_compile "$LINENO"; then :
@@ -4682,9 +4504,137 @@ if test "x$ac_cv_prog_cc_c99" != xno; then :
fi
+if test "x$CC" != xcc; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+ { $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; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval \${ac_cv_prog_cc_${ac_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.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } &&
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; };
+then
+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+ if test "x$CC" != xcc; then
+ # Test first that cc exists at all.
+ if { ac_try='cc -c conftest.$ac_ext >&5'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+ if { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } &&
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; };
+ then
+ # cc works too.
+ :
+ else
+ # cc exists but doesn't like -o.
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
+ fi
+ fi
+else
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != 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_c_preproc_warn_flag=yes
+# Default compiler flags
+CFLAGS="$CFLAGS -Wall"
+
# Checks for programs.
if test -n "$ac_tool_prefix"; then
for ac_prog in ar lib "link -lib"
@@ -4705,7 +4655,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4749,7 +4699,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4793,13 +4743,7 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; }
if ${am_cv_ar_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
- 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
-
- am_cv_ar_interface=ar
+ am_cv_ar_interface=ar
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int some_variable = 0;
@@ -4830,11 +4774,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 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
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
@@ -5077,7 +5016,7 @@ do
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_SED" || continue
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -5156,7 +5095,7 @@ do
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_FGREP" || continue
+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -5412,7 +5351,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5456,7 +5395,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5880,7 +5819,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5920,7 +5859,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6092,7 +6031,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -6226,7 +6165,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6266,7 +6205,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6369,7 +6308,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6413,7 +6352,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6538,7 +6477,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6578,7 +6517,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6637,7 +6576,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6677,7 +6616,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7326,7 +7265,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7366,7 +7305,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7446,7 +7385,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7486,7 +7425,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7538,7 +7477,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7578,7 +7517,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7630,7 +7569,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7670,7 +7609,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7722,7 +7661,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7762,7 +7701,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7814,7 +7753,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7854,7 +7793,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9195,6 +9134,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -9416,7 +9358,7 @@ _LT_EOF
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -9593,6 +9535,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -10046,7 +9989,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -11074,6 +11017,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -12074,7 +12029,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12117,7 +12072,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12184,7 +12139,7 @@ do
for ac_prog in $LEX flex gflex; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_LEX="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_LEX" || continue
+ { test -f "$ac_path_LEX" && $as_test_x "$ac_path_LEX"; } || continue
cat >conftest.l <<_ACEOF
%{
%}
@@ -12250,7 +12205,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LEX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12282,8 +12237,7 @@ a { ECHO; }
b { REJECT; }
c { yymore (); }
d { yyless (1); }
-e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */
- yyless ((input () != 0)); }
+e { yyless (input () != 0); }
f { unput (yytext[0]); }
. { BEGIN INITIAL; }
%%
@@ -12413,7 +12367,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_YACC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12463,7 +12417,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_RAGEL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13939,6 +13893,26 @@ fi
done
+# Check for be64toh function
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <endian.h>
+int
+main ()
+{
+return be64toh(0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+$as_echo "#define HAVE_BE64TOH 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
# Check for cpu_set_t/cpuset_t compatibility
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14159,14 +14133,6 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
- if test -n "$am_sleep_pid"; then
- # Hide warnings about reused PIDs.
- wait $am_sleep_pid 2>/dev/null
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -14485,16 +14451,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -14554,16 +14520,28 @@ else
as_mkdir_p=false
fi
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
- test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -14584,8 +14562,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by knot $as_me 1.3.1, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+This file was extended by knot $as_me 1.3.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -14650,11 +14628,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-knot config.status 1.3.1
-configured by $0, generated by GNU Autoconf 2.69,
+knot config.status 1.3.2
+configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -14745,7 +14723,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -15671,7 +15649,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Older Autoconf quotes --file arguments for eval, but not when files
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -15684,7 +15662,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
+ # We used to match only the files named `Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -15718,19 +15696,21 @@ $as_echo X"$mf" |
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
+ # from the Makefile without running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
+ test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
diff --git a/configure.ac b/configure.ac
index c3da1b1..3efe4c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
AC_PREREQ([2.60])
-AC_INIT([knot], [1.3.1], [knot-dns@labs.nic.cz])
+AC_INIT([knot], [1.3.2], [knot-dns@labs.nic.cz])
AM_INIT_AUTOMAKE([gnits subdir-objects dist-bzip2 dist-xz -Wall -Werror])
AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([src/knot/main.c])
@@ -18,6 +18,9 @@ AC_PROG_CC_C99
AM_PROG_CC_C_O
AC_PROG_CPP_WERROR
+# Default compiler flags
+CFLAGS="$CFLAGS -Wall"
+
# Checks for programs.
m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # call AM_PROG_AR only if available
@@ -294,6 +297,10 @@ AC_DEFINE([DSFMT_MEXP], [521], [DSFMT parameters])
# Checks for library functions.
AC_CHECK_FUNCS([clock_gettime gettimeofday fgetln getline madvise poll posix_memalign pselect pthread_setaffinity_np regcomp select setgroups initgroups])
+# Check for be64toh function
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <endian.h>]], [[return be64toh(0);]])],
+[AC_DEFINE(HAVE_BE64TOH, 1, [Define to 1 if you have the `be64toh' function.])])
+
# Check for cpu_set_t/cpuset_t compatibility
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[cpu_set_t set; CPU_ZERO(&set);]])],
[AC_DEFINE(HAVE_CPUSET_LINUX, 1, [Define if Linux-like cpu_set_t exists.])])
diff --git a/depcomp b/depcomp
index 4ebd5b3..bd0ac08 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2011-12-04.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 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
@@ -27,9 +28,9 @@ scriptversion=2013-05-30.07; # UTC
case $1 in
'')
- echo "$0: No command. Try '$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -39,8 +40,8 @@ as side-effects.
Environment variables:
depmode Dependency tracking mode.
- source Source file read by 'PROGRAMS ARGS'.
- object Object file output by 'PROGRAMS ARGS'.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
tmpdepfile Temporary file to use when outputting dependencies.
@@ -56,66 +57,6 @@ EOF
;;
esac
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'. Note that this directory component will
-# be either empty or ending with a '/' character. This is deliberate.
-set_dir_from ()
-{
- case $1 in
- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
- *) dir=;;
- esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
- echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
- # If the compiler actually managed to produce a dependency file,
- # post-process it.
- if test -f "$tmpdepfile"; then
- # Each line is of the form 'foo.o: dependency.h'.
- # Do two passes, one to just change these to
- # $object: dependency.h
- # and one to simply output
- # dependency.h:
- # which is needed to avoid the deleted-header problem.
- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
- } > "$depfile"
- rm -f "$tmpdepfile"
- else
- make_dummy_depfile
- fi
-}
-
-# A tabulation character.
-tab=' '
-# A newline character.
-nl='
-'
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
-
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -128,9 +69,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -142,32 +80,26 @@ if test "$depmode" = hp; then
fi
if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvisualcpp
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
fi
if test "$depmode" = msvc7msys; then
- # This is just like msvc7 but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
- gccflag=-qmakedep=gcc,-MF
- depmode=gcc
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
fi
case "$depmode" in
@@ -190,7 +122,8 @@ gcc3)
done
"$@"
stat=$?
- if test $stat -ne 0; then
+ if test $stat -eq 0; then :
+ else
rm -f "$tmpdepfile"
exit $stat
fi
@@ -198,17 +131,13 @@ gcc3)
;;
gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say). Also, it might not be
-## supported by the other compilers which use the 'gcc' depmode.
+## -MM, not -M (despite what the docs say).
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
@@ -216,31 +145,33 @@ gcc)
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
- if test $stat -ne 0; then
+ if test $stat -eq 0; then :
+ else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- # The second -e expression handles DOS-style file names with drive
- # letters.
+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
+## This next piece of magic avoids the `deleted header file' problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
-## Some versions of gcc put a space before the ':'. On the theory
+ tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
## well. hp depmode also adds that space, but also prefixes the VPATH
## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -258,7 +189,8 @@ sgi)
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
- if test $stat -ne 0; then
+ if test $stat -eq 0; then :
+ else
rm -f "$tmpdepfile"
exit $stat
fi
@@ -266,41 +198,43 @@ sgi)
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
+
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like '#:fec' to the end of the
+ # the IRIX cc adds comments like `#:fec' to the end of the
# dependency line.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
- | tr "$nl" ' ' >> "$depfile"
+ tr ' ' '
+' < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+ tr '
+' ' ' >> "$depfile"
echo >> "$depfile"
+
# The second pass generates a dummy entry for each header file.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ tr ' ' '
+' < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
else
- make_dummy_depfile
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+ # "include basename.Plo" scheme.
+ echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
-xlc)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts '$object:' at the
+ # current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- set_dir_from "$object"
- set_base_from "$object"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
@@ -313,7 +247,9 @@ aix)
"$@" -M
fi
stat=$?
- if test $stat -ne 0; then
+
+ if test $stat -eq 0; then :
+ else
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
@@ -322,100 +258,44 @@ aix)
do
test -f "$tmpdepfile" && break
done
- aix_post_process_depfile
- ;;
-
-tcc)
- # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
- # FIXME: That version still under development at the moment of writing.
- # Make that this statement remains true also for stable, released
- # versions.
- # It will wrap lines (doesn't matter whether long or short) with a
- # trailing '\', as in:
- #
- # foo.o : \
- # foo.c \
- # foo.h \
- #
- # It will put a trailing '\' even on the last line, and will use leading
- # spaces rather than leading tabs (at least since its commit 0394caf7
- # "Emit spaces for -MD").
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+ # "include basename.Plo" scheme.
+ echo "#dummy" > "$depfile"
fi
- rm -f "$depfile"
- # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
- # We have to change lines of the first kind to '$object: \'.
- sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
- # And for each line of the second kind, we have to emit a 'dep.h:'
- # dummy dependency, to avoid the deleted-header problem.
- sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file. A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
- # Portland's C compiler understands '-MD'.
- # Will always output deps to 'file.d' where file is the root name of the
- # source file under compilation, even if file resides in a subdirectory.
- # The object file name does not affect the name of the '.d' file.
- # pgcc 10.2 will output
+icc)
+ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using '\' :
+ # and will wrap long lines using \ :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
- set_dir_from "$object"
- # Use the source, not the object, to determine the base name, since
- # that's sadly what pgcc will do too.
- set_base_from "$source"
- tmpdepfile=$base.d
-
- # For projects that build the same source file twice into different object
- # files, the pgcc approach of using the *source* file root name can cause
- # problems in parallel builds. Use a locking strategy to avoid stomping on
- # the same $tmpdepfile.
- lockdir=$base.d-lock
- trap "
- echo '$0: caught signal, cleaning up...' >&2
- rmdir '$lockdir'
- exit 1
- " 1 2 13 15
- numtries=100
- i=$numtries
- while test $i -gt 0; do
- # mkdir is a portable test-and-set.
- if mkdir "$lockdir" 2>/dev/null; then
- # This process acquired the lock.
- "$@" -MD
- stat=$?
- # Release the lock.
- rmdir "$lockdir"
- break
- else
- # If the lock is being held by a different process, wait
- # until the winning process is done or we timeout.
- while test -d "$lockdir" && test $i -gt 0; do
- sleep 1
- i=`expr $i - 1`
- done
- fi
- i=`expr $i - 1`
- done
- trap - 1 2 13 15
- if test $i -le 0; then
- echo "$0: failed to acquire lock after $numtries attempts" >&2
- echo "$0: check lockdir '$lockdir'" >&2
- exit 1
- fi
- if test $stat -ne 0; then
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
rm -f "$tmpdepfile"
exit $stat
fi
@@ -427,8 +307,8 @@ pgcc)
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
# Some versions of the HPUX 10.20 sed can't process this invocation
# correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
- | sed -e 's/$/ :/' >> "$depfile"
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -439,8 +319,9 @@ hp2)
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
- set_dir_from "$object"
- set_base_from "$object"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
@@ -451,7 +332,8 @@ hp2)
"$@" +Maked
fi
stat=$?
- if test $stat -ne 0; then
+ if test $stat -eq 0; then :
+ else
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
@@ -461,61 +343,77 @@ hp2)
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add 'dependent.h:' lines.
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
else
- make_dummy_depfile
+ echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in 'foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- set_dir_from "$object"
- set_base_from "$object"
-
- if test "$libtool" = yes; then
- # Libtool generates 2 separate objects for the 2 libraries. These
- # two compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir$base.o.d # libtool 1.5
- tmpdepfile2=$dir.libs/$base.o.d # Likewise.
- tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- do
- test -f "$tmpdepfile" && break
- done
- # Same post-processing that is required for AIX mode.
- aix_post_process_depfile
- ;;
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in `foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
msvc7)
if test "$libtool" = yes; then
@@ -526,7 +424,8 @@ msvc7)
"$@" $showIncludes > "$tmpdepfile"
stat=$?
grep -v '^Note: including file: ' "$tmpdepfile"
- if test $stat -ne 0; then
+ if test "$stat" = 0; then :
+ else
rm -f "$tmpdepfile"
exit $stat
fi
@@ -544,15 +443,14 @@ msvc7)
p
}' | $cygpath_u | sort -u | sed -n '
s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
+s/\(.*\)/ \1 \\/p
s/.\(.*\) \\/\1:/
H
$ {
- s/.*/'"$tab"'/
+ s/.*/ /
G
p
}' >> "$depfile"
- echo >> "$depfile" # make sure the fragment doesn't end with a backslash
rm -f "$tmpdepfile"
;;
@@ -580,7 +478,7 @@ dashmstdout)
shift
fi
- # Remove '-o $object'.
+ # Remove `-o $object'.
IFS=" "
for arg
do
@@ -600,18 +498,18 @@ dashmstdout)
done
test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for ':'
+ # Require at least two characters before searching for `:'
# in the target name. This is to cope with DOS-style filenames:
- # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
"$@" $dashmflag |
- sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this sed invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
+ tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -664,12 +562,11 @@ makedepend)
# makedepend may prepend the VPATH from the source file name to the object.
# No need to regex-escape $object, excess matching of '.' is harmless.
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process the last invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed '1,2d' "$tmpdepfile" \
- | tr ' ' "$nl" \
- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
+ sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
@@ -686,7 +583,7 @@ cpp)
shift
fi
- # Remove '-o $object'.
+ # Remove `-o $object'.
IFS=" "
for arg
do
@@ -705,10 +602,10 @@ cpp)
esac
done
- "$@" -E \
- | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- | sed '$ s: \\$::' > "$tmpdepfile"
+ "$@" -E |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
@@ -740,23 +637,23 @@ msvisualcpp)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
+ set fnord "$@"
+ shift
+ shift
+ ;;
*)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
esac
done
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
- echo "$tab" >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+ echo " " >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
diff --git a/doc/Makefile.in b/doc/Makefile.in
index cc72c1f..160b16c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in 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.
@@ -14,51 +15,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -78,9 +34,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(knot_TEXINFOS) mdate-sh $(srcdir)/version.texi \
- $(srcdir)/stamp-vti texinfo.tex
+DIST_COMMON = $(knot_TEXINFOS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/stamp-vti \
+ $(srcdir)/version.texi mdate-sh texinfo.tex
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -93,48 +49,14 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
+am__v_GEN_0 = @echo " GEN " $@;
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
-am__v_at_1 =
SOURCES =
DIST_SOURCES =
-AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
-am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
-am__v_DVIPS_0 = @echo " DVIPS " $@;
-am__v_DVIPS_1 =
-AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
-am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
-am__v_MAKEINFO_0 = @echo " MAKEINFO" $@;
-am__v_MAKEINFO_1 =
-AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
-am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
-am__v_INFOHTML_0 = @echo " INFOHTML" $@;
-am__v_INFOHTML_1 =
-AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
-am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
-am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@;
-am__v_TEXI2DVI_1 =
-AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
-am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
-am__v_TEXI2PDF_0 = @echo " TEXI2PDF" $@;
-am__v_TEXI2PDF_1 =
-AM_V_texinfo = $(am__v_texinfo_@AM_V@)
-am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
-am__v_texinfo_0 = -q
-am__v_texinfo_1 =
-AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
-am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
-am__v_texidevnull_0 = > /dev/null
-am__v_texidevnull_1 =
INFO_DEPS = $(srcdir)/knot.info
am__TEXINFO_TEX_DIR = $(srcdir)
DVIS = knot.dvi
@@ -147,11 +69,6 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
DVIPS = dvips
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
am__installdirs = "$(DESTDIR)$(infodir)"
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -180,7 +97,6 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -373,7 +289,7 @@ clean-libtool:
-rm -rf .libs _libs
.texi.info:
- $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+ restore=: && backupdir="$(am__leading_dot)am$$$$" && \
am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -395,25 +311,27 @@ clean-libtool:
rm -rf $$backupdir; exit $$rc
.texi.dvi:
- $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
- $<
+ $(TEXI2DVI) $<
.texi.pdf:
- $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
- $<
+ $(TEXI2PDF) $<
.texi.html:
- $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
- $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+ rm -rf $(@:.html=.htp)
+ if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $(@:.html=.htp) $<; \
then \
- rm -rf $@ && mv $(@:.html=.htp) $@; \
+ rm -rf $@; \
+ if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+ mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
else \
- rm -rf $(@:.html=.htp); exit 1; \
+ if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+ rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+ exit 1; \
fi
$(srcdir)/knot.info: knot.texi $(srcdir)/version.texi $(knot_TEXINFOS)
knot.dvi: knot.texi $(srcdir)/version.texi $(knot_TEXINFOS)
@@ -439,8 +357,8 @@ mostlyclean-vti:
maintainer-clean-vti:
-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
.dvi.ps:
- $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- $(DVIPS) $(AM_V_texinfo) -o $@ $<
+ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ $(DVIPS) -o $@ $<
uninstall-dvi-am:
@$(NORMAL_UNINSTALL)
@@ -462,7 +380,9 @@ uninstall-html-am:
uninstall-info-am:
@$(PRE_UNINSTALL)
- @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
+ @if test -d '$(DESTDIR)$(infodir)' && \
+ (install-info --version && \
+ install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -519,7 +439,9 @@ dist-info: $(INFO_DEPS)
done
mostlyclean-aminfo:
- -rm -rf knot.t2d knot.t2p
+ -rm -rf knot.aux knot.cp knot.cps knot.fn knot.fns knot.ky knot.kys \
+ knot.log knot.pg knot.pgs knot.st knot.sts knot.tmp knot.toc \
+ knot.tp knot.tps knot.vr
clean-aminfo:
-test -z "knot.dvi knot.pdf knot.ps knot.html" \
@@ -531,11 +453,11 @@ maintainer-clean-aminfo:
echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
done
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
distdir: $(DISTFILES)
@@ -634,11 +556,8 @@ install-dvi: install-dvi-am
install-dvi-am: $(DVIS)
@$(NORMAL_INSTALL)
+ test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -653,11 +572,8 @@ install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
+ test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
$(am__strip_dir) \
@@ -680,12 +596,9 @@ install-info: install-info-am
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
+ test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
- fi; \
for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -703,7 +616,13 @@ install-info-am: $(INFO_DEPS)
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
@$(POST_INSTALL)
- @if $(am__can_run_installinfo); then \
+ @am__run_installinfo=yes; \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) am__run_installinfo=no;; \
+ *) (install-info --version) >/dev/null 2>&1 \
+ || am__run_installinfo=no;; \
+ esac; \
+ if test $$am__run_installinfo = yes; then \
list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -717,11 +636,8 @@ install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
+ test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -733,11 +649,8 @@ install-ps: install-ps-am
install-ps-am: $(PSS)
@$(NORMAL_INSTALL)
+ test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
@list='$(PSS)'; test -n "$(psdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -771,18 +684,17 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
- clean-libtool cscopelist-am ctags-am dist-info distclean \
- distclean-generic distclean-libtool distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-aminfo maintainer-clean-generic \
- maintainer-clean-vti mostlyclean mostlyclean-aminfo \
- mostlyclean-generic mostlyclean-libtool mostlyclean-vti pdf \
- pdf-am ps ps-am tags-am uninstall uninstall-am \
+ clean-libtool dist-info distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-aminfo \
+ maintainer-clean-generic maintainer-clean-vti mostlyclean \
+ mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-vti pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-pdf-am uninstall-ps-am
diff --git a/doc/knot.info b/doc/knot.info
index f05df5e..f3fb193 100644
--- a/doc/knot.info
+++ b/doc/knot.info
@@ -1,7 +1,7 @@
-This is ./knot.info, produced by makeinfo version 4.8 from ./knot.texi.
+This is knot.info, produced by makeinfo version 4.13 from knot.texi.
-This manual is for Knot DNS (version 1.3.1, 9 August 2013), which is a
-high-performance authoritative-only DNS server.
+This manual is for Knot DNS (version 1.3.2, 30 September 2013), which
+is a high-performance authoritative-only DNS server.
Copyright (C) 2012 CZ.NIC, z.s.p.o.
@@ -30,7 +30,7 @@ File: knot.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
Knot DNS
********
-This manual is for Knot DNS (version 1.3.1, 9 August 2013).
+This manual is for Knot DNS (version 1.3.2, 30 September 2013).
* Menu:
@@ -502,7 +502,7 @@ For example:
$ ./configure --enable-debug=server,packet --enable-debuglevel=brief
$ ./configure --enable-debug=server,packet --enable-debuglevel=verbose
-For more detailed information, see *Note Debug messages::.
+For more detailed information, see *note Debug messages::.
In most simple case you can just run configure without any options.
@@ -732,14 +732,14 @@ can be used as a base for your Knot DNS setup.
Now let's go step by step through this minimal configuration file:
1. In `system' statement we have configured `storage' directory where
- Knot DNS will store slave zones and journal files. (See *Note
- system:: and *Note storage::)
+ Knot DNS will store slave zones and journal files. (See *note
+ system:: and *note storage::)
2. The `interfaces' statement defines interfaces where Knot DNS will
listen for incoming connections. We have defined two interfaces:
one IPv4 called `my_interface' explicitly listening on port 53 and
second IPv6 called `second_int' also listening on port 53, which
- is the default port for the DNS. See *Note interfaces::.
+ is the default port for the DNS. See *note interfaces::.
3. The `log' statement defines the log facilities for Knot DNS. In
this example we told Knot DNS to send its log messages with the
@@ -747,7 +747,7 @@ Now let's go step by step through this minimal configuration file:
you omit this sections, all severities will printed to either
`stdout' or `stderr', and the severities from the `warning' and
more serious to syslog. You can find all possible combinations in
- the *Note log::.
+ the *note log::.
4. The `zones' statement is probably the most important one, because
it defines the zones that Knot DNS will serve. In its most simple
@@ -766,7 +766,7 @@ the zone master. If `update-in' is set and zone has a master, any
accepted DNS UPDATE will be forwarded to master. Also note that you
need to explicitly allow incoming NOTIFY, otherwise the daemon would
reject them. Also, you can specify paths, relative to the storage
-directory. See *Note zones:: and *Note storage::. If the zone file
+directory. See *note zones:: and *note storage::. If the zone file
doesn't exist and `xfr-in' is set, it will be bootstrapped over AXFR.
remotes {
@@ -788,7 +788,7 @@ configure a TSIG key and assign it to a remote. Supported algorithms
for TSIG key are:
`hmac-md5, hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384,
hmac-sha512'
-Key secret is written in a base64 encoded format. See *Note keys::.
+Key secret is written in a base64 encoded format. See *note keys::.
keys {
key0 hmac-md5 "Wg=="; # keyname algorithm secret
@@ -929,7 +929,7 @@ File: knot.info, Node: Enabling zone semantic checks, Next: Creating IXFR diff
=================================
You can turn on more detailed semantic checks of zone file in this
-`zones' statement (*note zones::). Refer to *Note zones List of zone
+`zones' statement (*note zones::). Refer to *note zones List of zone
semantic checks:: to see which checks are enabled by default and which
are optional.
@@ -941,9 +941,9 @@ File: knot.info, Node: Creating IXFR differences from zone file changes, Next:
If Knot is being run as a master server, experimental feature
`ixfr-from-differences' can be enabled to create IXFR differences from
-changes made to the master zone file. See *Note Controlling running
+changes made to the master zone file. See *note Controlling running
daemon:: for more information. For more about `zones' statement see
-*Note zones::.
+*note zones::.

File: knot.info, Node: Using Response Rate Limiting, Prev: Creating IXFR differences from zone file changes, Up: Knot DNS Configuration
@@ -959,13 +959,13 @@ could then exploit DNS server responding to every query, potentially
flooding the victim with a large unsolicited DNS responses.
As of Knot DNS version 1.2.0, RRL is compiled in, but disabled by
-default. You can enable it with the *Note rate-limit:: option in the
-*Note system:: section. Setting to a value greater than `0' means that
+default. You can enable it with the *note rate-limit:: option in the
+*note system:: section. Setting to a value greater than `0' means that
every flow is allowed N responses per second, (i.e. `rate-limit 50;'
means `50' responses per second). It is also possible to configure
SLIP interval, which causes every Nth blocked response to be slipped as
a truncated response. Not that some error responses cannot be truncated
-and are slipped as-is. For more information, refer to *Note
+and are slipped as-is. For more information, refer to *note
rate-limit-slip::. It is advisable to not set slip interval to a value
larger than 1.
@@ -1088,7 +1088,7 @@ foreground mode, PID file will be created in `rundir' directory.
$ knotd -d -c slave.conf # start the daemon
$ knotc -c slave.conf stop # stop the daemon
-When the server is running, you can control the daemon, see *Note
+When the server is running, you can control the daemon, see *note
Controlling running daemon::.

@@ -1128,7 +1128,7 @@ restarting the server. This can be done with the `knotc reload' action.
$ knotc -c master.conf reload # reconfigure and load updated zones
If you want _IXFR-out_ differences created from changes you make to a
-zone file, enable *Note ixfr-from-differences:: in `zones' statement,
+zone file, enable *note ixfr-from-differences:: in `zones' statement,
then reload your server as seen above. If _SOA_'s _serial_ is not
changed no differences will be created. Please note that this feature
is in _experimental_ stage and should be used with care. If you
@@ -1323,6 +1323,7 @@ Statement Index
* max-conn-hs: max-conn-hs. (line 6)
* max-conn-idle: max-conn-idle. (line 6)
* max-conn-reply: max-conn-reply. (line 6)
+* max-udp-payload: max-udp-payload. (line 6)
* notify-in: notify-in. (line 6)
* notify-out: notify-out. (line 6)
* notify-retries: notify-retries. (line 6)
@@ -1409,6 +1410,7 @@ A.1.1 `system' Syntax
[ `rate-limit' integer`;' ]
[ `rate-limit-size' integer`;' ]
[ `rate-limit-slip' integer`;' ]
+ [ `max-udp-payload' integer`;' ]
`}'

@@ -1434,6 +1436,7 @@ A.1.2 Statement Definition and Usage
* rate-limit::
* rate-limit-size::
* rate-limit-slip::
+* max-udp-payload::

File: knot.info, Node: identity, Next: version, Up: system Statement Definition and Usage
@@ -1636,7 +1639,7 @@ is to select a prime near `1.2 * maximum_qps'.
Default value: `393241'

-File: knot.info, Node: rate-limit-slip, Prev: rate-limit-size, Up: system Statement Definition and Usage
+File: knot.info, Node: rate-limit-slip, Next: max-udp-payload, Prev: rate-limit-size, Up: system Statement Definition and Usage
A.1.2.15 rate-limit-slip
........................
@@ -1651,14 +1654,24 @@ responses can't be truncated (f.e. SERVFAIL).
Default value: `1'

+File: knot.info, Node: max-udp-payload, Prev: rate-limit-slip, Up: system Statement Definition and Usage
+
+A.1.2.16 max-udp-payload
+........................
+
+Maximum EDNS0 UDP payload size.
+
+Default value: `4096'
+
+
File: knot.info, Node: system Example, Prev: system Statement Definition and Usage, Up: system
A.1.3 system Example
--------------------
system {
- identity "Knot DNS 1.3.1";
- version "1.3.1";
+ identity "Knot DNS 1.3.2";
+ version "1.3.2";
nsid "amaterasu";
storage "/var/lib/knot";
rundir "/var/run/knot";
@@ -1960,10 +1973,10 @@ A.5 `groups' Statement
======================
The `groups' statement is used to create groups of remote machines
-defined in *Note remotes:: statement. The group can substitute multiple
+defined in *note remotes:: statement. The group can substitute multiple
machines specification anywhere in the configuration where the list of
-remotes is allowed to be used (namely `allow' in *Note control::
-section and ACLs in *Note zones:: section).
+remotes is allowed to be used (namely `allow' in *note control::
+section and ACLs in *note zones:: section).
The remotes definitions must exist prior to using them in group
definitions. One remote can be a member of multiple groups.
@@ -2011,7 +2024,7 @@ A.5.2.2 `remote_id'
...................
`remote_id' contains a symbolic name for a remote server as specified in
-*Note remotes:: section.
+*note remotes:: section.

File: knot.info, Node: groups Examples, Prev: groups Statement Definition and Grammar, Up: groups
@@ -2080,7 +2093,7 @@ A.6.2 Statement Definition and Grammar
--------------------------------------
Control interface `listen-on' either defines a UNIX socket or an
-IPv4/IPv6 `interface' definition as in *Note interfaces::. Default
+IPv4/IPv6 `interface' definition as in *note interfaces::. Default
port for IPv4/v6 control interface is `5533', however UNIX socket is
preferred. UNIX socket address is relative to `rundir' if not
specified as an absolute path. Without any configuration, the socket
@@ -2252,7 +2265,7 @@ A.7.2.8 semantic-checks
.......................
`semantic-checks' statement turns on optional semantic checks for this
-particular zone. See *Note zones List of zone semantic checks:: for
+particular zone. See *note zones List of zone semantic checks:: for
more information.
Possible values are `on' and `off'. Most checks are disabled by
@@ -2267,7 +2280,7 @@ A.7.2.9 ixfr-from-differences
EXPERIMENTAL: option `ixfr-from-differences' is only relevant if you
are running Knot DNS as a master for this zone. By turning the feature
on you tell Knot to create differences from changes you made to a zone
-file upon server reload. See *Note Controlling running daemon:: for
+file upon server reload. See *note Controlling running daemon:: for
more information.
Possible values are `on' and `off'. Disabled by default.
@@ -2309,7 +2322,7 @@ A.7.2.13 zonefile-sync
`zonefile-sync' is only relevant in a slave server scenario and only
after receiving IXFR. It is a time in seconds after which current zone
-in memory will be synced to its file on a disk (as set in *Note
+in memory will be synced to its file on a disk (as set in *note
file::). Knot DNS will serve the latest zone even after restart, but
zone file on a disk will only be synced after `zonefile-sync' time has
expired. Possible values are 1 to INT_MAX, optionally suffixed by unit
@@ -2579,129 +2592,135 @@ A.9.2 Examples

Tag Table:
-Node: Top1040
-Node: Introduction4046
-Node: What is Knot DNS4344
-Node: Knot DNS features4862
-Node: Scope of this document5883
-Node: Knot DNS Resource Requirements6145
-Node: Hardware requirements6443
-Node: CPU requirements7083
-Node: Memory requirements7468
-Node: Supported operating system8184
-Node: Knot DNS Installation8652
-Node: Required build environment8959
-Node: Required libraries9583
-Node: Userspace RCU10388
-Node: Installation from the sources11340
-Node: Configuring and generating Makefiles11925
-Node: Compilation13583
-Node: Installation14159
-Node: Installation from packages14666
-Node: Installing Knot DNS packages on Debian15190
-Node: Installing Knot DNS packages on Ubuntu16168
-Node: Adding official PPA repository for Knot DNS17082
-Node: Installing Knot DNS packages on Fedora17710
-Node: Installing Knot DNS from ports on FreeBSD19109
-Node: Knot DNS Configuration19456
-Node: Minimal configuration20027
-Node: Slave configuration22040
-Node: Master configuration24036
-Node: Configuring multiple interfaces25082
-Node: Using DNS UPDATE25567
-Node: Remote control interface27134
-Node: Enabling zone semantic checks28226
-Node: Creating IXFR differences from zone file changes28693
-Node: Using Response Rate Limiting29266
-Node: Running Knot DNS30697
-Node: Running a slave server34315
-Node: Running a master server35611
-Node: Controlling running daemon36592
-Node: Troubleshooting37763
-Node: Submitting a bugreport38171
-Node: Generating backtrace39341
-Node: Debug messages40343
-Node: Enabling debug messages in server41013
-Node: Debug messages Example42573
-Node: Statement Index42772
-Node: Knot DNS Configuration Reference46522
-Node: system46888
-Node: system Syntax47249
-Node: system Statement Definition and Usage48125
-Node: identity48545
-Node: version49076
-Node: nsid49674
-Node: storage50101
-Node: rundir50458
-Node: pidfile50799
-Node: workers51098
-Node: user51483
-Node: max-conn-idle51917
-Node: max-conn-hs52232
-Node: max-conn-reply52593
-Node: transfers52824
-Node: rate-limit53109
-Node: rate-limit-size53851
-Node: rate-limit-slip54522
-Node: system Example55106
-Node: keys55463
-Node: keys Syntax55770
-Node: keys Statement Definition and Usage55999
-Node: key_id56205
-Node: Example57167
-Node: interfaces57401
-Node: interfaces Syntax57736
-Node: interfaces Statement Definition and Usage58074
-Node: interface_id58316
-Node: interfaces Examples58680
-Node: remotes59159
-Node: remotes Syntax59758
-Node: remotes Statement Definition and Grammar60197
-Node: remote_id60467
-Node: address60667
-Node: port60886
-Node: key61140
-Node: via61355
-Node: remotes Examples61585
-Node: groups62111
-Node: groups Syntax62801
-Node: groups Statement Definition and Grammar63019
-Node: group_id63277
-Node: groups_remote_id63484
-Node: groups Examples63731
-Node: control64137
-Node: control Syntax64674
-Node: control Statement Definition and Grammar65042
-Node: control Examples65625
-Node: zones66107
-Node: zones Syntax66451
-Node: zones Statement Definition and Grammar67411
-Node: zone_id67843
-Node: file68231
-Node: xfr-in68575
-Node: xfr-out68914
-Node: notify-in69259
-Node: notify-out69507
-Node: update-in69762
-Node: semantic-checks70105
-Node: ixfr-from-differences70524
-Node: disable-any71081
-Node: notify-timeout71468
-Node: notify-retries71813
-Node: zonefile-sync72132
-Node: ixfr-fslimit72842
-Node: zones Example73248
-Node: zones List of zone semantic checks74070
-Node: log75870
-Node: log Syntax76093
-Node: log Statement Definition and Grammar76417
-Node: log_name77127
-Node: category77456
-Node: severity77923
-Node: log_file78665
-Node: log Example78920
-Node: include79303
-Node: include Syntax79772
-Node: include Examples79910
+Node: Top1041
+Node: Introduction4051
+Node: What is Knot DNS4349
+Node: Knot DNS features4867
+Node: Scope of this document5888
+Node: Knot DNS Resource Requirements6150
+Node: Hardware requirements6448
+Node: CPU requirements7088
+Node: Memory requirements7473
+Node: Supported operating system8189
+Node: Knot DNS Installation8657
+Node: Required build environment8964
+Node: Required libraries9588
+Node: Userspace RCU10393
+Node: Installation from the sources11345
+Node: Configuring and generating Makefiles11930
+Node: Compilation13588
+Node: Installation14164
+Node: Installation from packages14671
+Node: Installing Knot DNS packages on Debian15195
+Node: Installing Knot DNS packages on Ubuntu16173
+Node: Adding official PPA repository for Knot DNS17087
+Node: Installing Knot DNS packages on Fedora17715
+Node: Installing Knot DNS from ports on FreeBSD19114
+Node: Knot DNS Configuration19461
+Node: Minimal configuration20032
+Node: Slave configuration22045
+Node: Master configuration24041
+Node: Configuring multiple interfaces25087
+Node: Using DNS UPDATE25572
+Node: Remote control interface27139
+Node: Enabling zone semantic checks28231
+Node: Creating IXFR differences from zone file changes28698
+Node: Using Response Rate Limiting29271
+Node: Running Knot DNS30702
+Node: Running a slave server34320
+Node: Running a master server35616
+Node: Controlling running daemon36597
+Node: Troubleshooting37768
+Node: Submitting a bugreport38176
+Node: Generating backtrace39346
+Node: Debug messages40348
+Node: Enabling debug messages in server41018
+Node: Debug messages Example42578
+Node: Statement Index42777
+Node: Knot DNS Configuration Reference46600
+Node: system46966
+Node: system Syntax47327
+Node: system Statement Definition and Usage48243
+Node: identity48683
+Node: version49214
+Node: nsid49812
+Node: storage50239
+Node: rundir50596
+Node: pidfile50937
+Node: workers51236
+Node: user51621
+Node: max-conn-idle52055
+Node: max-conn-hs52370
+Node: max-conn-reply52731
+Node: transfers52962
+Node: rate-limit53247
+Node: rate-limit-size53989
+Node: rate-limit-slip54660
+Node: max-udp-payload55268
+Node: system Example55486
+Node: keys55843
+Node: keys Syntax56150
+Node: keys Statement Definition and Usage56379
+Node: key_id56585
+Node: Example57547
+Node: interfaces57781
+Node: interfaces Syntax58116
+Node: interfaces Statement Definition and Usage58454
+Node: interface_id58696
+Node: interfaces Examples59060
+Node: remotes59539
+Node: remotes Syntax60138
+Node: remotes Statement Definition and Grammar60577
+Node: remote_id60847
+Node: address61047
+Node: port61266
+Node: key61520
+Node: via61735
+Node: remotes Examples61965
+Node: groups62491
+Node: groups Syntax63181
+Node: groups Statement Definition and Grammar63399
+Node: group_id63657
+Node: groups_remote_id63864
+Node: groups Examples64111
+Node: control64517
+Node: control Syntax65054
+Node: control Statement Definition and Grammar65422
+Node: control Examples66005
+Node: zones66487
+Node: zones Syntax66831
+Node: zones Statement Definition and Grammar67791
+Node: zone_id68223
+Node: file68611
+Node: xfr-in68955
+Node: xfr-out69294
+Node: notify-in69639
+Node: notify-out69887
+Node: update-in70142
+Node: semantic-checks70485
+Node: ixfr-from-differences70904
+Node: disable-any71461
+Node: notify-timeout71848
+Node: notify-retries72193
+Node: zonefile-sync72512
+Node: ixfr-fslimit73222
+Node: zones Example73628
+Node: zones List of zone semantic checks74450
+Node: log76250
+Node: log Syntax76473
+Node: log Statement Definition and Grammar76797
+Node: log_name77507
+Node: category77836
+Node: severity78303
+Node: log_file79045
+Node: log Example79300
+Node: include79683
+Node: include Syntax80152
+Node: include Examples80290

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/doc/mdate-sh b/doc/mdate-sh
index b3719cf..60dc485 100755
--- a/doc/mdate-sh
+++ b/doc/mdate-sh
@@ -3,7 +3,8 @@
scriptversion=2010-08-21.06; # UTC
-# Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010
+# Free Software Foundation, Inc.
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
#
# This program is free software; you can redistribute it and/or modify
@@ -39,7 +40,7 @@ fi
case $1 in
'')
- echo "$0: No file. Try '$0 --help' for more information." 1>&2
+ echo "$0: No file. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
@@ -75,7 +76,7 @@ LC_TIME=C
export LC_TIME
# GNU ls changes its time format in response to the TIME_STYLE
-# variable. Since we cannot assume 'unset' works, revert this
+# variable. Since we cannot assume `unset' works, revert this
# variable to its documented default.
if test "${TIME_STYLE+set}" = set; then
TIME_STYLE=posix-long-iso
@@ -95,14 +96,14 @@ if ls -n /dev/null 1>/dev/null 2>&1; then
ls_command="$ls_command -n"
fi
-# A 'ls -l' line looks as follows on OS/2.
+# A `ls -l' line looks as follows on OS/2.
# drwxrwx--- 0 Aug 11 2001 foo
# This differs from Unix, which adds ownership information.
# drwxrwx--- 2 root root 4096 Aug 11 2001 foo
#
# To find the date, we split the line on spaces and iterate on words
# until we find a month. This cannot work with files whose owner is a
-# user named "Jan", or "Feb", etc. However, it's unlikely that '/'
+# user named `Jan', or `Feb', etc. However, it's unlikely that `/'
# will be owned by a user whose name is a month. So we first look at
# the extended ls output of the root directory to decide how many
# words should be skipped to get the date.
@@ -115,7 +116,7 @@ month=
command=
until test $month
do
- test $# -gt 0 || error "failed parsing '$ls_command /' output"
+ test $# -gt 0 || error "failed parsing \`$ls_command /' output"
shift
# Add another shift to the command.
command="$command shift;"
@@ -135,7 +136,7 @@ do
esac
done
-test -n "$month" || error "failed parsing '$ls_command /' output"
+test -n "$month" || error "failed parsing \`$ls_command /' output"
# Get the extended ls output of the file or directory.
set dummy x`eval "$ls_command \"\\\$save_arg1\""`
diff --git a/doc/reference.texi b/doc/reference.texi
index dd92d89..4b1e46e 100644
--- a/doc/reference.texi
+++ b/doc/reference.texi
@@ -49,6 +49,7 @@ else.
[ @code{rate-limit} @kbd{integer}@code{;} ]
[ @code{rate-limit-size} @kbd{integer}@code{;} ]
[ @code{rate-limit-slip} @kbd{integer}@code{;} ]
+ [ @code{max-udp-payload} @kbd{integer}@code{;} ]
@code{@}}
@end example
@@ -71,6 +72,7 @@ else.
* rate-limit::
* rate-limit-size::
* rate-limit-slip::
+* max-udp-payload::
@end menu
@node identity
@@ -261,6 +263,14 @@ client to reconnect via TCP for at least some degree of service. It is worth not
Default value: @kbd{1}
+@node max-udp-payload
+@subsubsection max-udp-payload
+@vindex max-udp-payload
+
+Maximum EDNS0 UDP payload size.
+
+Default value: @kbd{4096}
+
@node system Example
@subsection system Example
diff --git a/doc/stamp-vti b/doc/stamp-vti
index c0d2fc5..a132eff 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 9 August 2013
-@set UPDATED-MONTH August 2013
-@set EDITION 1.3.1
-@set VERSION 1.3.1
+@set UPDATED 30 September 2013
+@set UPDATED-MONTH September 2013
+@set EDITION 1.3.2
+@set VERSION 1.3.2
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 85f184c..2abda0f 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,11 +3,11 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2013-02-01.11}
+\def\texinfoversion{2012-01-03.09}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -24,14 +24,13 @@
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
-% restriction. This Exception is an additional permission under section 7
-% of the GNU General Public License, version 3 ("GPLv3").
+% restriction. (This has been our intent since Texinfo was invented.)
%
% Please try the latest version of texinfo.tex before submitting bug
% reports; you can get the latest version from:
-% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
-% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
-% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
+% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
+% ftp://tug.org/tex/texinfo.tex
+% (and all CTAN mirrors, see http://www.ctan.org).
% The texinfo.tex in any given distribution could well be out
% of date, so if that's what you're using, please check.
%
@@ -595,7 +594,7 @@
\def\:{\spacefactor=1000 }
% @* forces a line break.
-\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
+\def\*{\hfil\break\hbox{}\ignorespaces}
% @/ allows a line break.
\let\/=\allowbreak
@@ -888,7 +887,7 @@ where each line of input produces a line of output.}
\def\popthisfilestack{\errthisfilestackempty}
\def\errthisfilestackempty{\errmessage{Internal error:
the stack of filenames is empty.}}
-%
+
\def\thisfile{}
% @center line
@@ -896,46 +895,36 @@ where each line of input produces a line of output.}
%
\parseargdef\center{%
\ifhmode
- \let\centersub\centerH
+ \let\next\centerH
\else
- \let\centersub\centerV
+ \let\next\centerV
\fi
- \centersub{\hfil \ignorespaces#1\unskip \hfil}%
- \let\centersub\relax % don't let the definition persist, just in case
+ \next{\hfil \ignorespaces#1\unskip \hfil}%
}
-\def\centerH#1{{%
- \hfil\break
- \advance\hsize by -\leftskip
- \advance\hsize by -\rightskip
- \line{#1}%
- \break
-}}
-%
-\newcount\centerpenalty
-\def\centerV#1{%
- % The idea here is the same as in \startdefun, \cartouche, etc.: if
- % @center is the first thing after a section heading, we need to wipe
- % out the negative parskip inserted by \sectionheading, but still
- % prevent a page break here.
- \centerpenalty = \lastpenalty
- \ifnum\centerpenalty>10000 \vskip\parskip \fi
- \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
- \line{\kern\leftskip #1\kern\rightskip}%
+\def\centerH#1{%
+ {%
+ \hfil\break
+ \advance\hsize by -\leftskip
+ \advance\hsize by -\rightskip
+ \line{#1}%
+ \break
+ }%
}
+\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
% @sp n outputs n lines of vertical space
-%
+
\parseargdef\sp{\vskip #1\baselineskip}
% @comment ...line which is ignored...
% @c is the same as @comment
% @ignore ... @end ignore is another way to write a comment
-%
+
\def\comment{\begingroup \catcode`\^^M=\other%
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
\commentxxx}
{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
-%
+
\let\c=\comment
% @paragraphindent NCHARS
@@ -1118,7 +1107,7 @@ where each line of input produces a line of output.}
% #1 is a control sequence in which to do the replacements,
% which we \xdef.
\def\txiescapepdf#1{%
- \ifx\pdfescapestring\thisisundefined
+ \ifx\pdfescapestring\relax
% No primitive available; should we give a warning or log?
% Many times it won't matter.
\else
@@ -1184,8 +1173,8 @@ output) for that.)}
%
% #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
\def\dopdfimage#1#2#3{%
- \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
- \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+ \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+ \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
%
% pdftex (and the PDF format) support .pdf, .png, .jpg (among
% others). Let's try in that order, PDF first since if
@@ -1223,8 +1212,8 @@ output) for that.)}
\else
\immediate\pdfximage
\fi
- \ifdim \wd0 >0pt width \pdfimagewidth \fi
- \ifdim \wd2 >0pt height \pdfimageheight \fi
+ \ifdim \wd0 >0pt width \imagewidth \fi
+ \ifdim \wd2 >0pt height \imageheight \fi
\ifnum\pdftexversion<13
#1.\pdfimgext
\else
@@ -1368,17 +1357,12 @@ output) for that.)}
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
\ifx\PP\D\let\nextsp\relax
\else\let\nextsp\skipspaces
- \addtokens{\filename}{\PP}%
- \advance\filenamelength by 1
+ \ifx\p\space\else\addtokens{\filename}{\PP}%
+ \advance\filenamelength by 1
+ \fi
\fi
\nextsp}
- \def\getfilename#1{%
- \filenamelength=0
- % If we don't expand the argument now, \skipspaces will get
- % snagged on things like "@value{foo}".
- \edef\temp{#1}%
- \expandafter\skipspaces\temp|\relax
- }
+ \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
\ifnum\pdftexversion < 14
\let \startlink \pdfannotlink
\else
@@ -1475,6 +1459,9 @@ output) for that.)}
\def\ttsl{\setfontstyle{ttsl}}
+% Default leading.
+\newdimen\textleading \textleading = 13.2pt
+
% Set the baselineskip to #1, and the lineskip and strut size
% correspondingly. There is no deep meaning behind these magic numbers
% used as factors; they just match (closely enough) what Knuth defined.
@@ -1486,7 +1473,6 @@ output) for that.)}
% can get a sort of poor man's double spacing by redefining this.
\def\baselinefactor{1}
%
-\newdimen\textleading
\def\setleading#1{%
\dimen0 = #1\relax
\normalbaselineskip = \baselinefactor\dimen0
@@ -1759,24 +1745,18 @@ end
\fi\fi
-% Set the font macro #1 to the font named \fontprefix#2.
+% Set the font macro #1 to the font named #2, adding on the
+% specified font prefix (normally `cm').
% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
-% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
-% Example:
-% #1 = \textrm
-% #2 = \rmshape
-% #3 = 10
-% #4 = \mainmagstep
-% #5 = OT1
-%
+% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
+% empty to omit).
\def\setfont#1#2#3#4#5{%
\font#1=\fontprefix#2#3 scaled #4
\csname cmap#5\endcsname#1%
}
% This is what gets called when #5 of \setfont is empty.
\let\cmap\gobble
-%
-% (end of cmaps)
+% emacs-page end of cmaps
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
@@ -1786,7 +1766,7 @@ end
\fi
% Support font families that don't use the same naming scheme as CM.
\def\rmshape{r}
-\def\rmbshape{bx} % where the normal face is bold
+\def\rmbshape{bx} %where the normal face is bold
\def\bfshape{b}
\def\bxshape{bx}
\def\ttshape{tt}
@@ -1801,7 +1781,8 @@ end
\def\scshape{csc}
\def\scbshape{csc}
-% Definitions for a main text size of 11pt. (The default in Texinfo.)
+% Definitions for a main text size of 11pt. This is the default in
+% Texinfo.
%
\def\definetextfontsizexi{%
% Text fonts (11.2pt, magstep1).
@@ -1926,7 +1907,7 @@ end
\textleading = 13.2pt % line spacing for 11pt CM
\textfonts % reset the current fonts
\rm
-} % end of 11pt text font size definitions, \definetextfontsizexi
+} % end of 11pt text font size definitions
% Definitions to make the main text be 10pt Computer Modern, with
@@ -2058,7 +2039,7 @@ end
\textleading = 12pt % line spacing for 10pt CM
\textfonts % reset the current fonts
\rm
-} % end of 10pt text font size definitions, \definetextfontsizex
+} % end of 10pt text font size definitions
% We provide the user-level command
@@ -2273,6 +2254,8 @@ end
\gdef\markupsetcodequoteleft{\let`\codequoteleft}
\gdef\markupsetcodequoteright{\let'\codequoteright}
+
+\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
}
\let\markupsetuplqcode \markupsetcodequoteleft
@@ -2281,9 +2264,6 @@ end
\let\markupsetuplqexample \markupsetcodequoteleft
\let\markupsetuprqexample \markupsetcodequoteright
%
-\let\markupsetuplqkbd \markupsetcodequoteleft
-\let\markupsetuprqkbd \markupsetcodequoteright
-%
\let\markupsetuplqsamp \markupsetcodequoteleft
\let\markupsetuprqsamp \markupsetcodequoteright
%
@@ -2293,6 +2273,8 @@ end
\let\markupsetuplqverbatim \markupsetcodequoteleft
\let\markupsetuprqverbatim \markupsetcodequoteright
+\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
+
% Allow an option to not use regular directed right quote/apostrophe
% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
% The undirected quote is ugly, so don't make it the default, but it
@@ -2382,7 +2364,8 @@ end
\aftersmartic
}
-% Unconditional use \ttsl, and no ic. @var is set to this for defuns.
+% like \smartslanted except unconditionally uses \ttsl, and no ic.
+% @var is set to this for defun arguments.
\def\ttslanted#1{{\ttsl #1}}
% @cite is like \smartslanted except unconditionally use \sl. We never want
@@ -2447,12 +2430,34 @@ end
% @samp.
\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
-% @indicateurl is \samp, that is, with quotes.
-\let\indicateurl=\samp
+% definition of @key that produces a lozenge. Doesn't adjust to text size.
+%\setfont\keyrm\rmshape{8}{1000}{OT1}
+%\font\keysy=cmsy9
+%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
+% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
+% \vbox{\hrule\kern-0.4pt
+% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
+% \kern-0.4pt\hrule}%
+% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+
+% definition of @key with no lozenge. If the current font is already
+% monospace, don't change it; that way, we respect @kbdinputstyle. But
+% if it isn't monospace, then use \tt.
+%
+\def\key#1{{\setupmarkupstyle{key}%
+ \nohyphenation
+ \ifmonospace\else\tt\fi
+ #1}\null}
+
+% ctrl is no longer a Texinfo command.
+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-% @code (and similar) prints in typewriter, but with spaces the same
-% size as normal in the surrounding text, without hyphenation, etc.
-% This is a subroutine for that.
+% @file, @option are the same as @samp.
+\let\file=\samp
+\let\option=\samp
+
+% @code is a modification of @t,
+% which makes spaces the same size as normal in the surrounding text.
\def\tclose#1{%
{%
% Change normal interword space to be same as for the current font.
@@ -2477,7 +2482,7 @@ end
% We *must* turn on hyphenation at `-' and `_' in @code.
% Otherwise, it is too hard to avoid overfull hboxes
% in the Emacs manual, the Library manual, etc.
-%
+
% Unfortunately, TeX uses one parameter (\hyphenchar) to control
% both hyphenation at - and hyphenation within words.
% We must therefore turn them both off (\tclose does that)
@@ -2496,7 +2501,7 @@ end
\let-\codedash
\let_\codeunder
\else
- \let-\normaldash
+ \let-\realdash
\let_\realunder
\fi
\codex
@@ -2505,7 +2510,7 @@ end
\def\codex #1{\tclose{#1}\endgroup}
-\def\normaldash{-}
+\def\realdash{-}
\def\codedash{-\discretionary{}{}{}}
\def\codeunder{%
% this is all so @math{@code{var_name}+1} can work. In math mode, _
@@ -2520,9 +2525,9 @@ end
}
% An additional complication: the above will allow breaks after, e.g.,
-% each of the four underscores in __typeof__. This is bad.
-% @allowcodebreaks provides a document-level way to turn breaking at -
-% and _ on and off.
+% each of the four underscores in __typeof__. This is undesirable in
+% some manuals, especially if they don't have long identifiers in
+% general. @allowcodebreaks provides a way to control this.
%
\newif\ifallowcodebreaks \allowcodebreakstrue
@@ -2541,13 +2546,6 @@ end
\fi\fi
}
-% For @command, @env, @file, @option quotes seem unnecessary,
-% so use \code rather than \samp.
-\let\command=\code
-\let\env=\code
-\let\file=\code
-\let\option=\code
-
% @uref (abbreviation for `urlref') takes an optional (comma-separated)
% second argument specifying the text to display and an optional third
% arg as text to display instead of (rather than in addition to) the url
@@ -2694,6 +2692,10 @@ end
\let\email=\uref
\fi
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
+
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
% `example' (@kbd uses ttsl only inside of @example and friends),
% or `code' (@kbd uses normal tty font always).
@@ -2717,36 +2719,16 @@ end
% Default is `distinct'.
\kbdinputstyle distinct
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
-
\def\xkey{\key}
-\def\kbdsub#1#2#3\par{%
- \def\one{#1}\def\three{#3}\def\threex{??}%
- \ifx\one\xkey\ifx\threex\three \key{#2}%
- \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
- \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-}
-
-% definition of @key that produces a lozenge. Doesn't adjust to text size.
-%\setfont\keyrm\rmshape{8}{1000}{OT1}
-%\font\keysy=cmsy9
-%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-% \vbox{\hrule\kern-0.4pt
-% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-% \kern-0.4pt\hrule}%
-% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
+\ifx\one\xkey\ifx\threex\three \key{#2}%
+\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
-% definition of @key with no lozenge. If the current font is already
-% monospace, don't change it; that way, we respect @kbdinputstyle. But
-% if it isn't monospace, then use \tt.
-%
-\def\key#1{{\setupmarkupstyle{key}%
- \nohyphenation
- \ifmonospace\else\tt\fi
- #1}\null}
+% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
+\let\indicateurl=\code
+\let\env=\code
+\let\command=\code
% @clicksequence{File @click{} Open ...}
\def\clicksequence#1{\begingroup #1\endgroup}
@@ -2854,17 +2836,14 @@ end
}
}
-% ctrl is no longer a Texinfo command, but leave this definition for fun.
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
% except specified as a normal braced arg, so no newlines to worry about.
%
\def\outfmtnametex{tex}
%
-\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
-\long\def\doinlinefmt#1,#2,\finish{%
+\def\inlinefmt#1{\doinlinefmt #1,\finish}
+\def\doinlinefmt#1,#2,\finish{%
\def\inlinefmtname{#1}%
\ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
}
@@ -2876,8 +2855,8 @@ end
% well use a command to get a left brace too. We could re-use the
% delimiter character idea from \verb, but it seems like overkill.
%
-\long\def\inlineraw{\tex \doinlineraw}
-\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
+\def\inlineraw{\tex \doinlineraw}
+\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
\def\doinlinerawtwo#1,#2,\finish{%
\def\inlinerawname{#1}%
\ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
@@ -3147,17 +3126,12 @@ end
% hopefully nobody will notice/care.
\edef\ecsize{\csname\curfontsize ecsize\endcsname}%
\edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
- \ifmonospace
- % typewriter:
- \font\thisecfont = ectt\ecsize \space at \nominalsize
+ \ifx\curfontstyle\bfstylename
+ % bold:
+ \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
\else
- \ifx\curfontstyle\bfstylename
- % bold:
- \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
- \else
- % regular:
- \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
- \fi
+ % regular:
+ \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
\fi
\thisecfont
}
@@ -3270,20 +3244,6 @@ end
\finishedtitlepagetrue
}
-% Settings used for typesetting titles: no hyphenation, no indentation,
-% don't worry much about spacing, ragged right. This should be used
-% inside a \vbox, and fonts need to be set appropriately first. Because
-% it is always used for titles, nothing else, we call \rmisbold. \par
-% should be specified before the end of the \vbox, since a vbox is a group.
-%
-\def\raggedtitlesettings{%
- \rmisbold
- \hyphenpenalty=10000
- \parindent=0pt
- \tolerance=5000
- \ptexraggedright
-}
-
% Macros to be used within @titlepage:
\let\subtitlerm=\tenrm
@@ -3291,7 +3251,7 @@ end
\parseargdef\title{%
\checkenv\titlepage
- \vbox{\titlefonts \raggedtitlesettings #1\par}%
+ \leftline{\titlefonts\rmisbold #1}
% print a rule at the page bottom also.
\finishedtitlepagefalse
\vskip4pt \hrule height 4pt width \hsize \vskip4pt
@@ -4188,7 +4148,7 @@ end
% ..., but we might end up with active ones in the argument if
% we're called from @code, as @code{@value{foo-bar_}}, though.
% So \let them to their normal equivalents.
- \let-\normaldash \let_\normalunderscore
+ \let-\realdash \let_\normalunderscore
}
}
@@ -4228,7 +4188,7 @@ end
}
\def\ifsetfail{\doignore{ifset}}
-% @ifclear VAR ... @end executes the `...' iff VAR has never been
+% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
% defined with @set, or has been undefined with @clear.
%
% The `\else' inside the `\doifset' parameter is a trick to reuse the
@@ -4239,35 +4199,6 @@ end
\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
\def\ifclearfail{\doignore{ifclear}}
-% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
-% without the @) is in fact defined. We can only feasibly check at the
-% TeX level, so something like `mathcode' is going to considered
-% defined even though it is not a Texinfo command.
-%
-\makecond{ifcommanddefined}
-\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
-%
-\def\doifcmddefined#1#2{{%
- \makevalueexpandable
- \let\next=\empty
- \expandafter\ifx\csname #2\endcsname\relax
- #1% If not defined, \let\next as above.
- \fi
- \expandafter
- }\next
-}
-\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
-
-% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
-\makecond{ifcommandnotdefined}
-\def\ifcommandnotdefined{%
- \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
-\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
-
-% Set the `txicommandconditionals' variable, so documents have a way to
-% test if the @ifcommand...defined conditionals are available.
-\set txicommandconditionals
-
% @dircategory CATEGORY -- specify a category of the dir file
% which this file should belong to. Ignore this in TeX.
\let\dircategory=\comment
@@ -4504,7 +4435,6 @@ end
\definedummyword\guillemetright
\definedummyword\guilsinglleft
\definedummyword\guilsinglright
- \definedummyword\lbracechar
\definedummyword\leq
\definedummyword\minus
\definedummyword\ogonek
@@ -4517,7 +4447,6 @@ end
\definedummyword\quoteleft
\definedummyword\quoteright
\definedummyword\quotesinglbase
- \definedummyword\rbracechar
\definedummyword\result
\definedummyword\textdegree
%
@@ -4569,7 +4498,6 @@ end
\definedummyword\t
%
% Commands that take arguments.
- \definedummyword\abbr
\definedummyword\acronym
\definedummyword\anchor
\definedummyword\cite
@@ -4581,9 +4509,7 @@ end
\definedummyword\emph
\definedummyword\env
\definedummyword\file
- \definedummyword\image
\definedummyword\indicateurl
- \definedummyword\inforef
\definedummyword\kbd
\definedummyword\key
\definedummyword\math
@@ -4630,10 +4556,7 @@ end
% content at all. So for index sorting, we map @{ and @} to strings
% starting with |, since that ASCII character is between ASCII { and }.
\def\{{|a}%
- \def\lbracechar{|a}%
- %
\def\}{|b}%
- \def\rbracechar{|b}%
%
% Non-English letters.
\def\AA{AA}%
@@ -4809,9 +4732,10 @@ end
%
% ..., ready, GO:
%
-\def\safewhatsit#1{\ifhmode
+\def\safewhatsit#1{%
+\ifhmode
#1%
- \else
+\else
% \lastskip and \lastpenalty cannot both be nonzero simultaneously.
\whatsitskip = \lastskip
\edef\lastskipmacro{\the\lastskip}%
@@ -4835,6 +4759,7 @@ end
% to re-insert the same penalty (values >10000 are used for various
% signals); since we just inserted a non-discardable item, any
% following glue (such as a \parskip) would be a breakpoint. For example:
+ %
% @deffn deffn-whatever
% @vindex index-whatever
% Description.
@@ -4847,7 +4772,8 @@ end
% (the whatsit from the \write), so we must insert a \nobreak.
\nobreak\vskip\whatsitskip
\fi
-\fi}
+\fi
+}
% The index entry written in the file actually looks like
% \entry {sortstring}{page}{topic}
@@ -5594,6 +5520,14 @@ end
% Define @majorheading, @heading and @subheading
+% NOTE on use of \vbox for chapter headings, section headings, and such:
+% 1) We use \vbox rather than the earlier \line to permit
+% overlong headings to fold.
+% 2) \hyphenpenalty is set to 10000 because hyphenation in a
+% heading is obnoxious; this forbids it.
+% 3) Likewise, headings look best if no \parindent is used, and
+% if justification is not attempted. Hence \raggedright.
+
\def\majorheading{%
{\advance\chapheadingskip by 10pt \chapbreak }%
\parsearg\chapheadingzzz
@@ -5601,8 +5535,10 @@ end
\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
\def\chapheadingzzz#1{%
- \vbox{\chapfonts \raggedtitlesettings #1\par}%
- \nobreak\bigskip \nobreak
+ {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+ \parindent=0pt\ptexraggedright
+ \rmisbold #1\hfill}}%
+ \bigskip \par\penalty 200\relax
\suppressfirstparagraphindent
}
@@ -5761,7 +5697,8 @@ end
%
% Typeset the actual heading.
\nobreak % Avoid page breaks at the interline glue.
- \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe
+ \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
+ \hangindent=\wd0 \centerparametersmaybe
\unhbox0 #1\par}%
}%
\nobreak\bigskip % no page break after a chapter title
@@ -5783,18 +5720,18 @@ end
\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
%
\def\unnchfopen #1{%
- \chapoddpage
- \vbox{\chapfonts \raggedtitlesettings #1\par}%
- \nobreak\bigskip\nobreak
+\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+ \parindent=0pt\ptexraggedright
+ \rmisbold #1\hfill}}\bigskip \par\nobreak
}
\def\chfopen #1#2{\chapoddpage {\chapfonts
\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
\par\penalty 5000 %
}
\def\centerchfopen #1{%
- \chapoddpage
- \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
- \nobreak\bigskip \nobreak
+\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+ \parindent=0pt
+ \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak
}
\def\CHAPFopen{%
\global\let\chapmacro=\chfopen
@@ -5939,15 +5876,14 @@ end
%
% We'll almost certainly start a paragraph next, so don't let that
% glue accumulate. (Not a breakpoint because it's preceded by a
- % discardable item.) However, when a paragraph is not started next
- % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
- % or the negative glue will cause weirdly wrong output, typically
- % obscuring the section heading with something else.
+ % discardable item.)
\vskip-\parskip
%
- % This is so the last item on the main vertical list is a known
- % \penalty > 10000, so \startdefun, etc., can recognize the situation
- % and do the needful.
+ % This is purely so the last item on the list is a known \penalty >
+ % 10000. This is so \startdefun can avoid allowing breakpoints after
+ % section headings. Otherwise, it would insert a valid breakpoint between:
+ % @section sec-whatever
+ % @deffn def-whatever
\penalty 10001
}
@@ -6367,7 +6303,7 @@ end
% If this cartouche directly follows a sectioning command, we need the
% \parskip glue (backspaced over by default) or the cartouche can
% collide with the section heading.
- \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
+ \ifnum\lastpenalty>10000 \vskip\parskip \fi
%
\vbox\bgroup
\baselineskip=0pt\parskip=0pt\lineskip=0pt
@@ -6560,9 +6496,16 @@ end
\makedispenvdef{quotation}{\quotationstart}
%
\def\quotationstart{%
- \indentedblockstart % same as \indentedblock, but increase right margin too.
+ {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+ \parindent=0pt
+ %
+ % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
\ifx\nonarrowing\relax
+ \advance\leftskip by \lispnarrowing
\advance\rightskip by \lispnarrowing
+ \exdentamount = \lispnarrowing
+ \else
+ \let\nonarrowing = \relax
\fi
\parsearg\quotationlabel
}
@@ -6588,32 +6531,6 @@ end
\fi
}
-% @indentedblock is like @quotation, but indents only on the left and
-% has no optional argument.
-%
-\makedispenvdef{indentedblock}{\indentedblockstart}
-%
-\def\indentedblockstart{%
- {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
- \parindent=0pt
- %
- % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
- \ifx\nonarrowing\relax
- \advance\leftskip by \lispnarrowing
- \exdentamount = \lispnarrowing
- \else
- \let\nonarrowing = \relax
- \fi
-}
-
-% Keep a nonzero parskip for the environment, since we're doing normal filling.
-%
-\def\Eindentedblock{%
- \par
- {\parskip=0pt \afterenvbreak}%
-}
-\def\Esmallindentedblock{\Eindentedblock}
-
% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
% If we want to allow any <char> as delimiter,
@@ -7092,10 +7009,7 @@ end
\df \sl \hyphenchar\font=0
%
% On the other hand, if an argument has two dashes (for instance), we
- % want a way to get ttsl. We used to recommend @var for that, so
- % leave the code in, but it's strange for @var to lead to typewriter.
- % Nowadays we recommend @code, since the difference between a ttsl hyphen
- % and a tt hyphen is pretty tiny. @code also disables ?` !`.
+ % want a way to get ttsl. Let's try @var for that.
\def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
#1%
\sl\hyphenchar\font=45
@@ -7879,7 +7793,7 @@ end
\fi\fi
}
-%
+
% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
% the node name, #2 the name of the Info cross-reference, #3 the printed
% node name, #4 the name of the Info file, #5 the name of the printed
@@ -7888,41 +7802,26 @@ end
\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
\def\ref#1{\xrefX[#1,,,,,,,]}
-%
-\newbox\toprefbox
-\newbox\printedrefnamebox
-\newbox\infofilenamebox
-\newbox\printedmanualbox
-%
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
\unsepspaces
- %
- % Get args without leading/trailing spaces.
- \def\printedrefname{\ignorespaces #3}%
- \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
- %
- \def\infofilename{\ignorespaces #4}%
- \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
- %
\def\printedmanual{\ignorespaces #5}%
- \setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
- %
- % If the printed reference name (arg #3) was not explicitly given in
- % the @xref, figure out what we want to use.
- \ifdim \wd\printedrefnamebox = 0pt
+ \def\printedrefname{\ignorespaces #3}%
+ \setbox1=\hbox{\printedmanual\unskip}%
+ \setbox0=\hbox{\printedrefname\unskip}%
+ \ifdim \wd0 = 0pt
% No printed node name was explicitly given.
\expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
- % Not auto section-title: use node name inside the square brackets.
+ % Use the node name inside the square brackets.
\def\printedrefname{\ignorespaces #1}%
\else
- % Auto section-title: use chapter/section title inside
- % the square brackets if we have it.
- \ifdim \wd\printedmanualbox > 0pt
- % It is in another manual, so we don't have it; use node name.
+ % Use the actual chapter/section title appear inside
+ % the square brackets. Use the real section title if we have it.
+ \ifdim \wd1 > 0pt
+ % It is in another manual, so we don't have it.
\def\printedrefname{\ignorespaces #1}%
\else
\ifhavexrefs
- % We (should) know the real title if we have the xref values.
+ % We know the real title if we have the xref values.
\def\printedrefname{\refx{#1-title}{}}%
\else
% Otherwise just copy the Info node name.
@@ -7936,20 +7835,12 @@ end
\ifpdf
{\indexnofonts
\turnoffactive
- \makevalueexpandable
% This expands tokens, so do it after making catcode changes, so _
- % etc. don't get their TeX definitions. This ignores all spaces in
- % #4, including (wrongly) those in the middle of the filename.
+ % etc. don't get their TeX definitions.
\getfilename{#4}%
%
- % This (wrongly) does not take account of leading or trailing
- % spaces in #1, which should be ignored.
\edef\pdfxrefdest{#1}%
- \ifx\pdfxrefdest\empty
- \def\pdfxrefdest{Top}% no empty targets
- \else
- \txiescapepdf\pdfxrefdest % escape PDF special chars
- \fi
+ \txiescapepdf\pdfxrefdest
%
\leavevmode
\startlink attr{/Border [0 0 0]}%
@@ -7976,42 +7867,29 @@ end
\iffloat\Xthisreftitle
% If the user specified the print name (third arg) to the ref,
% print it instead of our usual "Figure 1.2".
- \ifdim\wd\printedrefnamebox = 0pt
+ \ifdim\wd0 = 0pt
\refx{#1-snt}{}%
\else
\printedrefname
\fi
%
- % If the user also gave the printed manual name (fifth arg), append
+ % if the user also gave the printed manual name (fifth arg), append
% "in MANUALNAME".
- \ifdim \wd\printedmanualbox > 0pt
+ \ifdim \wd1 > 0pt
\space \putwordin{} \cite{\printedmanual}%
\fi
\else
% node/anchor (non-float) references.
- %
- % If we use \unhbox to print the node names, TeX does not insert
- % empty discretionaries after hyphens, which means that it will not
- % find a line break at a hyphen in a node names. Since some manuals
- % are best written with fairly long node names, containing hyphens,
- % this is a loss. Therefore, we give the text of the node name
- % again, so it is as if TeX is seeing it for the first time.
- %
- \ifdim \wd\printedmanualbox > 0pt
- % Cross-manual reference with a printed manual name.
- %
- \crossmanualxref{\cite{\printedmanual\unskip}}%
- %
- \else\ifdim \wd\infofilenamebox > 0pt
- % Cross-manual reference with only an info filename (arg 4), no
- % printed manual name (arg 5). This is essentially the same as
- % the case above; we output the filename, since we have nothing else.
- %
- \crossmanualxref{\code{\infofilename\unskip}}%
%
+ % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
+ % insert empty discretionaries after hyphens, which means that it will
+ % not find a line break at a hyphen in a node names. Since some manuals
+ % are best written with fairly long node names, containing hyphens, this
+ % is a loss. Therefore, we give the text of the node name again, so it
+ % is as if TeX is seeing it for the first time.
+ \ifdim \wd1 > 0pt
+ \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
\else
- % Reference within this manual.
- %
% _ (for example) has to be the character _ for the purposes of the
% control sequence corresponding to the node, but it has to expand
% into the usual \leavevmode...\vrule stuff for purposes of
@@ -8023,7 +7901,7 @@ end
\setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
\ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
}%
- % output the `[mynode]' via the macro below so it can be overridden.
+ % output the `[mynode]' via a macro so it can be overridden.
\xrefprintnodename\printedrefname
%
% But we always want a comma and a space:
@@ -8031,37 +7909,11 @@ end
%
% output the `page 3'.
\turnoffactive \putwordpage\tie\refx{#1-pg}{}%
- \fi\fi
+ \fi
\fi
\endlink
\endgroup}
-% Output a cross-manual xref to #1. Used just above (twice).
-%
-% Only include the text "Section ``foo'' in" if the foo is neither
-% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply
-% "see The Foo Manual", the idea being to refer to the whole manual.
-%
-% But, this being TeX, we can't easily compare our node name against the
-% string "Top" while ignoring the possible spaces before and after in
-% the input. By adding the arbitrary 7sp below, we make it much less
-% likely that a real node name would have the same width as "Top" (e.g.,
-% in a monospaced font). Hopefully it will never happen in practice.
-%
-% For the same basic reason, we retypeset the "Top" at every
-% reference, since the current font is indeterminate.
-%
-\def\crossmanualxref#1{%
- \setbox\toprefbox = \hbox{Top\kern7sp}%
- \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
- \ifdim \wd2 > 7sp % nonempty?
- \ifdim \wd2 = \wd\toprefbox \else % same as Top?
- \putwordSection{} ``\printedrefname'' \putwordin{}\space
- \fi
- \fi
- #1%
-}
-
% This macro is called from \xrefX for the `[nodename]' part of xref
% output. It's a separate macro only so it can be changed more easily,
% since square brackets don't work well in some documents. Particularly
@@ -8429,7 +8281,7 @@ end
it from ftp://tug.org/tex/epsf.tex.}
%
\def\image#1{%
- \ifx\epsfbox\thisisundefined
+ \ifx\epsfbox\thisiundefined
\ifwarnednoepsf \else
\errhelp = \noepsfhelp
\errmessage{epsf.tex not found, images will be ignored}%
@@ -8453,13 +8305,6 @@ end
% If the image is by itself, center it.
\ifvmode
\imagevmodetrue
- \else \ifx\centersub\centerV
- % for @center @image, we need a vbox so we can have our vertical space
- \imagevmodetrue
- \vbox\bgroup % vbox has better behavior than vtop herev
- \fi\fi
- %
- \ifimagevmode
\nobreak\medskip
% Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space
@@ -8469,13 +8314,9 @@ end
\fi
%
% Leave vertical mode so that indentation from an enclosing
- % environment such as @quotation is respected.
- % However, if we're at the top level, we don't want the
- % normal paragraph indentation.
- % On the other hand, if we are in the case of @center @image, we don't
- % want to start a paragraph, which will create a hsize-width box and
- % eradicate the centering.
- \ifx\centersub\centerV\else \noindent \fi
+ % environment such as @quotation is respected. On the other hand, if
+ % it's at the top level, we don't want the normal paragraph indentation.
+ \noindent
%
% Output the image.
\ifpdf
@@ -8487,10 +8328,7 @@ end
\epsfbox{#1.eps}%
\fi
%
- \ifimagevmode
- \medskip % space after a standalone image
- \fi
- \ifx\centersub\centerV \egroup \fi
+ \ifimagevmode \medskip \fi % space after the standalone image
\endgroup}
@@ -9993,26 +9831,22 @@ directory should work if nowhere else does.}
@gdef@otherbackslash{@let\=@realbackslash}
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'. Also revert - to its normal character, in
-% case the active - from code has slipped in.
-%
-{@catcode`- = @active
- @gdef@normalturnoffactive{%
- @let-=@normaldash
- @let"=@normaldoublequote
- @let$=@normaldollar %$ font-lock fix
- @let+=@normalplus
- @let<=@normalless
- @let>=@normalgreater
- @let\=@normalbackslash
- @let^=@normalcaret
- @let_=@normalunderscore
- @let|=@normalverticalbar
- @let~=@normaltilde
- @markupsetuplqdefault
- @markupsetuprqdefault
- @unsepspaces
- }
+% the literal character `\'.
+%
+@def@normalturnoffactive{%
+ @let"=@normaldoublequote
+ @let$=@normaldollar %$ font-lock fix
+ @let+=@normalplus
+ @let<=@normalless
+ @let>=@normalgreater
+ @let\=@normalbackslash
+ @let^=@normalcaret
+ @let_=@normalunderscore
+ @let|=@normalverticalbar
+ @let~=@normaltilde
+ @markupsetuplqdefault
+ @markupsetuprqdefault
+ @unsepspaces
}
% Make _ and + \other characters, temporarily.
diff --git a/doc/version.texi b/doc/version.texi
index c0d2fc5..a132eff 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 9 August 2013
-@set UPDATED-MONTH August 2013
-@set EDITION 1.3.1
-@set VERSION 1.3.1
+@set UPDATED 30 September 2013
+@set UPDATED-MONTH September 2013
+@set EDITION 1.3.2
+@set VERSION 1.3.2
diff --git a/install-sh b/install-sh
index 377bb86..a9244eb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-11-20.07; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
+ # Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for 'test' and other utilities.
+ # Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call 'install-sh -d' without argument.
+ # It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
@@ -240,7 +240,7 @@ fi
for src
do
- # Protect names problematic for 'test' and other utilities.
+ # Protect names problematic for `test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
@@ -354,7 +354,7 @@ do
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.
+ # other-writeable 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
diff --git a/ltmain.sh b/ltmain.sh
index 16ddbf8..c2852d8 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
TIMESTAMP=""
package_revision=1.3337
@@ -1375,21 +1375,6 @@ func_replace_sysroot ()
func_infer_tag ()
{
$opt_debug
-
- # FreeBSD-specific: where we install compilers with non-standard names
- tag_compilers_CC="*cc cc* *gcc gcc* clang"
- tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
- base_compiler=`set -- "$@"; echo $1`
-
- # If $tagname isn't set, then try to infer if the default "CC" tag applies
- if test -z "$tagname"; then
- for zp in $tag_compilers_CC; do
- case $base_compiler in
- $zp) tagname="CC"; break;;
- esac
- done
- fi
-
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1426,22 +1411,7 @@ func_infer_tag ()
break
;;
esac
-
- # FreeBSD-specific: try compilers based on inferred tag
- if test -z "$tagname"; then
- eval "tag_compilers=\$tag_compilers_${z}"
- if test -n "$tag_compilers"; then
- for zp in $tag_compilers; do
- case $base_compiler in
- $zp) tagname=$z; break;;
- esac
- done
- if test -n "$tagname"; then
- break
- fi
- fi
- fi
- fi
+ fi
done
# If $tagname still isn't set, then no tagged configuration
# was found and let the user know that the "--tag" command
@@ -3547,9 +3517,6 @@ static const void *lt_preloaded_setup() {
;;
esac
;;
- *-*-freebsd*)
- # FreeBSD doesn't need this...
- ;;
*)
func_fatal_error "unknown suffix for \`$my_dlsyms'"
;;
@@ -5628,7 +5595,6 @@ func_mode_link ()
esac
;;
esac
- deplibs="$deplibs $arg"
continue
;;
@@ -6158,7 +6124,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6201,30 +6170,13 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- fi
-
- case $linkmode in
- lib)
- deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
- newdependency_libs="$deplib $newdependency_libs"
- ;;
- prog)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
- if test "$pass" = scan; then
- deplibs="$deplib $deplibs"
- else
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
+ esac
fi
- ;;
- *)
- ;;
- esac # linkmode
-
+ fi
continue
;;
-l*)
@@ -6495,19 +6447,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -7400,6 +7352,9 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 44e0ecf..828104c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2684,6 +2684,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3289,7 +3301,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4101,7 +4113,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4578,6 +4590,9 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4640,6 +4655,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4861,7 +4879,7 @@ _LT_EOF
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5038,6 +5056,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5342,7 +5361,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
diff --git a/man/Makefile.in b/man/Makefile.in
index 462578e..ce411ee 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in 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.
@@ -14,51 +15,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -78,10 +34,10 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = man
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/khost.1.in $(srcdir)/knotc.8.in $(srcdir)/knotd.8.in \
- $(srcdir)/kdig.1.in $(srcdir)/knsupdate.1.in \
- $(srcdir)/knot.conf.5.in $(dist_man_MANS)
+DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/kdig.1.in $(srcdir)/khost.1.in \
+ $(srcdir)/knot.conf.5.in $(srcdir)/knotc.8.in \
+ $(srcdir)/knotd.8.in $(srcdir)/knsupdate.1.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -95,25 +51,14 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = khost.1 knotc.8 knotd.8 kdig.1 knsupdate.1 \
knot.conf.5
CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
+am__v_GEN_0 = @echo " GEN " $@;
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
-am__v_at_1 =
SOURCES =
DIST_SOURCES =
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -148,7 +93,6 @@ man5dir = $(mandir)/man5
man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(dist_man_MANS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -339,18 +283,11 @@ clean-libtool:
-rm -rf .libs _libs
install-man1: $(dist_man_MANS)
@$(NORMAL_INSTALL)
- @list1=''; \
- list2='$(dist_man_MANS)'; \
- test -n "$(man1dir)" \
- && test -n "`echo $$list1$$list2`" \
- || exit 0; \
- echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
- { for i in $$list1; do echo "$$i"; done; \
- if test -n "$$list2"; then \
- for i in $$list2; do echo "$$i"; done \
- | sed -n '/\.1[a-z]*$$/p'; \
- fi; \
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list=''; test -n "$(man1dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.1[a-z]*$$/p'; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -382,18 +319,11 @@ uninstall-man1:
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-man5: $(dist_man_MANS)
@$(NORMAL_INSTALL)
- @list1=''; \
- list2='$(dist_man_MANS)'; \
- test -n "$(man5dir)" \
- && test -n "`echo $$list1$$list2`" \
- || exit 0; \
- echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
- { for i in $$list1; do echo "$$i"; done; \
- if test -n "$$list2"; then \
- for i in $$list2; do echo "$$i"; done \
- | sed -n '/\.5[a-z]*$$/p'; \
- fi; \
+ test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+ @list=''; test -n "$(man5dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.5[a-z]*$$/p'; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -425,18 +355,11 @@ uninstall-man5:
dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
install-man8: $(dist_man_MANS)
@$(NORMAL_INSTALL)
- @list1=''; \
- list2='$(dist_man_MANS)'; \
- test -n "$(man8dir)" \
- && test -n "`echo $$list1$$list2`" \
- || exit 0; \
- echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
- { for i in $$list1; do echo "$$i"; done; \
- if test -n "$$list2"; then \
- for i in $$list2; do echo "$$i"; done \
- | sed -n '/\.8[a-z]*$$/p'; \
- fi; \
+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+ @list=''; test -n "$(man8dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.8[a-z]*$$/p'; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -466,14 +389,27 @@ uninstall-man8:
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
distdir: $(DISTFILES)
+ @list='$(MANS)'; if test -n "$$list"; then \
+ list=`for p in $$list; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+ if test -n "$$list" && \
+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+ echo " typically \`make maintainer-clean' will remove them" >&2; \
+ exit 1; \
+ else :; fi; \
+ else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -611,18 +547,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- cscopelist-am ctags-am distclean distclean-generic \
- distclean-libtool distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-man1 install-man5 install-man8 install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-man1 \
+ install-man5 install-man8 install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
- uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
- uninstall-man8
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-man uninstall-man1 uninstall-man5 uninstall-man8
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/man/kdig.1 b/man/kdig.1
index 53e6908..13cf287 100644
--- a/man/kdig.1
+++ b/man/kdig.1
@@ -1,4 +1,4 @@
-.TH "kdig" "1" "27 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.1"
+.TH "kdig" "1" "30 September 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.2"
.SH NAME
.TP 5
.B kdig
diff --git a/man/khost.1 b/man/khost.1
index c4ac6c2..604e7cf 100644
--- a/man/khost.1
+++ b/man/khost.1
@@ -1,4 +1,4 @@
-.TH "khost" "1" "27 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.1"
+.TH "khost" "1" "30 September 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.2"
.SH NAME
.TP 6
.B khost
diff --git a/man/knot.conf.5 b/man/knot.conf.5
index f69ab26..f5659b1 100644
--- a/man/knot.conf.5
+++ b/man/knot.conf.5
@@ -1,4 +1,4 @@
-.TH "knot.conf" "5" "27 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.1"
+.TH "knot.conf" "5" "30 September 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.2"
.SH "NAME"
.LP
.B knot.conf
@@ -100,6 +100,9 @@ serves as an example of the configuration for knotc(8) and knotd(8).
# legitimate requests to get a chance to reconnect using TCP
# Default: 1
rate-limit-slip 1;
+
+ # Maximum EDNS0 UDP payload size
+ # max-udp-payload 4096;
}
# Includes can be placed anywhere at any level in the configuration file. The
@@ -193,11 +196,11 @@ serves as an example of the configuration for knotc(8) and knotd(8).
# Section 'control' specifies on which interface to listen for RC commands
control {
- # Specifies interface, syntax is exactly the same as in 'interfaces' section
# Default: $(run_dir)/knot.sock
listen-on "knot.sock";
# As an alternative, you can use an IPv4/v6 address and port
+ # Same syntax as for 'interfaces' items
# listen-on { address 127.0.0.1@5533; }
# Specifies ACL list for remote control
diff --git a/man/knot.conf.5.in b/man/knot.conf.5.in
index e6bffcd..8988746 100644
--- a/man/knot.conf.5.in
+++ b/man/knot.conf.5.in
@@ -100,6 +100,9 @@ serves as an example of the configuration for knotc(8) and knotd(8).
# legitimate requests to get a chance to reconnect using TCP
# Default: 1
rate-limit-slip 1;
+
+ # Maximum EDNS0 UDP payload size
+ # max-udp-payload 4096;
}
# Includes can be placed anywhere at any level in the configuration file. The
@@ -193,11 +196,11 @@ serves as an example of the configuration for knotc(8) and knotd(8).
# Section 'control' specifies on which interface to listen for RC commands
control {
- # Specifies interface, syntax is exactly the same as in 'interfaces' section
# Default: $(run_dir)/knot.sock
listen-on "knot.sock";
# As an alternative, you can use an IPv4/v6 address and port
+ # Same syntax as for 'interfaces' items
# listen-on { address 127.0.0.1@5533; }
# Specifies ACL list for remote control
diff --git a/man/knotc.8 b/man/knotc.8
index 3b3f0cf..7863dbe 100644
--- a/man/knotc.8
+++ b/man/knotc.8
@@ -1,4 +1,4 @@
-.TH knotc "8" "27 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.1"
+.TH knotc "8" "30 September 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.2"
.SH NAME
.B knotc
\- Knot DNS control utility
diff --git a/man/knotd.8 b/man/knotd.8
index 6e95522..4beadc6 100644
--- a/man/knotd.8
+++ b/man/knotd.8
@@ -1,4 +1,4 @@
-.TH "knotd" "8" "27 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.1"
+.TH "knotd" "8" "30 September 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.2"
.SH NAME
.B knotd
\- Knot DNS daemon
diff --git a/man/knsupdate.1 b/man/knsupdate.1
index d304eb4..4a235e3 100644
--- a/man/knsupdate.1
+++ b/man/knsupdate.1
@@ -1,4 +1,4 @@
-.TH "knsupdate" "1" "27 August 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.1"
+.TH "knsupdate" "1" "30 September 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.2"
.SH NAME
.TP 10
.B knsupdate
diff --git a/missing b/missing
index cdea514..86a8fc3 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,11 @@
#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common stub for a few missing GNU programs while installing.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2012-01-06.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# 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
@@ -25,40 +26,68 @@ scriptversion=2012-06-26.16; # UTC
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try '$0 --help' for more information"
+ echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
-case $1 in
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
- --is-lightweight)
- # Used by our autoconf macros to check whether the available missing
- # script is modern enough.
- exit 0
- ;;
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
- --run)
- # Back-compat with the calling convention used by older automake.
- shift
- ;;
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal autoconf autoheader autom4te automake makeinfo
- bison yacc flex lex help2man
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
Send bug reports to <bug-automake@gnu.org>."
exit $?
@@ -70,141 +99,228 @@ Send bug reports to <bug-automake@gnu.org>."
;;
-*)
- echo 1>&2 "$0: unknown '$1' option"
- echo 1>&2 "Try '$0 --help' for more information"
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;
esac
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch. This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
- msg="probably too old"
-elif test $st -eq 127; then
- # Program was missing.
- msg="missing on your system"
-else
- # Program was found and executed, but failed. Give up.
- exit $st
-fi
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
- case $1 in
- aclocal|automake)
- echo "The '$1' program is part of the GNU Automake package:"
- echo "<$gnu_software_URL/automake>"
- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
- echo "<$gnu_software_URL/autoconf>"
- echo "<$gnu_software_URL/m4/>"
- echo "<$perl_URL>"
- ;;
- autoconf|autom4te|autoheader)
- echo "The '$1' program is part of the GNU Autoconf package:"
- echo "<$gnu_software_URL/autoconf/>"
- echo "It also requires GNU m4 and Perl in order to run:"
- echo "<$gnu_software_URL/m4/>"
- echo "<$perl_URL>"
- ;;
- esac
-}
-
-give_advice ()
-{
- # Normalize program name to check for.
- normalized_program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
- printf '%s\n' "'$1' is $msg."
-
- configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
- case $normalized_program in
- autoconf*)
- echo "You should only need it if you modified 'configure.ac',"
- echo "or m4 files included by it."
- program_details 'autoconf'
- ;;
- autoheader*)
- echo "You should only need it if you modified 'acconfig.h' or"
- echo "$configure_deps."
- program_details 'autoheader'
- ;;
- automake*)
- echo "You should only need it if you modified 'Makefile.am' or"
- echo "$configure_deps."
- program_details 'automake'
- ;;
- aclocal*)
- echo "You should only need it if you modified 'acinclude.m4' or"
- echo "$configure_deps."
- program_details 'aclocal'
- ;;
- autom4te*)
- echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
- program_details 'autom4te'
- ;;
- bison*|yacc*)
- echo "You should only need it if you modified a '.y' file."
- echo "You may want to install the GNU Bison package:"
- echo "<$gnu_software_URL/bison/>"
- ;;
- lex*|flex*)
- echo "You should only need it if you modified a '.l' file."
- echo "You may want to install the Fast Lexical Analyzer package:"
- echo "<$flex_URL>"
- ;;
- help2man*)
- echo "You should only need it if you modified a dependency" \
- "of a man page."
- echo "You may want to install the GNU Help2man package:"
- echo "<$gnu_software_URL/help2man/>"
+ autoheader*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
;;
- makeinfo*)
- echo "You should only need it if you modified a '.texi' file, or"
- echo "any other file indirectly affecting the aspect of the manual."
- echo "You might want to install the Texinfo package:"
- echo "<$gnu_software_URL/texinfo/>"
- echo "The spurious makeinfo call might also be the consequence of"
- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
- echo "want to install GNU make:"
- echo "<$gnu_software_URL/make/>"
- ;;
- *)
- echo "You might have modified some files without having the proper"
- echo "tools for further handling them. Check the 'README' file, it"
- echo "often tells you about the needed prerequisites for installing"
- echo "this package. You may also peek at any GNU archive site, in"
- echo "case some other package contains this missing '$1' program."
- ;;
- esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
- -e '2,$s/^/ /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
+
+ automake*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
+ echo 1>&2 "\
+WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex*|flex*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
+ touch $file
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
+
+exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 29bf1b1..5f2daed 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in 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.
@@ -14,51 +15,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -78,7 +34,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = samples
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -91,26 +47,14 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
+am__v_GEN_0 = @echo " GEN " $@;
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
-am__v_at_1 =
SOURCES =
DIST_SOURCES =
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -296,11 +240,11 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
distdir: $(DISTFILES)
@@ -436,17 +380,16 @@ uninstall-am: uninstall-local
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- clean-local cscopelist-am ctags-am distclean distclean-generic \
- distclean-libtool distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-data-local install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
- uninstall-am uninstall-local
+ clean-local distclean distclean-generic distclean-libtool \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-data-local \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-local
knot.sample.conf: knot.sample.conf.in
diff --git a/samples/knot.full.conf b/samples/knot.full.conf
index 80c2902..4450f6c 100644
--- a/samples/knot.full.conf
+++ b/samples/knot.full.conf
@@ -94,6 +94,9 @@ system {
# legitimate requests to get a chance to reconnect using TCP
# Default: 1
rate-limit-slip 1;
+
+ # Maximum EDNS0 UDP payload size
+ # max-udp-payload 4096;
}
# Includes can be placed anywhere at any level in the configuration file. The
diff --git a/src/Makefile.in b/src/Makefile.in
index c8c2bd2..c694983 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in 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.
@@ -16,51 +17,6 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -85,11 +41,10 @@ noinst_PROGRAMS = zscanner-tool$(EXEEXT)
@HAVE_RAGEL_TRUE@am__append_1 = zscanner/scanner.c
@HAVE_RAGEL_TRUE@am__append_2 = zscanner/scanner.c
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in knot/conf/libknotd_la-cf-lex.c \
- knot/conf/libknotd_la-cf-parse.h \
- knot/conf/libknotd_la-cf-parse.c $(top_srcdir)/depcomp \
- $(top_srcdir)/ylwrap
+ knot/conf/libknotd_la-cf-parse.c \
+ knot/conf/libknotd_la-cf-parse.h
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -123,7 +78,6 @@ libknot_la_OBJECTS = $(am_libknot_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
-am__v_lt_1 =
libknotd_la_DEPENDENCIES = libknot.la libknots.la @LIBOBJS@
am_libknotd_la_OBJECTS = knot/stat/gatherer.lo knot/stat/stat.lo \
knot/conf/libknotd_la-cf-lex.lo \
@@ -191,18 +145,6 @@ am_zscanner_tool_OBJECTS = zscanner/test/zscanner-tool.$(OBJEXT) \
zscanner_tool_OBJECTS = $(am_zscanner_tool_OBJECTS)
zscanner_tool_DEPENDENCIES = libknots.la libknot.la libknotd.la \
libzscanner.la @LIBOBJS@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -215,33 +157,33 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
+am__v_CCLD_0 = @echo " CCLD " $@;
LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
AM_V_LEX = $(am__v_LEX_@AM_V@)
am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
-am__v_LEX_0 = @echo " LEX " $@;
-am__v_LEX_1 =
+am__v_LEX_0 = @echo " LEX " $@;
YLWRAP = $(top_srcdir)/ylwrap
-am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
- -e s/c++$$/h++/ -e s/c$$/h/
YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
AM_V_YACC = $(am__v_YACC_@AM_V@)
am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
-am__v_YACC_0 = @echo " YACC " $@;
-am__v_YACC_1 =
+am__v_YACC_0 = @echo " YACC " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(libknot_la_SOURCES) $(libknotd_la_SOURCES) \
$(libknots_la_SOURCES) $(libzscanner_la_SOURCES) \
$(kdig_SOURCES) $(khost_SOURCES) $(knotc_SOURCES) \
@@ -250,45 +192,18 @@ DIST_SOURCES = $(libknot_la_SOURCES) $(libknotd_la_SOURCES) \
$(libknots_la_SOURCES) $(libzscanner_la_SOURCES) \
$(kdig_SOURCES) $(khost_SOURCES) $(knotc_SOURCES) \
$(knotd_SOURCES) $(knsupdate_SOURCES) $(zscanner_tool_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
- install-exec-recursive install-html-recursive \
- install-info-recursive install-pdf-recursive \
- install-ps-recursive install-recursive installcheck-recursive \
- installdirs-recursive pdf-recursive ps-recursive \
- tags-recursive uninstall-recursive
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
- $(RECURSIVE_TARGETS) \
- $(RECURSIVE_CLEAN_TARGETS) \
- $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -779,8 +694,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @test -f $@ || rm -f stamp-h1
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -795,14 +710,12 @@ distclean-hdr:
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
libknot/$(am__dirstamp):
@$(MKDIR_P) libknot
@: > libknot/$(am__dirstamp)
@@ -905,7 +818,6 @@ libknot/sign/dnssec.lo: libknot/sign/$(am__dirstamp) \
libknot/sign/$(DEPDIR)/$(am__dirstamp)
libknot/sign/sig0.lo: libknot/sign/$(am__dirstamp) \
libknot/sign/$(DEPDIR)/$(am__dirstamp)
-
libknot.la: $(libknot_la_OBJECTS) $(libknot_la_DEPENDENCIES) $(EXTRA_libknot_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libknot_la_OBJECTS) $(libknot_la_LIBADD) $(LIBS)
knot/stat/$(am__dirstamp):
@@ -989,7 +901,6 @@ knot/zone/zone-load.lo: knot/zone/$(am__dirstamp) \
knot/zone/$(DEPDIR)/$(am__dirstamp)
knot/zone/estimator.lo: knot/zone/$(am__dirstamp) \
knot/zone/$(DEPDIR)/$(am__dirstamp)
-
libknotd.la: $(libknotd_la_OBJECTS) $(libknotd_la_DEPENDENCIES) $(EXTRA_libknotd_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libknotd_la_OBJECTS) $(libknotd_la_LIBADD) $(LIBS)
common/slab/$(am__dirstamp):
@@ -1063,7 +974,6 @@ common/hattrie/hat-trie.lo: common/hattrie/$(am__dirstamp) \
common/hattrie/$(DEPDIR)/$(am__dirstamp)
common/hattrie/murmurhash3.lo: common/hattrie/$(am__dirstamp) \
common/hattrie/$(DEPDIR)/$(am__dirstamp)
-
libknots.la: $(libknots_la_OBJECTS) $(libknots_la_DEPENDENCIES) $(EXTRA_libknots_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libknots_la_OBJECTS) $(libknots_la_LIBADD) $(LIBS)
zscanner/$(am__dirstamp):
@@ -1078,24 +988,18 @@ zscanner/scanner.lo: zscanner/$(am__dirstamp) \
zscanner/$(DEPDIR)/$(am__dirstamp)
zscanner/scanner_functions.lo: zscanner/$(am__dirstamp) \
zscanner/$(DEPDIR)/$(am__dirstamp)
-
libzscanner.la: $(libzscanner_la_OBJECTS) $(libzscanner_la_DEPENDENCIES) $(EXTRA_libzscanner_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libzscanner_la_OBJECTS) $(libzscanner_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
- fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p \
- || test -f $$p1 \
- ; then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' \
- -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -1116,8 +1020,7 @@ uninstall-binPROGRAMS:
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
- `; \
+ -e 's/$$/$(EXEEXT)/' `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -1157,19 +1060,14 @@ clean-noinstPROGRAMS:
rm -f $$list
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
- fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p \
- || test -f $$p1 \
- ; then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' \
- -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -1190,8 +1088,7 @@ uninstall-sbinPROGRAMS:
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
- `; \
+ -e 's/$$/$(EXEEXT)/' `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(sbindir)" && rm -f $$files
@@ -1250,7 +1147,6 @@ utils/dig/dig_params.$(OBJEXT): utils/dig/$(am__dirstamp) \
utils/dig/$(DEPDIR)/$(am__dirstamp)
utils/dig/dig_exec.$(OBJEXT): utils/dig/$(am__dirstamp) \
utils/dig/$(DEPDIR)/$(am__dirstamp)
-
kdig$(EXEEXT): $(kdig_OBJECTS) $(kdig_DEPENDENCIES) $(EXTRA_kdig_DEPENDENCIES)
@rm -f kdig$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(kdig_OBJECTS) $(kdig_LDADD) $(LIBS)
@@ -1264,13 +1160,11 @@ utils/host/host_main.$(OBJEXT): utils/host/$(am__dirstamp) \
utils/host/$(DEPDIR)/$(am__dirstamp)
utils/host/host_params.$(OBJEXT): utils/host/$(am__dirstamp) \
utils/host/$(DEPDIR)/$(am__dirstamp)
-
khost$(EXEEXT): $(khost_OBJECTS) $(khost_DEPENDENCIES) $(EXTRA_khost_DEPENDENCIES)
@rm -f khost$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(khost_OBJECTS) $(khost_LDADD) $(LIBS)
knot/ctl/knotc_main.$(OBJEXT): knot/ctl/$(am__dirstamp) \
knot/ctl/$(DEPDIR)/$(am__dirstamp)
-
knotc$(EXEEXT): $(knotc_OBJECTS) $(knotc_DEPENDENCIES) $(EXTRA_knotc_DEPENDENCIES)
@rm -f knotc$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(knotc_OBJECTS) $(knotc_LDADD) $(LIBS)
@@ -1282,7 +1176,6 @@ knot/$(DEPDIR)/$(am__dirstamp):
@: > knot/$(DEPDIR)/$(am__dirstamp)
knot/main.$(OBJEXT): knot/$(am__dirstamp) \
knot/$(DEPDIR)/$(am__dirstamp)
-
knotd$(EXEEXT): $(knotd_OBJECTS) $(knotd_DEPENDENCIES) $(EXTRA_knotd_DEPENDENCIES)
@rm -f knotd$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(knotd_OBJECTS) $(knotd_LDADD) $(LIBS)
@@ -1301,7 +1194,6 @@ utils/nsupdate/nsupdate_params.$(OBJEXT): \
utils/nsupdate/nsupdate_exec.$(OBJEXT): \
utils/nsupdate/$(am__dirstamp) \
utils/nsupdate/$(DEPDIR)/$(am__dirstamp)
-
knsupdate$(EXEEXT): $(knsupdate_OBJECTS) $(knsupdate_DEPENDENCIES) $(EXTRA_knsupdate_DEPENDENCIES)
@rm -f knsupdate$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(knsupdate_OBJECTS) $(knsupdate_LDADD) $(LIBS)
@@ -1317,53 +1209,195 @@ zscanner/test/tests.$(OBJEXT): zscanner/test/$(am__dirstamp) \
zscanner/test/$(DEPDIR)/$(am__dirstamp)
zscanner/test/processing.$(OBJEXT): zscanner/test/$(am__dirstamp) \
zscanner/test/$(DEPDIR)/$(am__dirstamp)
-
zscanner-tool$(EXEEXT): $(zscanner_tool_OBJECTS) $(zscanner_tool_DEPENDENCIES) $(EXTRA_zscanner_tool_DEPENDENCIES)
@rm -f zscanner-tool$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(zscanner_tool_OBJECTS) $(zscanner_tool_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f common/*.$(OBJEXT)
- -rm -f common/*.lo
- -rm -f common/hattrie/*.$(OBJEXT)
- -rm -f common/hattrie/*.lo
- -rm -f common/libtap/*.$(OBJEXT)
- -rm -f common/libtap/*.lo
- -rm -f common/slab/*.$(OBJEXT)
- -rm -f common/slab/*.lo
- -rm -f knot/*.$(OBJEXT)
- -rm -f knot/conf/*.$(OBJEXT)
- -rm -f knot/conf/*.lo
- -rm -f knot/ctl/*.$(OBJEXT)
- -rm -f knot/ctl/*.lo
- -rm -f knot/server/*.$(OBJEXT)
- -rm -f knot/server/*.lo
- -rm -f knot/stat/*.$(OBJEXT)
- -rm -f knot/stat/*.lo
- -rm -f knot/zone/*.$(OBJEXT)
- -rm -f knot/zone/*.lo
- -rm -f libknot/*.$(OBJEXT)
- -rm -f libknot/*.lo
- -rm -f libknot/nameserver/*.$(OBJEXT)
- -rm -f libknot/nameserver/*.lo
- -rm -f libknot/packet/*.$(OBJEXT)
- -rm -f libknot/packet/*.lo
- -rm -f libknot/sign/*.$(OBJEXT)
- -rm -f libknot/sign/*.lo
- -rm -f libknot/updates/*.$(OBJEXT)
- -rm -f libknot/updates/*.lo
- -rm -f libknot/util/*.$(OBJEXT)
- -rm -f libknot/util/*.lo
- -rm -f libknot/zone/*.$(OBJEXT)
- -rm -f libknot/zone/*.lo
- -rm -f utils/common/*.$(OBJEXT)
- -rm -f utils/dig/*.$(OBJEXT)
- -rm -f utils/host/*.$(OBJEXT)
- -rm -f utils/nsupdate/*.$(OBJEXT)
- -rm -f zscanner/*.$(OBJEXT)
- -rm -f zscanner/*.lo
- -rm -f zscanner/test/*.$(OBJEXT)
+ -rm -f common/acl.$(OBJEXT)
+ -rm -f common/acl.lo
+ -rm -f common/base32hex.$(OBJEXT)
+ -rm -f common/base32hex.lo
+ -rm -f common/base64.$(OBJEXT)
+ -rm -f common/base64.lo
+ -rm -f common/dSFMT.$(OBJEXT)
+ -rm -f common/dSFMT.lo
+ -rm -f common/descriptor.$(OBJEXT)
+ -rm -f common/descriptor.lo
+ -rm -f common/errcode.$(OBJEXT)
+ -rm -f common/errcode.lo
+ -rm -f common/errors.$(OBJEXT)
+ -rm -f common/errors.lo
+ -rm -f common/evqueue.$(OBJEXT)
+ -rm -f common/evqueue.lo
+ -rm -f common/evsched.$(OBJEXT)
+ -rm -f common/evsched.lo
+ -rm -f common/fdset.$(OBJEXT)
+ -rm -f common/fdset.lo
+ -rm -f common/getline.$(OBJEXT)
+ -rm -f common/getline.lo
+ -rm -f common/hattrie/ahtable.$(OBJEXT)
+ -rm -f common/hattrie/ahtable.lo
+ -rm -f common/hattrie/hat-trie.$(OBJEXT)
+ -rm -f common/hattrie/hat-trie.lo
+ -rm -f common/hattrie/murmurhash3.$(OBJEXT)
+ -rm -f common/hattrie/murmurhash3.lo
+ -rm -f common/heap.$(OBJEXT)
+ -rm -f common/heap.lo
+ -rm -f common/libtap/tap.$(OBJEXT)
+ -rm -f common/libtap/tap.lo
+ -rm -f common/lists.$(OBJEXT)
+ -rm -f common/lists.lo
+ -rm -f common/log.$(OBJEXT)
+ -rm -f common/log.lo
+ -rm -f common/mempattern.$(OBJEXT)
+ -rm -f common/mempattern.lo
+ -rm -f common/mempool.$(OBJEXT)
+ -rm -f common/mempool.lo
+ -rm -f common/print.$(OBJEXT)
+ -rm -f common/print.lo
+ -rm -f common/prng.$(OBJEXT)
+ -rm -f common/prng.lo
+ -rm -f common/ref.$(OBJEXT)
+ -rm -f common/ref.lo
+ -rm -f common/slab/slab.$(OBJEXT)
+ -rm -f common/slab/slab.lo
+ -rm -f common/sockaddr.$(OBJEXT)
+ -rm -f common/sockaddr.lo
+ -rm -f knot/conf/conf.$(OBJEXT)
+ -rm -f knot/conf/conf.lo
+ -rm -f knot/conf/extra.$(OBJEXT)
+ -rm -f knot/conf/extra.lo
+ -rm -f knot/conf/includes.$(OBJEXT)
+ -rm -f knot/conf/includes.lo
+ -rm -f knot/conf/libknotd_la-cf-lex.$(OBJEXT)
+ -rm -f knot/conf/libknotd_la-cf-lex.lo
+ -rm -f knot/conf/libknotd_la-cf-parse.$(OBJEXT)
+ -rm -f knot/conf/libknotd_la-cf-parse.lo
+ -rm -f knot/conf/logconf.$(OBJEXT)
+ -rm -f knot/conf/logconf.lo
+ -rm -f knot/ctl/knotc_main.$(OBJEXT)
+ -rm -f knot/ctl/process.$(OBJEXT)
+ -rm -f knot/ctl/process.lo
+ -rm -f knot/ctl/remote.$(OBJEXT)
+ -rm -f knot/ctl/remote.lo
+ -rm -f knot/main.$(OBJEXT)
+ -rm -f knot/server/dthreads.$(OBJEXT)
+ -rm -f knot/server/dthreads.lo
+ -rm -f knot/server/journal.$(OBJEXT)
+ -rm -f knot/server/journal.lo
+ -rm -f knot/server/notify.$(OBJEXT)
+ -rm -f knot/server/notify.lo
+ -rm -f knot/server/rrl.$(OBJEXT)
+ -rm -f knot/server/rrl.lo
+ -rm -f knot/server/server.$(OBJEXT)
+ -rm -f knot/server/server.lo
+ -rm -f knot/server/socket.$(OBJEXT)
+ -rm -f knot/server/socket.lo
+ -rm -f knot/server/tcp-handler.$(OBJEXT)
+ -rm -f knot/server/tcp-handler.lo
+ -rm -f knot/server/udp-handler.$(OBJEXT)
+ -rm -f knot/server/udp-handler.lo
+ -rm -f knot/server/xfr-handler.$(OBJEXT)
+ -rm -f knot/server/xfr-handler.lo
+ -rm -f knot/server/zones.$(OBJEXT)
+ -rm -f knot/server/zones.lo
+ -rm -f knot/stat/gatherer.$(OBJEXT)
+ -rm -f knot/stat/gatherer.lo
+ -rm -f knot/stat/stat.$(OBJEXT)
+ -rm -f knot/stat/stat.lo
+ -rm -f knot/zone/estimator.$(OBJEXT)
+ -rm -f knot/zone/estimator.lo
+ -rm -f knot/zone/semantic-check.$(OBJEXT)
+ -rm -f knot/zone/semantic-check.lo
+ -rm -f knot/zone/zone-dump.$(OBJEXT)
+ -rm -f knot/zone/zone-dump.lo
+ -rm -f knot/zone/zone-load.$(OBJEXT)
+ -rm -f knot/zone/zone-load.lo
+ -rm -f libknot/binary.$(OBJEXT)
+ -rm -f libknot/binary.lo
+ -rm -f libknot/consts.$(OBJEXT)
+ -rm -f libknot/consts.lo
+ -rm -f libknot/dname.$(OBJEXT)
+ -rm -f libknot/dname.lo
+ -rm -f libknot/edns.$(OBJEXT)
+ -rm -f libknot/edns.lo
+ -rm -f libknot/nameserver/chaos.$(OBJEXT)
+ -rm -f libknot/nameserver/chaos.lo
+ -rm -f libknot/nameserver/name-server.$(OBJEXT)
+ -rm -f libknot/nameserver/name-server.lo
+ -rm -f libknot/nsec3.$(OBJEXT)
+ -rm -f libknot/nsec3.lo
+ -rm -f libknot/packet/packet.$(OBJEXT)
+ -rm -f libknot/packet/packet.lo
+ -rm -f libknot/packet/query.$(OBJEXT)
+ -rm -f libknot/packet/query.lo
+ -rm -f libknot/packet/response.$(OBJEXT)
+ -rm -f libknot/packet/response.lo
+ -rm -f libknot/rrset-dump.$(OBJEXT)
+ -rm -f libknot/rrset-dump.lo
+ -rm -f libknot/rrset.$(OBJEXT)
+ -rm -f libknot/rrset.lo
+ -rm -f libknot/sign/bnutils.$(OBJEXT)
+ -rm -f libknot/sign/bnutils.lo
+ -rm -f libknot/sign/dnssec.$(OBJEXT)
+ -rm -f libknot/sign/dnssec.lo
+ -rm -f libknot/sign/key.$(OBJEXT)
+ -rm -f libknot/sign/key.lo
+ -rm -f libknot/sign/sig0.$(OBJEXT)
+ -rm -f libknot/sign/sig0.lo
+ -rm -f libknot/tsig-op.$(OBJEXT)
+ -rm -f libknot/tsig-op.lo
+ -rm -f libknot/tsig.$(OBJEXT)
+ -rm -f libknot/tsig.lo
+ -rm -f libknot/updates/changesets.$(OBJEXT)
+ -rm -f libknot/updates/changesets.lo
+ -rm -f libknot/updates/ddns.$(OBJEXT)
+ -rm -f libknot/updates/ddns.lo
+ -rm -f libknot/updates/xfr-in.$(OBJEXT)
+ -rm -f libknot/updates/xfr-in.lo
+ -rm -f libknot/util/debug.$(OBJEXT)
+ -rm -f libknot/util/debug.lo
+ -rm -f libknot/util/tolower.$(OBJEXT)
+ -rm -f libknot/util/tolower.lo
+ -rm -f libknot/util/utils.$(OBJEXT)
+ -rm -f libknot/util/utils.lo
+ -rm -f libknot/zone/node.$(OBJEXT)
+ -rm -f libknot/zone/node.lo
+ -rm -f libknot/zone/zone-contents.$(OBJEXT)
+ -rm -f libknot/zone/zone-contents.lo
+ -rm -f libknot/zone/zone-diff.$(OBJEXT)
+ -rm -f libknot/zone/zone-diff.lo
+ -rm -f libknot/zone/zone-tree.$(OBJEXT)
+ -rm -f libknot/zone/zone-tree.lo
+ -rm -f libknot/zone/zone.$(OBJEXT)
+ -rm -f libknot/zone/zone.lo
+ -rm -f libknot/zone/zonedb.$(OBJEXT)
+ -rm -f libknot/zone/zonedb.lo
+ -rm -f utils/common/exec.$(OBJEXT)
+ -rm -f utils/common/msg.$(OBJEXT)
+ -rm -f utils/common/netio.$(OBJEXT)
+ -rm -f utils/common/params.$(OBJEXT)
+ -rm -f utils/common/resolv.$(OBJEXT)
+ -rm -f utils/common/token.$(OBJEXT)
+ -rm -f utils/dig/dig_exec.$(OBJEXT)
+ -rm -f utils/dig/dig_main.$(OBJEXT)
+ -rm -f utils/dig/dig_params.$(OBJEXT)
+ -rm -f utils/host/host_main.$(OBJEXT)
+ -rm -f utils/host/host_params.$(OBJEXT)
+ -rm -f utils/nsupdate/nsupdate_exec.$(OBJEXT)
+ -rm -f utils/nsupdate/nsupdate_main.$(OBJEXT)
+ -rm -f utils/nsupdate/nsupdate_params.$(OBJEXT)
+ -rm -f zscanner/file_loader.$(OBJEXT)
+ -rm -f zscanner/file_loader.lo
+ -rm -f zscanner/scanner.$(OBJEXT)
+ -rm -f zscanner/scanner.lo
+ -rm -f zscanner/scanner_functions.$(OBJEXT)
+ -rm -f zscanner/scanner_functions.lo
+ -rm -f zscanner/test/processing.$(OBJEXT)
+ -rm -f zscanner/test/tests.$(OBJEXT)
+ -rm -f zscanner/test/zscanner-tool.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -1503,12 +1537,12 @@ knot/conf/libknotd_la-cf-lex.c: knot/conf/cf-lex.l
$(SHELL) $(YLWRAP) `test -f 'knot/conf/cf-lex.l' || echo '$(srcdir)/'`knot/conf/cf-lex.l $(LEX_OUTPUT_ROOT).c knot/conf/libknotd_la-cf-lex.c -- $(LEX) $(libknotd_la_LFLAGS) $(LFLAGS)
.y.c:
- $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+ $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
knot/conf/libknotd_la-cf-parse.c: knot/conf/cf-parse.y
$(AM_V_YACC) \
$(am__skipyacc) \
- $(SHELL) $(YLWRAP) `test -f 'knot/conf/cf-parse.y' || echo '$(srcdir)/'`knot/conf/cf-parse.y y.tab.c knot/conf/libknotd_la-cf-parse.c y.tab.h `echo knot/conf/libknotd_la-cf-parse.c | $(am__yacc_c2h)` y.output knot/conf/libknotd_la-cf-parse.output -- $(YACC) $(libknotd_la_YFLAGS) $(YFLAGS)
+ $(SHELL) $(YLWRAP) `test -f 'knot/conf/cf-parse.y' || echo '$(srcdir)/'`knot/conf/cf-parse.y y.tab.c knot/conf/libknotd_la-cf-parse.c y.tab.h knot/conf/libknotd_la-cf-parse.h y.output knot/conf/libknotd_la-cf-parse.output -- $(YACC) $(libknotd_la_YFLAGS) $(YFLAGS)
mostlyclean-libtool:
-rm -f *.lo
@@ -1534,25 +1568,22 @@ clean-libtool:
-rm -rf zscanner/.libs zscanner/_libs
# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-# (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
- @fail=; \
- if $(am__make_keepgoing); then \
- failcom='fail=yes'; \
- else \
- failcom='exit 1'; \
- fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- for subdir in $$list; do \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -1567,12 +1598,57 @@ $(am__recursive_targets):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1588,7 +1664,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- $(am__define_uniq_tagged_files); \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -1600,11 +1681,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
$$unique; \
fi; \
fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -1613,21 +1698,6 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1664,10 +1734,13 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- $(am__make_dryrun) \
- || test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -1851,14 +1924,15 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS
-.MAKE: $(am__recursive_targets) all check install install-am \
- install-data-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+ ctags-recursive install install-am install-data-am \
+ install-strip tags-recursive
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
- check-am clean clean-binPROGRAMS clean-generic clean-libtool \
- clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
- clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-hdr \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ clean-noinstPROGRAMS clean-sbinPROGRAMS ctags ctags-recursive \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-data-hook install-dvi \
@@ -1870,7 +1944,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS
installcheck-sbinPROGRAMS installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-sbinPROGRAMS
diff --git a/src/common/errcode.c b/src/common/errcode.c
index 50b37dd..4f60ed9 100644
--- a/src/common/errcode.c
+++ b/src/common/errcode.c
@@ -96,6 +96,7 @@ const error_table_t knot_error_msgs[] = {
/* Zone scanner errors. */
{ ZSCANNER_UNCOVERED_STATE, "General scanner error." },
+ { ZSCANNER_UNCLOSED_MULTILINE, "Unclosed last multiline block." },
{ ZSCANNER_ELEFT_PARENTHESIS, "Too many left parentheses." },
{ ZSCANNER_ERIGHT_PARENTHESIS, "Too many right parentheses." },
{ ZSCANNER_EUNSUPPORTED_TYPE, "Unsupported record type." },
diff --git a/src/common/errcode.h b/src/common/errcode.h
index c29a433..7436b06 100644
--- a/src/common/errcode.h
+++ b/src/common/errcode.h
@@ -116,6 +116,7 @@ enum knot_error {
/* Zone scanner errors. */
ZSCANNER_UNCOVERED_STATE,
+ ZSCANNER_UNCLOSED_MULTILINE,
ZSCANNER_ELEFT_PARENTHESIS,
ZSCANNER_ERIGHT_PARENTHESIS,
ZSCANNER_EUNSUPPORTED_TYPE,
diff --git a/src/config.h.in b/src/config.h.in
index 89e5009..dd044ab 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -18,6 +18,9 @@
/* Define to 1 if you have the <arpa/nameser.h> header file. */
#undef HAVE_ARPA_NAMESER_H
+/* Define to 1 if you have the `be64toh' function. */
+#undef HAVE_BE64TOH
+
/* Define to 1 if you have the <cap-ng.h> header file. */
#undef HAVE_CAP_NG_H
@@ -176,6 +179,9 @@
*/
#undef LT_OBJDIR
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#undef PACKAGE
diff --git a/src/knot/conf/cf-lex.l b/src/knot/conf/cf-lex.l
index d00300c..db2c8da 100644
--- a/src/knot/conf/cf-lex.l
+++ b/src/knot/conf/cf-lex.l
@@ -93,6 +93,7 @@ identity { lval.t = yytext; return IDENTITY; }
hostname { lval.t = yytext; return HOSTNAME; }
version { lval.t = yytext; return SVERSION; }
nsid { lval.t = yytext; return NSID; }
+max-udp-payload { lval.t = yytext; return MAX_UDP_PAYLOAD; }
storage { lval.t = yytext; return STORAGE; }
key { lval.t = yytext; return KEY; }
keys { lval.t = yytext; return KEYS; }
@@ -298,11 +299,16 @@ hmac-sha512 { lval.alg = KNOT_TSIG_ALG_HMAC_SHA512; return TSIG_ALGO_NAME; }
: /* Optional : in assignments. */;
<<EOF>> {
- char *name = conf_includes_pop(yyextra->includes);
- free(name);
+ conf_include_t *inc = conf_includes_pop(yyextra->includes);
+ free(inc->filename);
+ if (inc->handle) {
+ fclose(inc->handle);
+ }
+
yypop_buffer_state(yyscanner);
- if (!YY_CURRENT_BUFFER)
+ if (!YY_CURRENT_BUFFER) {
return END;
+ }
}
<include>{BLANK}+
@@ -325,16 +331,17 @@ hmac-sha512 { lval.alg = KNOT_TSIG_ALG_HMAC_SHA512; return TSIG_ALGO_NAME; }
}
// retrieved relative to previous config
- char *filename = conf_includes_top(yyextra->includes);
+ conf_include_t *inc = conf_includes_top(yyextra->includes);
- FILE *included = fopen(filename, "r");
+ FILE *included = fopen(inc->filename, "r");
if (!included) {
- cf_error(yyscanner, "cannot open file '%s'", filename);
+ cf_error(yyscanner, "cannot open file '%s'", inc->filename);
conf_includes_pop(yyextra->includes);
- free(filename);
+ free(inc->filename);
return END;
}
+ inc->handle = included;
YY_BUFFER_STATE bs = yy_create_buffer(included, YY_BUF_SIZE, yyscanner);
yypush_buffer_state(bs, yyscanner);
}
diff --git a/src/knot/conf/cf-parse.y b/src/knot/conf/cf-parse.y
index ce9fb31..e2539f1 100644
--- a/src/knot/conf/cf-parse.y
+++ b/src/knot/conf/cf-parse.y
@@ -31,6 +31,7 @@
#include "common/sockaddr.h"
#include "libknot/dname.h"
#include "libknot/binary.h"
+#include "libknot/edns.h"
#include "knot/conf/conf.h"
#include "libknotd_la-cf-parse.h" /* Automake generated header. */
@@ -436,6 +437,7 @@ static void ident_auto(int tok, conf_t *conf, bool val)
%token <tok> BOOL
%token <tok> SYSTEM IDENTITY HOSTNAME SVERSION NSID STORAGE KEY KEYS
+%token <tok> MAX_UDP_PAYLOAD
%token <tok> TSIG_ALGO_NAME
%token <tok> WORKERS
%token <tok> USER
@@ -571,6 +573,14 @@ system:
| system NSID HEXSTR ';' { new_config->nsid = $3.t; new_config->nsid_len = $3.l; }
| system NSID TEXT ';' { new_config->nsid = $3.t; new_config->nsid_len = strlen(new_config->nsid); }
| system NSID BOOL ';' { ident_auto(NSID, new_config, $3.i); }
+ | system MAX_UDP_PAYLOAD NUM ';' {
+ if ($3.i < EDNS_MIN_UDP_PAYLOAD || $3.i > EDNS_MAX_UDP_PAYLOAD) {
+ cf_error(scanner, "maximal UDP payload size is out of range (%u-%u)",
+ EDNS_MIN_UDP_PAYLOAD, EDNS_MAX_UDP_PAYLOAD);
+ } else {
+ new_config->max_udp_payload = $3.i;
+ }
+ }
| system STORAGE TEXT ';' { new_config->storage = $3.t; }
| system RUNDIR TEXT ';' { new_config->rundir = $3.t; }
| system PIDFILE TEXT ';' { new_config->pidfile = $3.t; }
diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c
index 1a3cf90..d52c9e5 100644
--- a/src/knot/conf/conf.c
+++ b/src/knot/conf/conf.c
@@ -70,17 +70,24 @@ static void cf_print_error(void *scanner, const char *msg)
int lineno = -1;
char *text = "?";
char *filename = NULL;
+ conf_include_t *inc = NULL;
+
if (scanner) {
extra = cf_get_extra(scanner);
lineno = cf_get_lineno(scanner);
- text = cf_get_text(scanner);
- filename = conf_includes_top(extra->includes);
-
+ inc = conf_includes_top(extra->includes);
extra->error = true;
}
- if (!filename)
+ if (extra && lineno != 0) {
+ text = cf_get_text(scanner);
+ }
+
+ if (inc && inc->filename) {
+ filename = inc->filename;
+ } else {
filename = new_config->filename;
+ }
log_server_error("Config error in '%s' (line %d token '%s') - %s\n",
filename, lineno, text, msg);
@@ -524,6 +531,7 @@ conf_t *conf_new(const char* path)
c->notify_retries = CONFIG_NOTIFY_RETRIES;
c->notify_timeout = CONFIG_NOTIFY_TIMEOUT;
c->dbsync_timeout = CONFIG_DBSYNC_TIMEOUT;
+ c->max_udp_payload = EDNS_MAX_UDP_PAYLOAD;
c->ixfr_fslimit = -1;
c->uid = -1;
c->gid = -1;
diff --git a/src/knot/conf/conf.h b/src/knot/conf/conf.h
index 1a5bcf9..0bb44e6 100644
--- a/src/knot/conf/conf.h
+++ b/src/knot/conf/conf.h
@@ -197,6 +197,7 @@ typedef struct conf_t {
char *pidfile; /*!< PID file location. */
char *nsid; /*!< Server's NSID. */
size_t nsid_len;/*!< Server's NSID length. */
+ size_t max_udp_payload; /*!< Maximal UDP payload size. */
int workers; /*!< Number of workers per interface. */
int uid; /*!< Specified user id. */
int gid; /*!< Specified group id. */
diff --git a/src/knot/conf/extra.c b/src/knot/conf/extra.c
index c172a15..52e661a 100644
--- a/src/knot/conf/extra.c
+++ b/src/knot/conf/extra.c
@@ -29,8 +29,9 @@
conf_extra_t *conf_extra_init(const char *file, int includes_max_depth)
{
conf_extra_t *extra = calloc(1, sizeof(conf_extra_t));
- if (!extra)
+ if (!extra) {
return NULL;
+ }
conf_includes_t *includes = conf_includes_init(includes_max_depth);
if (!includes) {
diff --git a/src/knot/conf/includes.c b/src/knot/conf/includes.c
index 8bd9c16..be3e38a 100644
--- a/src/knot/conf/includes.c
+++ b/src/knot/conf/includes.c
@@ -27,9 +27,9 @@
* \brief Structure to store names of files included into the config.
*/
struct conf_includes {
- int free_index; //!< First free index in 'names'.
- int capacity; //!< Maximal capacity.
- char *names[0]; //!< Pointers to store file names.
+ int free_index; //!< First free index in 'names'.
+ int capacity; //!< Maximal capacity.
+ conf_include_t files[0]; //!< Stored includes.
};
/*!
@@ -37,13 +37,16 @@ struct conf_includes {
*/
conf_includes_t *conf_includes_init(int capacity)
{
- if (capacity <= 0)
+ if (capacity <= 0) {
return NULL;
+ }
- size_t size = sizeof(conf_includes_t) + (capacity * sizeof(char *));
+ size_t size = sizeof(conf_includes_t)
+ + (capacity * sizeof(conf_include_t *));
conf_includes_t *result = calloc(1, size);
- if (!result)
+ if (!result) {
return NULL;
+ }
result->capacity = capacity;
return result;
@@ -54,11 +57,13 @@ conf_includes_t *conf_includes_init(int capacity)
*/
void conf_includes_free(conf_includes_t *includes)
{
- if (!includes)
+ if (!includes) {
return;
+ }
- for (int i = 0; i < includes->free_index; i++)
- free(includes->names[i]);
+ for (int i = 0; i < includes->free_index; i++) {
+ free(includes->files[i].filename);
+ }
free(includes);
}
@@ -68,8 +73,9 @@ void conf_includes_free(conf_includes_t *includes)
*/
bool conf_includes_can_push(conf_includes_t *includes)
{
- if (!includes)
+ if (!includes) {
return false;
+ }
return includes->free_index < includes->capacity;
}
@@ -87,14 +93,16 @@ bool conf_includes_can_push(conf_includes_t *includes)
static char *path_relative_to(const char *filename, const char *reference)
{
char *path_end = strrchr(reference, '/');
- if (!path_end)
+ if (!path_end) {
return strdup(filename);
+ }
int path_len = (int)(path_end - reference);
size_t result_len = path_len + 1 + strlen(filename) + 1;
char *result = malloc(result_len * sizeof(char));
- if (!result)
+ if (!result) {
return NULL;
+ }
int w;
w = snprintf(result, result_len, "%.*s/%s", path_len, reference, filename);
@@ -108,44 +116,54 @@ static char *path_relative_to(const char *filename, const char *reference)
*/
bool conf_includes_push(conf_includes_t *includes, const char *filename)
{
- if (!includes || !filename)
+ if (!includes || !filename) {
return false;
+ }
- if (!conf_includes_can_push(includes))
+ if (!conf_includes_can_push(includes)) {
return false;
+ }
char *store = NULL;
if (includes->free_index == 0 || filename[0] == '/') {
store = strdup(filename);
} else {
- char *previous = includes->names[includes->free_index - 1];
- store = path_relative_to(filename, previous);
+ conf_include_t *previous = &includes->files[includes->free_index - 1];
+ store = path_relative_to(filename, previous->filename);
}
- includes->names[includes->free_index++] = store;
+ conf_include_t new_include = {
+ .filename = store,
+ .handle = NULL
+ };
+
+ includes->files[includes->free_index++] = new_include;
+
return store != NULL;
}
/**
- * \brief Returns a file name on the top of the stack.
+ * \brief Returns an include on the top of the stack.
*/
-char *conf_includes_top(conf_includes_t *includes)
+conf_include_t *conf_includes_top(conf_includes_t *includes)
{
- if (!includes || includes->free_index == 0)
+ if (!includes || includes->free_index == 0) {
return NULL;
+ }
- return includes->names[includes->free_index - 1];
+ return &includes->files[includes->free_index - 1];
}
/**
- * \brief Returns a file name on the top of the stack and removes it.
+ * \brief Returns an include on the top of the stack and removes it.
*/
-char *conf_includes_pop(conf_includes_t *includes)
+conf_include_t *conf_includes_pop(conf_includes_t *includes)
{
- char *result = conf_includes_top(includes);
- if (result)
+ conf_include_t *result = conf_includes_top(includes);
+ if (result) {
includes->free_index -= 1;
+ }
return result;
}
diff --git a/src/knot/conf/includes.h b/src/knot/conf/includes.h
index 64c26e5..0a9b152 100644
--- a/src/knot/conf/includes.h
+++ b/src/knot/conf/includes.h
@@ -28,9 +28,18 @@
#define _KNOT_CONF_INCLUDES_H_
#include <stdbool.h>
+#include <stdio.h>
/*!
- * \brief Structure to store names of files included into the config.
+ * \brief Structure to hold data for one include in configuration file.
+ */
+typedef struct {
+ char *filename;
+ FILE *handle;
+} conf_include_t;
+
+/*!
+ * \brief Structure to keep config file includes stack.
*/
struct conf_includes;
typedef struct conf_includes conf_includes_t;
@@ -48,7 +57,7 @@ conf_includes_t *conf_includes_init(int capacity);
void conf_includes_free(conf_includes_t *includes);
/**
- * \brief Check if there is a capacity to insert new file..
+ * \brief Check if there is a capacity to insert new file.
*/
bool conf_includes_can_push(conf_includes_t *includes);
@@ -65,18 +74,18 @@ bool conf_includes_can_push(conf_includes_t *includes);
bool conf_includes_push(conf_includes_t *includes, const char *filename);
/**
- * \brief Returns a file name on the top of the stack.
+ * \brief Returns an include on the top of the stack.
*
* \return File name on the top of the stack. Do not free it.
*/
-char *conf_includes_top(conf_includes_t *includes);
+conf_include_t *conf_includes_top(conf_includes_t *includes);
/**
- * \brief Returns a file name on the top of the stack and removes it.
+ * \brief Returns an include on the top of the stack and removes it.
*
* \return File name on the top of the stack. Caller should free the result.
*/
-char *conf_includes_pop(conf_includes_t *includes);
+conf_include_t *conf_includes_pop(conf_includes_t *includes);
#endif /* _KNOT_CONF_INCLUDES_H_ */
diff --git a/src/knot/conf/libknotd_la-cf-lex.c b/src/knot/conf/libknotd_la-cf-lex.c
index e2f0b33..74493e4 100644
--- a/src/knot/conf/libknotd_la-cf-lex.c
+++ b/src/knot/conf/libknotd_la-cf-lex.c
@@ -9,7 +9,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -159,7 +159,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -171,11 +179,6 @@ typedef void* yyscan_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
@@ -211,6 +214,11 @@ typedef size_t yy_size_t;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -228,7 +236,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- yy_size_t yy_n_chars;
+ int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -307,7 +315,7 @@ static void cf__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
YY_BUFFER_STATE cf__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE cf__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE cf__scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
+YY_BUFFER_STATE cf__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
void *cf_alloc (yy_size_t ,yyscan_t yyscanner );
void *cf_realloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -339,7 +347,7 @@ void cf_free (void * ,yyscan_t yyscanner );
/* Begin user sect3 */
-#define cf_wrap(yyscanner) 1
+#define cf_wrap(n) 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -363,8 +371,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 83
-#define YY_END_OF_BUFFER 84
+#define YY_NUM_RULES 84
+#define YY_END_OF_BUFFER 85
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -372,57 +380,58 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[446] =
+static yyconst flex_int16_t yy_accept[457] =
{ 0,
- 0, 0, 0, 0, 84, 83, 2, 3, 83, 83,
- 3, 78, 64, 64, 79, 78, 83, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 80,
- 83, 2, 0, 77, 76, 0, 1, 78, 78, 64,
- 0, 78, 63, 62, 62, 78, 0, 67, 0, 0,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 60, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
-
- 80, 0, 82, 81, 78, 68, 0, 67, 67, 67,
- 0, 0, 78, 54, 78, 47, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 10, 78, 46, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 42, 78, 78, 78, 78, 78, 0, 0, 67, 67,
- 67, 0, 0, 0, 0, 66, 78, 78, 78, 78,
- 78, 78, 78, 15, 78, 78, 78, 78, 78, 78,
- 56, 78, 78, 11, 78, 78, 78, 8, 78, 41,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
-
- 78, 78, 28, 78, 78, 78, 78, 50, 78, 0,
- 0, 0, 0, 0, 0, 78, 44, 78, 78, 55,
- 78, 59, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 14, 78, 0, 0, 78, 78, 78,
- 78, 13, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 57, 78, 78, 78, 78, 30, 78, 48,
- 52, 51, 78, 53, 4, 78, 78, 78, 78, 78,
- 22, 78, 78, 65, 0, 0, 40, 78, 43, 78,
-
- 78, 78, 78, 78, 78, 61, 78, 78, 78, 78,
- 78, 78, 29, 78, 12, 78, 9, 78, 78, 7,
- 58, 27, 23, 78, 0, 0, 78, 78, 69, 70,
- 78, 6, 5, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 67, 0, 49,
- 78, 71, 78, 78, 78, 78, 78, 78, 45, 78,
- 25, 78, 78, 78, 78, 78, 38, 24, 78, 0,
- 78, 78, 78, 78, 78, 39, 78, 78, 78, 78,
- 78, 26, 78, 78, 35, 78, 78, 16, 72, 73,
- 74, 75, 78, 78, 78, 78, 78, 78, 78, 78,
-
- 78, 78, 78, 21, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 32, 78, 78, 78, 78, 78,
- 78, 20, 78, 78, 34, 18, 19, 78, 78, 78,
- 78, 78, 36, 37, 17, 78, 78, 78, 78, 78,
- 33, 78, 78, 31, 0
+ 0, 0, 0, 0, 85, 84, 2, 3, 84, 84,
+ 3, 79, 65, 65, 80, 79, 84, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 81,
+ 84, 2, 0, 78, 77, 0, 1, 79, 79, 65,
+ 0, 79, 64, 63, 63, 79, 0, 68, 0, 0,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 61, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+
+ 81, 0, 83, 82, 79, 69, 0, 68, 68, 68,
+ 0, 0, 79, 55, 79, 48, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 11, 79, 47, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 43, 79, 79, 79, 79, 79, 0, 0, 68, 68,
+ 68, 0, 0, 0, 0, 67, 79, 79, 79, 79,
+ 79, 79, 79, 16, 79, 79, 79, 79, 79, 79,
+ 57, 79, 79, 12, 79, 79, 79, 8, 79, 42,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+
+ 79, 79, 29, 79, 79, 79, 79, 51, 79, 0,
+ 0, 0, 0, 0, 0, 79, 45, 79, 79, 56,
+ 79, 60, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 15, 79, 0, 0, 79, 79,
+ 79, 79, 14, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 58, 79, 79, 79, 79, 31,
+ 79, 49, 53, 52, 79, 54, 4, 79, 79, 79,
+ 79, 79, 23, 79, 79, 66, 0, 0, 41, 79,
+
+ 44, 79, 79, 79, 79, 79, 79, 62, 79, 79,
+ 79, 79, 79, 79, 79, 30, 79, 13, 79, 10,
+ 79, 79, 7, 59, 28, 24, 79, 0, 0, 79,
+ 79, 70, 71, 79, 6, 5, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 68, 0, 50, 79, 72, 79, 79, 79, 79,
+ 79, 79, 46, 79, 79, 26, 79, 79, 79, 79,
+ 79, 39, 25, 79, 0, 79, 79, 79, 79, 79,
+ 40, 79, 79, 79, 79, 79, 79, 27, 79, 79,
+ 36, 79, 79, 17, 73, 74, 75, 76, 79, 79,
+
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 22, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 33, 79, 79, 79, 79, 79, 79, 79,
+ 21, 79, 79, 35, 79, 19, 20, 79, 79, 79,
+ 79, 79, 9, 37, 38, 18, 79, 79, 79, 79,
+ 79, 34, 79, 79, 32, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -466,292 +475,296 @@ static yyconst flex_int32_t yy_meta[48] =
2, 2, 2, 2, 2, 2, 2
} ;
-static yyconst flex_int16_t yy_base[464] =
+static yyconst flex_int16_t yy_base[475] =
{ 0,
- 0, 0, 46, 50, 679, 680, 54, 680, 55, 675,
- 0, 0, 54, 632, 658, 93, 657, 89, 637, 22,
- 634, 640, 37, 78, 97, 643, 94, 646, 90, 99,
- 97, 108, 110, 630, 99, 112, 117, 639, 630, 143,
- 144, 150, 152, 680, 680, 663, 680, 0, 149, 620,
- 646, 0, 0, 0, 0, 158, 645, 179, 644, 643,
- 633, 625, 169, 622, 632, 616, 616, 620, 616, 612,
- 627, 610, 621, 173, 619, 601, 606, 615, 599, 602,
- 610, 612, 0, 613, 600, 597, 602, 600, 141, 173,
- 595, 610, 606, 604, 592, 606, 590, 589, 588, 590,
-
- 176, 208, 680, 680, 617, 0, 606, 615, 207, 604,
- 603, 228, 581, 582, 574, 0, 576, 574, 591, 577,
- 585, 570, 604, 584, 568, 572, 573, 569, 577, 565,
- 563, 561, 0, 594, 568, 572, 569, 556, 568, 558,
- 567, 569, 549, 221, 552, 225, 554, 565, 549, 547,
- 0, 550, 552, 577, 555, 258, 564, 0, 573, 0,
- 562, 561, 570, 267, 288, 680, 549, 532, 547, 535,
- 543, 547, 532, 0, 532, 528, 561, 531, 525, 523,
- 0, 525, 556, 0, 534, 535, 201, 0, 528, 0,
- 552, 517, 525, 520, 527, 515, 511, 528, 514, 522,
-
- 509, 507, 0, 515, 514, 517, 111, 172, 536, 535,
- 524, 0, 533, 0, 297, 500, 0, 500, 501, 0,
- 503, 0, 496, 495, 225, 510, 501, 505, 502, 501,
- 493, 491, 499, 480, 491, 490, 495, 483, 480, 481,
- 480, 477, 487, 486, 480, 485, 485, 475, 475, 471,
- 473, 466, 475, 0, 306, 0, 498, 465, 472, 469,
- 474, 0, 469, 473, 468, 463, 456, 468, 471, 189,
- 487, 457, 0, 485, 463, 458, 449, 0, 456, 0,
- 0, 0, 459, 0, 0, 458, 478, 448, 453, 442,
- 0, 440, 446, 0, 471, 0, 0, 442, 0, 470,
-
- 446, 461, 450, 445, 426, 0, 445, 433, 435, 431,
- 431, 292, 0, 431, 0, 439, 0, 425, 431, 0,
- 0, 0, 0, 434, 0, 453, 430, 435, 0, 0,
- 316, 0, 0, 430, 422, 424, 419, 447, 417, 410,
- 423, 418, 417, 441, 407, 410, 438, 0, 0, 0,
- 408, 0, 250, 426, 432, 401, 433, 404, 0, 303,
- 0, 397, 396, 401, 394, 408, 0, 0, 393, 409,
- 385, 417, 414, 415, 416, 0, 399, 393, 400, 396,
- 394, 0, 382, 392, 412, 387, 371, 0, 0, 0,
- 0, 0, 384, 374, 378, 379, 374, 379, 373, 369,
-
- 380, 371, 377, 0, 378, 376, 369, 374, 359, 216,
- 374, 373, 369, 357, 0, 350, 355, 353, 346, 360,
- 358, 0, 362, 358, 0, 0, 0, 360, 322, 301,
- 301, 315, 0, 0, 0, 310, 304, 300, 304, 299,
- 0, 261, 248, 0, 680, 342, 347, 352, 356, 359,
- 362, 367, 370, 373, 376, 284, 379, 382, 260, 259,
- 178, 111, 56
+ 0, 0, 46, 50, 690, 691, 54, 691, 55, 686,
+ 0, 0, 54, 643, 669, 93, 668, 89, 648, 22,
+ 645, 651, 37, 78, 97, 654, 94, 657, 90, 99,
+ 97, 108, 110, 641, 99, 112, 117, 650, 641, 143,
+ 144, 150, 152, 691, 691, 674, 691, 0, 149, 631,
+ 657, 0, 0, 0, 0, 158, 656, 179, 655, 654,
+ 644, 636, 169, 633, 643, 627, 627, 631, 627, 623,
+ 638, 621, 632, 173, 630, 612, 617, 626, 610, 613,
+ 621, 623, 0, 624, 611, 608, 613, 611, 141, 173,
+ 606, 621, 617, 615, 603, 617, 601, 600, 599, 601,
+
+ 176, 208, 691, 691, 628, 0, 617, 626, 207, 615,
+ 614, 228, 592, 593, 585, 0, 587, 585, 602, 588,
+ 596, 581, 615, 595, 579, 583, 584, 580, 588, 576,
+ 574, 572, 0, 605, 579, 583, 580, 567, 579, 569,
+ 578, 580, 560, 221, 563, 225, 565, 576, 560, 558,
+ 0, 561, 563, 588, 566, 258, 575, 0, 584, 0,
+ 573, 572, 581, 267, 288, 691, 560, 543, 558, 546,
+ 554, 558, 543, 0, 543, 539, 572, 542, 536, 534,
+ 0, 536, 567, 0, 545, 186, 201, 0, 540, 0,
+ 564, 529, 537, 532, 539, 527, 523, 540, 526, 534,
+
+ 521, 519, 0, 527, 526, 529, 111, 221, 548, 547,
+ 536, 0, 545, 0, 297, 512, 0, 512, 513, 0,
+ 515, 0, 508, 507, 225, 522, 513, 517, 514, 513,
+ 505, 503, 512, 510, 491, 502, 501, 506, 494, 491,
+ 492, 491, 488, 498, 497, 491, 496, 496, 486, 486,
+ 482, 484, 477, 486, 0, 306, 0, 509, 476, 483,
+ 480, 485, 0, 480, 484, 479, 474, 467, 479, 482,
+ 223, 498, 468, 465, 0, 495, 473, 468, 459, 0,
+ 466, 0, 0, 0, 469, 0, 0, 468, 488, 458,
+ 463, 452, 0, 450, 456, 0, 481, 0, 0, 452,
+
+ 0, 480, 456, 471, 460, 455, 436, 0, 455, 443,
+ 445, 441, 441, 469, 292, 0, 440, 0, 448, 0,
+ 434, 440, 0, 0, 0, 0, 443, 0, 462, 439,
+ 444, 0, 0, 316, 0, 0, 439, 431, 433, 428,
+ 456, 424, 425, 418, 431, 426, 425, 449, 415, 418,
+ 446, 0, 0, 0, 416, 0, 321, 434, 440, 409,
+ 441, 412, 0, 305, 422, 0, 404, 403, 408, 401,
+ 415, 0, 0, 400, 416, 392, 424, 421, 422, 423,
+ 0, 406, 400, 407, 403, 401, 382, 0, 388, 398,
+ 418, 393, 377, 0, 0, 0, 0, 0, 390, 380,
+
+ 384, 385, 380, 383, 384, 378, 374, 385, 376, 382,
+ 0, 383, 381, 374, 370, 378, 363, 255, 378, 377,
+ 373, 361, 0, 354, 375, 358, 356, 349, 363, 361,
+ 0, 365, 361, 0, 364, 0, 0, 362, 324, 303,
+ 303, 317, 0, 0, 0, 0, 312, 306, 302, 306,
+ 299, 0, 260, 224, 0, 691, 344, 349, 354, 358,
+ 361, 364, 369, 372, 375, 378, 245, 381, 384, 226,
+ 198, 178, 111, 56
} ;
-static yyconst flex_int16_t yy_def[464] =
+static yyconst flex_int16_t yy_def[475] =
{ 0,
- 445, 1, 446, 446, 445, 445, 445, 445, 447, 448,
- 449, 449, 445, 13, 450, 449, 451, 16, 16, 16,
- 16, 16, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 445,
- 452, 445, 447, 445, 445, 448, 445, 449, 449, 13,
- 450, 16, 449, 16, 449, 449, 450, 445, 451, 453,
- 16, 449, 449, 449, 16, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
-
- 445, 452, 445, 445, 49, 56, 454, 58, 445, 455,
- 453, 445, 16, 449, 449, 449, 449, 16, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 454, 456, 109, 109,
- 457, 458, 112, 445, 112, 445, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
-
- 449, 449, 449, 449, 449, 449, 449, 449, 156, 456,
- 458, 459, 164, 164, 164, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 460, 459, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 255, 460, 461, 449, 449, 449, 449,
-
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 462, 461, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 462, 463, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 463,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
-
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 449, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 0, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445
+ 456, 1, 457, 457, 456, 456, 456, 456, 458, 459,
+ 460, 460, 456, 13, 461, 460, 462, 16, 16, 16,
+ 16, 16, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 456,
+ 463, 456, 458, 456, 456, 459, 456, 460, 460, 13,
+ 461, 16, 460, 16, 460, 460, 461, 456, 462, 464,
+ 16, 460, 460, 460, 16, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+
+ 456, 463, 456, 456, 49, 56, 465, 58, 456, 466,
+ 464, 456, 16, 460, 460, 460, 460, 16, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 465, 467, 109, 109,
+ 468, 469, 112, 456, 112, 456, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+
+ 460, 460, 460, 460, 460, 460, 460, 460, 156, 467,
+ 469, 470, 164, 164, 164, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 471, 470, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 256, 471, 472, 460, 460,
+
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 473, 472, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 473, 474, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 474, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 460, 460, 460, 460, 460,
+ 460, 460, 460, 460, 460, 0, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456
} ;
-static yyconst flex_int16_t yy_nxt[728] =
+static yyconst flex_int16_t yy_nxt[739] =
{ 0,
6, 7, 7, 8, 9, 10, 11, 12, 13, 14,
14, 14, 14, 14, 14, 14, 14, 15, 16, 12,
12, 17, 6, 18, 16, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 12, 39, 40, 40, 65,
- 41, 40, 40, 66, 41, 42, 42, 44, 370, 45,
+ 41, 40, 40, 66, 41, 42, 42, 44, 375, 45,
48, 49, 50, 50, 50, 50, 50, 50, 50, 50,
50, 51, 52, 53, 48, 69, 70, 52, 52, 52,
54, 52, 52, 48, 55, 48, 53, 48, 55, 48,
48, 48, 48, 55, 48, 48, 48, 48, 56, 48,
48, 52, 52, 52, 52, 52, 52, 52, 52, 52,
- 51, 52, 71, 348, 72, 61, 52, 52, 52, 52,
+ 51, 52, 71, 352, 72, 61, 52, 52, 52, 52,
52, 52, 62, 73, 63, 77, 80, 82, 84, 81,
78, 86, 74, 85, 83, 87, 93, 89, 94, 95,
- 97, 75, 251, 96, 101, 101, 103, 252, 104, 88,
+ 97, 75, 252, 96, 101, 101, 103, 253, 104, 88,
90, 42, 42, 98, 44, 91, 45, 105, 105, 105,
105, 105, 105, 105, 105, 105, 106, 106, 106, 106,
106, 106, 106, 106, 106, 142, 106, 101, 101, 143,
- 326, 106, 106, 106, 106, 106, 106, 108, 108, 108,
+ 329, 106, 106, 106, 106, 106, 106, 108, 108, 108,
108, 108, 108, 108, 108, 108, 109, 110, 127, 144,
- 253, 128, 110, 110, 110, 110, 110, 110, 115, 145,
- 103, 254, 104, 129, 116, 159, 159, 159, 159, 159,
- 159, 159, 159, 159, 160, 161, 233, 308, 309, 234,
+ 297, 128, 110, 110, 110, 110, 110, 110, 115, 145,
+ 103, 232, 104, 129, 116, 159, 159, 159, 159, 159,
+ 159, 159, 159, 159, 160, 161, 234, 233, 258, 235,
161, 161, 161, 161, 161, 161, 163, 163, 163, 163,
- 163, 163, 163, 163, 163, 164, 165, 419, 196, 420,
- 166, 165, 165, 165, 165, 165, 165, 197, 199, 264,
- 372, 295, 257, 373, 265, 200, 209, 209, 209, 209,
+ 163, 163, 163, 163, 163, 164, 165, 210, 196, 254,
+ 166, 165, 165, 165, 165, 165, 165, 197, 199, 265,
+ 255, 310, 311, 455, 266, 200, 209, 209, 209, 209,
209, 209, 209, 209, 209, 213, 213, 213, 213, 213,
- 213, 213, 213, 213, 214, 215, 210, 444, 443, 166,
+ 213, 213, 213, 213, 214, 215, 428, 454, 429, 166,
215, 215, 215, 215, 215, 215, 165, 165, 165, 165,
165, 165, 165, 165, 165, 215, 215, 215, 215, 215,
- 215, 215, 215, 215, 294, 294, 294, 294, 294, 294,
- 294, 294, 294, 339, 442, 352, 353, 354, 340, 355,
- 341, 441, 342, 379, 380, 440, 439, 438, 437, 436,
- 435, 381, 6, 6, 6, 6, 6, 43, 43, 43,
- 43, 43, 46, 46, 46, 46, 46, 48, 48, 434,
- 48, 57, 57, 57, 59, 59, 59, 102, 102, 102,
- 102, 102, 111, 111, 111, 157, 157, 157, 110, 110,
- 110, 161, 161, 161, 211, 211, 211, 433, 432, 431,
- 430, 429, 428, 427, 426, 425, 424, 423, 422, 421,
-
- 418, 417, 416, 415, 414, 413, 412, 411, 410, 409,
- 408, 407, 406, 405, 404, 403, 402, 401, 400, 399,
- 398, 397, 396, 395, 394, 393, 392, 391, 390, 389,
- 388, 166, 387, 386, 385, 384, 383, 382, 378, 377,
- 376, 375, 374, 371, 369, 368, 367, 366, 365, 364,
- 363, 362, 361, 360, 359, 358, 357, 356, 351, 350,
- 349, 347, 346, 345, 344, 343, 338, 337, 336, 335,
- 334, 333, 332, 331, 330, 329, 328, 327, 325, 324,
- 323, 322, 321, 320, 319, 318, 317, 316, 315, 314,
- 313, 312, 311, 310, 307, 306, 305, 304, 303, 302,
-
- 301, 300, 299, 298, 297, 296, 293, 292, 291, 290,
- 289, 288, 287, 286, 285, 284, 283, 282, 281, 280,
- 279, 278, 277, 276, 275, 274, 273, 272, 271, 270,
- 269, 268, 267, 266, 263, 262, 261, 260, 259, 258,
- 212, 164, 256, 255, 250, 249, 248, 247, 246, 245,
- 244, 243, 242, 241, 240, 239, 238, 237, 236, 235,
- 232, 231, 230, 229, 228, 227, 226, 225, 224, 223,
- 222, 221, 220, 219, 218, 217, 216, 212, 164, 160,
- 158, 109, 208, 207, 206, 205, 204, 203, 202, 201,
- 198, 195, 194, 193, 192, 191, 190, 189, 188, 187,
-
- 186, 185, 184, 183, 182, 181, 180, 179, 178, 177,
- 176, 175, 174, 173, 172, 171, 170, 169, 168, 167,
- 162, 109, 158, 109, 156, 155, 154, 153, 152, 151,
- 150, 149, 148, 147, 146, 141, 140, 139, 138, 137,
- 83, 136, 135, 134, 133, 132, 131, 130, 126, 125,
- 124, 123, 122, 121, 120, 119, 118, 117, 114, 113,
- 112, 60, 107, 58, 48, 47, 100, 99, 92, 79,
- 76, 68, 67, 64, 60, 58, 48, 47, 445, 5,
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
-
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445
+ 215, 215, 215, 215, 296, 296, 296, 296, 296, 296,
+ 296, 296, 296, 343, 453, 356, 357, 358, 344, 359,
+ 345, 377, 346, 452, 378, 384, 385, 451, 450, 449,
+ 448, 447, 446, 386, 6, 6, 6, 6, 6, 43,
+ 43, 43, 43, 43, 46, 46, 46, 46, 46, 48,
+ 48, 445, 48, 57, 57, 57, 59, 59, 59, 102,
+ 102, 102, 102, 102, 111, 111, 111, 157, 157, 157,
+ 110, 110, 110, 161, 161, 161, 211, 211, 211, 444,
+ 443, 442, 441, 440, 439, 438, 437, 436, 435, 434,
+
+ 433, 432, 431, 430, 427, 426, 425, 424, 423, 422,
+ 421, 420, 419, 418, 417, 416, 415, 414, 413, 412,
+ 411, 410, 409, 408, 407, 406, 405, 404, 403, 402,
+ 401, 400, 399, 398, 397, 396, 395, 394, 166, 393,
+ 392, 391, 390, 389, 388, 387, 383, 382, 381, 380,
+ 379, 376, 374, 373, 372, 371, 370, 369, 368, 367,
+ 366, 365, 364, 363, 362, 361, 360, 355, 354, 353,
+ 351, 350, 349, 348, 347, 342, 341, 340, 339, 338,
+ 337, 336, 335, 334, 333, 332, 331, 330, 328, 327,
+ 326, 325, 324, 323, 322, 321, 320, 319, 318, 317,
+
+ 316, 315, 314, 313, 312, 309, 308, 307, 306, 305,
+ 304, 303, 302, 301, 300, 299, 298, 295, 294, 293,
+ 292, 291, 290, 289, 288, 287, 286, 285, 284, 283,
+ 282, 281, 280, 279, 278, 277, 276, 275, 274, 273,
+ 272, 271, 270, 269, 268, 267, 264, 263, 262, 261,
+ 260, 259, 212, 164, 257, 256, 251, 250, 249, 248,
+ 247, 246, 245, 244, 243, 242, 241, 240, 239, 238,
+ 237, 236, 231, 230, 229, 228, 227, 226, 225, 224,
+ 223, 222, 221, 220, 219, 218, 217, 216, 212, 164,
+ 160, 158, 109, 208, 207, 206, 205, 204, 203, 202,
+
+ 201, 198, 195, 194, 193, 192, 191, 190, 189, 188,
+ 187, 186, 185, 184, 183, 182, 181, 180, 179, 178,
+ 177, 176, 175, 174, 173, 172, 171, 170, 169, 168,
+ 167, 162, 109, 158, 109, 156, 155, 154, 153, 152,
+ 151, 150, 149, 148, 147, 146, 141, 140, 139, 138,
+ 137, 83, 136, 135, 134, 133, 132, 131, 130, 126,
+ 125, 124, 123, 122, 121, 120, 119, 118, 117, 114,
+ 113, 112, 60, 107, 58, 48, 47, 100, 99, 92,
+ 79, 76, 68, 67, 64, 60, 58, 48, 47, 456,
+ 5, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 456, 456
} ;
-static yyconst flex_int16_t yy_chk[728] =
+static yyconst flex_int16_t yy_chk[739] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 3, 3, 20,
- 3, 4, 4, 20, 4, 7, 7, 9, 463, 9,
+ 3, 4, 4, 20, 4, 7, 7, 9, 474, 9,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 23, 23, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 24, 462, 24, 18, 16, 16, 16, 16,
+ 16, 16, 24, 473, 24, 18, 16, 16, 16, 16,
16, 16, 18, 25, 18, 27, 29, 30, 31, 29,
27, 32, 25, 31, 30, 32, 35, 33, 35, 36,
37, 25, 207, 36, 40, 40, 41, 207, 41, 32,
33, 42, 42, 37, 43, 33, 43, 49, 49, 49,
49, 49, 49, 49, 49, 49, 56, 56, 56, 56,
56, 56, 56, 56, 56, 89, 56, 101, 101, 89,
- 461, 56, 56, 56, 56, 56, 56, 58, 58, 58,
+ 472, 56, 56, 56, 56, 56, 56, 58, 58, 58,
58, 58, 58, 58, 58, 58, 58, 58, 74, 90,
- 208, 74, 58, 58, 58, 58, 58, 58, 63, 90,
- 102, 208, 102, 74, 63, 109, 109, 109, 109, 109,
- 109, 109, 109, 109, 109, 109, 187, 270, 270, 187,
+ 471, 74, 58, 58, 58, 58, 58, 58, 63, 90,
+ 102, 186, 102, 74, 63, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 187, 186, 470, 187,
109, 109, 109, 109, 109, 109, 112, 112, 112, 112,
- 112, 112, 112, 112, 112, 112, 112, 410, 144, 410,
+ 112, 112, 112, 112, 112, 112, 112, 467, 144, 208,
112, 112, 112, 112, 112, 112, 112, 144, 146, 225,
- 353, 460, 459, 353, 225, 146, 156, 156, 156, 156,
+ 208, 271, 271, 454, 225, 146, 156, 156, 156, 156,
156, 156, 156, 156, 156, 164, 164, 164, 164, 164,
- 164, 164, 164, 164, 164, 164, 456, 443, 442, 164,
+ 164, 164, 164, 164, 164, 164, 418, 453, 418, 164,
164, 164, 164, 164, 164, 164, 165, 165, 165, 165,
165, 165, 165, 165, 165, 215, 215, 215, 215, 215,
- 215, 215, 215, 215, 255, 255, 255, 255, 255, 255,
- 255, 255, 255, 312, 440, 331, 331, 331, 312, 331,
- 312, 439, 312, 360, 360, 438, 437, 436, 432, 431,
- 430, 360, 446, 446, 446, 446, 446, 447, 447, 447,
- 447, 447, 448, 448, 448, 448, 448, 449, 449, 429,
- 449, 450, 450, 450, 451, 451, 451, 452, 452, 452,
- 452, 452, 453, 453, 453, 454, 454, 454, 455, 455,
- 455, 457, 457, 457, 458, 458, 458, 428, 424, 423,
- 421, 420, 419, 418, 417, 416, 414, 413, 412, 411,
-
- 409, 408, 407, 406, 405, 403, 402, 401, 400, 399,
- 398, 397, 396, 395, 394, 393, 387, 386, 385, 384,
- 383, 381, 380, 379, 378, 377, 375, 374, 373, 372,
- 371, 370, 369, 366, 365, 364, 363, 362, 358, 357,
- 356, 355, 354, 351, 347, 346, 345, 344, 343, 342,
- 341, 340, 339, 338, 337, 336, 335, 334, 328, 327,
- 326, 324, 319, 318, 316, 314, 311, 310, 309, 308,
- 307, 305, 304, 303, 302, 301, 300, 298, 295, 293,
- 292, 290, 289, 288, 287, 286, 283, 279, 277, 276,
- 275, 274, 272, 271, 269, 268, 267, 266, 265, 264,
-
- 263, 261, 260, 259, 258, 257, 253, 252, 251, 250,
- 249, 248, 247, 246, 245, 244, 243, 242, 241, 240,
- 239, 238, 237, 236, 235, 234, 233, 232, 231, 230,
- 229, 228, 227, 226, 224, 223, 221, 219, 218, 216,
- 213, 211, 210, 209, 206, 205, 204, 202, 201, 200,
- 199, 198, 197, 196, 195, 194, 193, 192, 191, 189,
- 186, 185, 183, 182, 180, 179, 178, 177, 176, 175,
- 173, 172, 171, 170, 169, 168, 167, 163, 162, 161,
- 159, 157, 155, 154, 153, 152, 150, 149, 148, 147,
- 145, 143, 142, 141, 140, 139, 138, 137, 136, 135,
-
- 134, 132, 131, 130, 129, 128, 127, 126, 125, 124,
- 123, 122, 121, 120, 119, 118, 117, 115, 114, 113,
- 111, 110, 108, 107, 105, 100, 99, 98, 97, 96,
- 95, 94, 93, 92, 91, 88, 87, 86, 85, 84,
- 82, 81, 80, 79, 78, 77, 76, 75, 73, 72,
- 71, 70, 69, 68, 67, 66, 65, 64, 62, 61,
- 60, 59, 57, 51, 50, 46, 39, 38, 34, 28,
- 26, 22, 21, 19, 17, 15, 14, 10, 5, 445,
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
-
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445
+ 215, 215, 215, 215, 256, 256, 256, 256, 256, 256,
+ 256, 256, 256, 315, 451, 334, 334, 334, 315, 334,
+ 315, 357, 315, 450, 357, 364, 364, 449, 448, 447,
+ 442, 441, 440, 364, 457, 457, 457, 457, 457, 458,
+ 458, 458, 458, 458, 459, 459, 459, 459, 459, 460,
+ 460, 439, 460, 461, 461, 461, 462, 462, 462, 463,
+ 463, 463, 463, 463, 464, 464, 464, 465, 465, 465,
+ 466, 466, 466, 468, 468, 468, 469, 469, 469, 438,
+ 435, 433, 432, 430, 429, 428, 427, 426, 425, 424,
+
+ 422, 421, 420, 419, 417, 416, 415, 414, 413, 412,
+ 410, 409, 408, 407, 406, 405, 404, 403, 402, 401,
+ 400, 399, 393, 392, 391, 390, 389, 387, 386, 385,
+ 384, 383, 382, 380, 379, 378, 377, 376, 375, 374,
+ 371, 370, 369, 368, 367, 365, 362, 361, 360, 359,
+ 358, 355, 351, 350, 349, 348, 347, 346, 345, 344,
+ 343, 342, 341, 340, 339, 338, 337, 331, 330, 329,
+ 327, 322, 321, 319, 317, 314, 313, 312, 311, 310,
+ 309, 307, 306, 305, 304, 303, 302, 300, 297, 295,
+ 294, 292, 291, 290, 289, 288, 285, 281, 279, 278,
+
+ 277, 276, 274, 273, 272, 270, 269, 268, 267, 266,
+ 265, 264, 262, 261, 260, 259, 258, 254, 253, 252,
+ 251, 250, 249, 248, 247, 246, 245, 244, 243, 242,
+ 241, 240, 239, 238, 237, 236, 235, 234, 233, 232,
+ 231, 230, 229, 228, 227, 226, 224, 223, 221, 219,
+ 218, 216, 213, 211, 210, 209, 206, 205, 204, 202,
+ 201, 200, 199, 198, 197, 196, 195, 194, 193, 192,
+ 191, 189, 185, 183, 182, 180, 179, 178, 177, 176,
+ 175, 173, 172, 171, 170, 169, 168, 167, 163, 162,
+ 161, 159, 157, 155, 154, 153, 152, 150, 149, 148,
+
+ 147, 145, 143, 142, 141, 140, 139, 138, 137, 136,
+ 135, 134, 132, 131, 130, 129, 128, 127, 126, 125,
+ 124, 123, 122, 121, 120, 119, 118, 117, 115, 114,
+ 113, 111, 110, 108, 107, 105, 100, 99, 98, 97,
+ 96, 95, 94, 93, 92, 91, 88, 87, 86, 85,
+ 84, 82, 81, 80, 79, 78, 77, 76, 75, 73,
+ 72, 71, 70, 69, 68, 67, 66, 65, 64, 62,
+ 61, 60, 59, 57, 51, 50, 46, 39, 38, 34,
+ 28, 26, 22, 21, 19, 17, 15, 14, 10, 5,
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 456, 456, 456, 456,
+ 456, 456, 456, 456, 456, 456, 456, 456
} ;
/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[84] =
+static yyconst flex_int32_t yy_rule_can_match_eol[85] =
{ 0,
1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
- 1, 0, 1, 0, };
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+ 0, 1, 0, 1, 0, };
/* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed.
@@ -760,7 +773,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[84] =
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "knot/conf/cf-lex.l"
+#line 1 "cf-lex.l"
/* Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
@@ -785,7 +798,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[84] =
*
* IP address conversions from BIRD, (c) 1998--2000 Martin Mares <mj@ucw.cz>
*/
-#line 26 "knot/conf/cf-lex.l"
+#line 26 "cf-lex.l"
#include <config.h>
#include <errno.h>
@@ -828,7 +841,7 @@ int hex2bin(const char* src, char *dst, size_t len) {
#define YY_NO_INPUT 1
-#line 832 "knot/conf/libknotd_la-cf-lex.c"
+#line 845 "knot/conf/libknotd_la-cf-lex.c"
#define INITIAL 0
#define include 1
@@ -856,8 +869,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char;
- yy_size_t yy_n_chars;
- yy_size_t yyleng_r;
+ int yy_n_chars;
+ int yyleng_r;
char *yy_c_buf_p;
int yy_init;
int yy_start;
@@ -910,7 +923,7 @@ FILE *cf_get_out (yyscan_t yyscanner );
void cf_set_out (FILE * out_str ,yyscan_t yyscanner );
-yy_size_t cf_get_leng (yyscan_t yyscanner );
+int cf_get_leng (yyscan_t yyscanner );
char *cf_get_text (yyscan_t yyscanner );
@@ -918,10 +931,6 @@ int cf_get_lineno (yyscan_t yyscanner );
void cf_set_lineno (int line_number ,yyscan_t yyscanner );
-int cf_get_column (yyscan_t yyscanner );
-
-void cf_set_column (int column_no ,yyscan_t yyscanner );
-
YYSTYPE * cf_get_lval (yyscan_t yyscanner );
void cf_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -958,7 +967,12 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1062,9 +1076,9 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 87 "knot/conf/cf-lex.l"
+#line 87 "cf-lex.l"
-#line 1068 "knot/conf/libknotd_la-cf-lex.c"
+#line 1082 "knot/conf/libknotd_la-cf-lex.c"
yylval = yylval_param;
@@ -1119,13 +1133,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 446 )
+ if ( yy_current_state >= 457 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 680 );
+ while ( yy_base[yy_current_state] != 691 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -1164,303 +1178,308 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
-#line 88 "knot/conf/cf-lex.l"
+#line 88 "cf-lex.l"
/* Ignore comments */;
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 89 "knot/conf/cf-lex.l"
+#line 89 "cf-lex.l"
/* Ignore whitespace */;
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 90 "knot/conf/cf-lex.l"
+#line 90 "cf-lex.l"
{ return yytext[0]; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 91 "knot/conf/cf-lex.l"
+#line 91 "cf-lex.l"
{ lval.t = yytext; return SYSTEM; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 92 "knot/conf/cf-lex.l"
+#line 92 "cf-lex.l"
{ lval.t = yytext; return IDENTITY; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 93 "knot/conf/cf-lex.l"
+#line 93 "cf-lex.l"
{ lval.t = yytext; return HOSTNAME; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 94 "knot/conf/cf-lex.l"
+#line 94 "cf-lex.l"
{ lval.t = yytext; return SVERSION; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 95 "knot/conf/cf-lex.l"
+#line 95 "cf-lex.l"
{ lval.t = yytext; return NSID; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 96 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return STORAGE; }
+#line 96 "cf-lex.l"
+{ lval.t = yytext; return MAX_UDP_PAYLOAD; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 97 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return KEY; }
+#line 97 "cf-lex.l"
+{ lval.t = yytext; return STORAGE; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 98 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return KEYS; }
+#line 98 "cf-lex.l"
+{ lval.t = yytext; return KEY; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 99 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return REMOTES; }
+#line 99 "cf-lex.l"
+{ lval.t = yytext; return KEYS; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 100 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return GROUPS; }
+#line 100 "cf-lex.l"
+{ lval.t = yytext; return REMOTES; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 102 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return ZONES; }
+#line 101 "cf-lex.l"
+{ lval.t = yytext; return GROUPS; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 103 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return FILENAME; }
+#line 103 "cf-lex.l"
+{ lval.t = yytext; return ZONES; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 104 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return DISABLE_ANY; }
+#line 104 "cf-lex.l"
+{ lval.t = yytext; return FILENAME; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 105 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return SEMANTIC_CHECKS; }
+#line 105 "cf-lex.l"
+{ lval.t = yytext; return DISABLE_ANY; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 106 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return NOTIFY_RETRIES; }
+#line 106 "cf-lex.l"
+{ lval.t = yytext; return SEMANTIC_CHECKS; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 107 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return NOTIFY_TIMEOUT; }
+#line 107 "cf-lex.l"
+{ lval.t = yytext; return NOTIFY_RETRIES; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 108 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return DBSYNC_TIMEOUT; }
+#line 108 "cf-lex.l"
+{ lval.t = yytext; return NOTIFY_TIMEOUT; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 109 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return IXFR_FSLIMIT; }
+#line 109 "cf-lex.l"
+{ lval.t = yytext; return DBSYNC_TIMEOUT; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 110 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return XFR_IN; }
+#line 110 "cf-lex.l"
+{ lval.t = yytext; return IXFR_FSLIMIT; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 111 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return XFR_OUT; }
+#line 111 "cf-lex.l"
+{ lval.t = yytext; return XFR_IN; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 112 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return UPDATE_IN; }
+#line 112 "cf-lex.l"
+{ lval.t = yytext; return XFR_OUT; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 113 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return NOTIFY_IN; }
+#line 113 "cf-lex.l"
+{ lval.t = yytext; return UPDATE_IN; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 114 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return NOTIFY_OUT; }
+#line 114 "cf-lex.l"
+{ lval.t = yytext; return NOTIFY_IN; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 115 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return WORKERS; }
+#line 115 "cf-lex.l"
+{ lval.t = yytext; return NOTIFY_OUT; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 116 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return USER; }
+#line 116 "cf-lex.l"
+{ lval.t = yytext; return WORKERS; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 117 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return PIDFILE; }
+#line 117 "cf-lex.l"
+{ lval.t = yytext; return USER; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 118 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return RUNDIR; }
+#line 118 "cf-lex.l"
+{ lval.t = yytext; return PIDFILE; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 119 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return BUILD_DIFFS; }
+#line 119 "cf-lex.l"
+{ lval.t = yytext; return RUNDIR; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 120 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return MAX_CONN_IDLE; }
+#line 120 "cf-lex.l"
+{ lval.t = yytext; return BUILD_DIFFS; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 121 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return MAX_CONN_HS; }
+#line 121 "cf-lex.l"
+{ lval.t = yytext; return MAX_CONN_IDLE; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 122 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return MAX_CONN_REPLY; }
+#line 122 "cf-lex.l"
+{ lval.t = yytext; return MAX_CONN_HS; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 123 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return RATE_LIMIT; }
+#line 123 "cf-lex.l"
+{ lval.t = yytext; return MAX_CONN_REPLY; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 124 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return RATE_LIMIT_SIZE; }
+#line 124 "cf-lex.l"
+{ lval.t = yytext; return RATE_LIMIT; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 125 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return RATE_LIMIT_SLIP; }
+#line 125 "cf-lex.l"
+{ lval.t = yytext; return RATE_LIMIT_SIZE; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 126 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return TRANSFERS; }
+#line 126 "cf-lex.l"
+{ lval.t = yytext; return RATE_LIMIT_SLIP; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 128 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return INTERFACES; }
+#line 127 "cf-lex.l"
+{ lval.t = yytext; return TRANSFERS; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 129 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return ADDRESS; }
+#line 129 "cf-lex.l"
+{ lval.t = yytext; return INTERFACES; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 130 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return PORT; }
+#line 130 "cf-lex.l"
+{ lval.t = yytext; return ADDRESS; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 131 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return VIA; }
+#line 131 "cf-lex.l"
+{ lval.t = yytext; return PORT; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 133 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return CONTROL; }
+#line 132 "cf-lex.l"
+{ lval.t = yytext; return VIA; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 134 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return ALLOW; }
+#line 134 "cf-lex.l"
+{ lval.t = yytext; return CONTROL; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 135 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return LISTEN_ON; }
+#line 135 "cf-lex.l"
+{ lval.t = yytext; return ALLOW; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 137 "knot/conf/cf-lex.l"
-{ lval.t = yytext; return LOG; }
+#line 136 "cf-lex.l"
+{ lval.t = yytext; return LISTEN_ON; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 139 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_ANY; return LOG_SRC; }
+#line 138 "cf-lex.l"
+{ lval.t = yytext; return LOG; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 140 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_SERVER; return LOG_SRC; }
+#line 140 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_ANY; return LOG_SRC; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 141 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_ANSWER; return LOG_SRC; }
+#line 141 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_SERVER; return LOG_SRC; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 142 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_ZONE; return LOG_SRC; }
+#line 142 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_ANSWER; return LOG_SRC; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 143 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOGT_STDOUT; return LOG_DEST; }
+#line 143 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_ZONE; return LOG_SRC; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 144 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOGT_STDERR; return LOG_DEST; }
+#line 144 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOGT_STDOUT; return LOG_DEST; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 145 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOGT_SYSLOG; return LOG_DEST; }
+#line 145 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOGT_STDERR; return LOG_DEST; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 146 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_UPTO(LOG_DEBUG); return LOG_LEVEL; }
+#line 146 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOGT_SYSLOG; return LOG_DEST; }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 147 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_MASK(LOG_DEBUG); return LOG_LEVEL; }
+#line 147 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_UPTO(LOG_DEBUG); return LOG_LEVEL; }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 148 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_MASK(LOG_INFO); return LOG_LEVEL; }
+#line 148 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_MASK(LOG_DEBUG); return LOG_LEVEL; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 149 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_MASK(LOG_NOTICE); return LOG_LEVEL; }
+#line 149 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_MASK(LOG_INFO); return LOG_LEVEL; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 150 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_MASK(LOG_WARNING); return LOG_LEVEL; }
+#line 150 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_MASK(LOG_NOTICE); return LOG_LEVEL; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 151 "knot/conf/cf-lex.l"
-{ lval.t = yytext; lval.i = LOG_MASK(LOG_ERR); return LOG_LEVEL; }
+#line 151 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_MASK(LOG_WARNING); return LOG_LEVEL; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 153 "knot/conf/cf-lex.l"
+#line 152 "cf-lex.l"
+{ lval.t = yytext; lval.i = LOG_MASK(LOG_ERR); return LOG_LEVEL; }
+ YY_BREAK
+case 61:
+YY_RULE_SETUP
+#line 154 "cf-lex.l"
{
lval.t = yytext;
lval.i = 0;
@@ -1470,14 +1489,14 @@ YY_RULE_SETUP
return BOOL;
}
YY_BREAK
-case 61:
+case 62:
YY_RULE_SETUP
-#line 162 "knot/conf/cf-lex.l"
+#line 163 "cf-lex.l"
BEGIN(include);
YY_BREAK
-case 62:
+case 63:
YY_RULE_SETUP
-#line 164 "knot/conf/cf-lex.l"
+#line 165 "cf-lex.l"
{
size_t mpos = strlen(yytext) - 1;
char multiplier = yytext[mpos];
@@ -1500,9 +1519,9 @@ YY_RULE_SETUP
return INTERVAL;
}
YY_BREAK
-case 63:
+case 64:
YY_RULE_SETUP
-#line 186 "knot/conf/cf-lex.l"
+#line 187 "cf-lex.l"
{
size_t mpos = strlen(yytext) - 1;
char multiplier = yytext[mpos];
@@ -1524,17 +1543,17 @@ YY_RULE_SETUP
return SIZE;
}
YY_BREAK
-case 64:
+case 65:
YY_RULE_SETUP
-#line 207 "knot/conf/cf-lex.l"
+#line 208 "cf-lex.l"
{
lval.i = atol(yytext);
return NUM;
}
YY_BREAK
-case 65:
+case 66:
YY_RULE_SETUP
-#line 212 "knot/conf/cf-lex.l"
+#line 213 "cf-lex.l"
{
unsigned char buf[sizeof(struct in_addr)];
if (inet_pton(AF_INET, yytext, buf)) {
@@ -1544,9 +1563,9 @@ YY_RULE_SETUP
cf_error(yyscanner, "Invalid IP address.");
}
YY_BREAK
-case 66:
+case 67:
YY_RULE_SETUP
-#line 221 "knot/conf/cf-lex.l"
+#line 222 "cf-lex.l"
{
#ifdef DISABLE_IPV6
lval.t = strdup(yytext);
@@ -1563,9 +1582,9 @@ YY_RULE_SETUP
#endif
}
YY_BREAK
-case 67:
+case 68:
YY_RULE_SETUP
-#line 237 "knot/conf/cf-lex.l"
+#line 238 "cf-lex.l"
{
#ifdef DISABLE_IPV6
lval.t = strdup(yytext);
@@ -1581,9 +1600,9 @@ YY_RULE_SETUP
#endif
}
YY_BREAK
-case 68:
+case 69:
YY_RULE_SETUP
-#line 252 "knot/conf/cf-lex.l"
+#line 253 "cf-lex.l"
{
lval.t = NULL;
lval.l = 0;
@@ -1609,89 +1628,94 @@ YY_RULE_SETUP
return HEXSTR;
}
YY_BREAK
-case 69:
+case 70:
YY_RULE_SETUP
-#line 277 "knot/conf/cf-lex.l"
+#line 278 "cf-lex.l"
{ lval.alg = KNOT_TSIG_ALG_GSS_TSIG; return TSIG_ALGO_NAME; }
YY_BREAK
-case 70:
+case 71:
YY_RULE_SETUP
-#line 278 "knot/conf/cf-lex.l"
+#line 279 "cf-lex.l"
{ lval.alg = KNOT_TSIG_ALG_HMAC_MD5; return TSIG_ALGO_NAME; }
YY_BREAK
-case 71:
+case 72:
YY_RULE_SETUP
-#line 279 "knot/conf/cf-lex.l"
+#line 280 "cf-lex.l"
{ lval.alg = KNOT_TSIG_ALG_HMAC_SHA1; return TSIG_ALGO_NAME; }
YY_BREAK
-case 72:
+case 73:
YY_RULE_SETUP
-#line 280 "knot/conf/cf-lex.l"
+#line 281 "cf-lex.l"
{ lval.alg = KNOT_TSIG_ALG_HMAC_SHA224; return TSIG_ALGO_NAME; }
YY_BREAK
-case 73:
+case 74:
YY_RULE_SETUP
-#line 281 "knot/conf/cf-lex.l"
+#line 282 "cf-lex.l"
{ lval.alg = KNOT_TSIG_ALG_HMAC_SHA256; return TSIG_ALGO_NAME; }
YY_BREAK
-case 74:
+case 75:
YY_RULE_SETUP
-#line 282 "knot/conf/cf-lex.l"
+#line 283 "cf-lex.l"
{ lval.alg = KNOT_TSIG_ALG_HMAC_SHA384; return TSIG_ALGO_NAME; }
YY_BREAK
-case 75:
+case 76:
YY_RULE_SETUP
-#line 283 "knot/conf/cf-lex.l"
+#line 284 "cf-lex.l"
{ lval.alg = KNOT_TSIG_ALG_HMAC_SHA512; return TSIG_ALGO_NAME; }
YY_BREAK
-case 76:
+case 77:
YY_RULE_SETUP
-#line 285 "knot/conf/cf-lex.l"
+#line 286 "cf-lex.l"
{
yytext[yyleng-1] = 0;
lval.t = strdup(yytext + 1);
return TEXT;
}
YY_BREAK
-case 77:
-/* rule 77 can match eol */
+case 78:
+/* rule 78 can match eol */
YY_RULE_SETUP
-#line 291 "knot/conf/cf-lex.l"
+#line 292 "cf-lex.l"
cf_error(yyscanner, "Unterminated string.");
YY_BREAK
-case 78:
+case 79:
YY_RULE_SETUP
-#line 293 "knot/conf/cf-lex.l"
+#line 294 "cf-lex.l"
{
lval.t = strdup(yytext);
return TEXT /* Last resort, alphanumeric word. */;
}
YY_BREAK
-case 79:
+case 80:
YY_RULE_SETUP
-#line 298 "knot/conf/cf-lex.l"
+#line 299 "cf-lex.l"
/* Optional : in assignments. */;
YY_BREAK
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(include):
-#line 300 "knot/conf/cf-lex.l"
+#line 301 "cf-lex.l"
{
- char *name = conf_includes_pop(yyextra->includes);
- free(name);
+ conf_include_t *inc = conf_includes_pop(yyextra->includes);
+ free(inc->filename);
+ if (inc->handle) {
+ fclose(inc->handle);
+ }
+
cf_pop_buffer_state(yyscanner);
- if (!YY_CURRENT_BUFFER)
+ if (!YY_CURRENT_BUFFER) {
return END;
+ }
}
YY_BREAK
-case 80:
-/* rule 80 can match eol */
+case 81:
+/* rule 81 can match eol */
YY_RULE_SETUP
-#line 308 "knot/conf/cf-lex.l"
+#line 314 "cf-lex.l"
YY_BREAK
-case 81:
+case 82:
YY_RULE_SETUP
-#line 309 "knot/conf/cf-lex.l"
+#line 315 "cf-lex.l"
{
BEGIN(INITIAL);
@@ -1711,32 +1735,33 @@ YY_RULE_SETUP
}
// retrieved relative to previous config
- char *filename = conf_includes_top(yyextra->includes);
+ conf_include_t *inc = conf_includes_top(yyextra->includes);
- FILE *included = fopen(filename, "r");
+ FILE *included = fopen(inc->filename, "r");
if (!included) {
- cf_error(yyscanner, "cannot open file '%s'", filename);
+ cf_error(yyscanner, "cannot open file '%s'", inc->filename);
conf_includes_pop(yyextra->includes);
- free(filename);
+ free(inc->filename);
return END;
}
+ inc->handle = included;
YY_BUFFER_STATE bs = cf__create_buffer(included,YY_BUF_SIZE,yyscanner);
cf_push_buffer_state(bs,yyscanner);
}
YY_BREAK
-case 82:
-/* rule 82 can match eol */
+case 83:
+/* rule 83 can match eol */
YY_RULE_SETUP
-#line 342 "knot/conf/cf-lex.l"
+#line 349 "cf-lex.l"
cf_error(yyscanner, "Unterminated string.");
YY_BREAK
-case 83:
+case 84:
YY_RULE_SETUP
-#line 344 "knot/conf/cf-lex.l"
+#line 351 "cf-lex.l"
ECHO;
YY_BREAK
-#line 1740 "knot/conf/libknotd_la-cf-lex.c"
+#line 1765 "knot/conf/libknotd_la-cf-lex.c"
case YY_END_OF_BUFFER:
{
@@ -1921,21 +1946,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
int yy_c_buf_p_offset =
(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
- yy_size_t new_size = b->yy_buf_size * 2;
+ int new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1966,7 +1991,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- yyg->yy_n_chars, num_to_read );
+ yyg->yy_n_chars, (size_t) num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
}
@@ -2028,7 +2053,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 446 )
+ if ( yy_current_state >= 457 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2057,13 +2082,12 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 446 )
+ if ( yy_current_state >= 457 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 445);
+ yy_is_jam = (yy_current_state == 456);
- (void)yyg;
return yy_is_jam ? 0 : yy_current_state;
}
@@ -2092,7 +2116,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else
{ /* need more input */
- yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+ int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) )
@@ -2263,6 +2287,10 @@ static void cf__load_buffer_state (yyscan_t yyscanner)
cf_free((void *) b ,yyscanner );
}
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a cf_restart() or at EOF.
@@ -2379,7 +2407,7 @@ void cf_pop_buffer_state (yyscan_t yyscanner)
*/
static void cf_ensure_buffer_stack (yyscan_t yyscanner)
{
- yy_size_t num_to_alloc;
+ int num_to_alloc;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) {
@@ -2477,7 +2505,7 @@ YY_BUFFER_STATE cf__scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE cf__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE cf__scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
char *buf;
@@ -2592,7 +2620,7 @@ FILE *cf_get_out (yyscan_t yyscanner)
/** Get the length of the current token.
* @param yyscanner The scanner object.
*/
-yy_size_t cf_get_leng (yyscan_t yyscanner)
+int cf_get_leng (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng;
@@ -2628,7 +2656,7 @@ void cf_set_lineno (int line_number , yyscan_t yyscanner)
/* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
- YY_FATAL_ERROR( "cf_set_lineno called with no buffer" );
+ yy_fatal_error( "cf_set_lineno called with no buffer" , yyscanner);
yylineno = line_number;
}
@@ -2643,7 +2671,7 @@ void cf_set_column (int column_no , yyscan_t yyscanner)
/* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
- YY_FATAL_ERROR( "cf_set_column called with no buffer" );
+ yy_fatal_error( "cf_set_column called with no buffer" , yyscanner);
yycolumn = column_no;
}
@@ -2867,7 +2895,7 @@ void cf_free (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 344 "knot/conf/cf-lex.l"
+#line 351 "cf-lex.l"
diff --git a/src/knot/conf/libknotd_la-cf-parse.c b/src/knot/conf/libknotd_la-cf-parse.c
index 5540c83..7832a44 100644
--- a/src/knot/conf/libknotd_la-cf-parse.c
+++ b/src/knot/conf/libknotd_la-cf-parse.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
+/* A Bison parser, made by GNU Bison 2.5. */
/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.7.12-4996"
+#define YYBISON_VERSION "2.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -58,6 +58,8 @@
/* Pull parsers. */
#define YYPULL 1
+/* Using locations. */
+#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
#define yyparse cf_parse
@@ -68,9 +70,11 @@
#define yydebug cf_debug
#define yynerrs cf_nerrs
+
/* Copy the first part of user declarations. */
-/* Line 371 of yacc.c */
-#line 23 "knot/conf/cf-parse.y"
+
+/* Line 268 of yacc.c */
+#line 23 "cf-parse.y"
/* Headers */
#include <config.h>
@@ -82,6 +86,7 @@
#include "common/sockaddr.h"
#include "libknot/dname.h"
#include "libknot/binary.h"
+#include "libknot/edns.h"
#include "knot/conf/conf.h"
#include "libknotd_la-cf-parse.h" /* Automake generated header. */
@@ -463,16 +468,14 @@ static void ident_auto(int tok, conf_t *conf, bool val)
}
-/* Line 371 of yacc.c */
-#line 468 "knot/conf/libknotd_la-cf-parse.c"
-# ifndef YY_NULL
-# if defined __cplusplus && 201103L <= __cplusplus
-# define YY_NULL nullptr
-# else
-# define YY_NULL 0
-# endif
-# endif
+/* Line 268 of yacc.c */
+#line 474 "knot/conf/libknotd_la-cf-parse.c"
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
@@ -482,18 +485,12 @@ static void ident_auto(int tok, conf_t *conf, bool val)
# define YYERROR_VERBOSE 0
#endif
-/* In a future release of Bison, this section will be replaced
- by #include "y.tab.h". */
-#ifndef YY_CF_KNOT_CONF_LIBKNOTD_LA_CF_PARSE_H_INCLUDED
-# define YY_CF_KNOT_CONF_LIBKNOTD_LA_CF_PARSE_H_INCLUDED
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int cf_debug;
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
#endif
+
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -516,47 +513,48 @@ extern int cf_debug;
STORAGE = 271,
KEY = 272,
KEYS = 273,
- TSIG_ALGO_NAME = 274,
- WORKERS = 275,
- USER = 276,
- RUNDIR = 277,
- PIDFILE = 278,
- REMOTES = 279,
- GROUPS = 280,
- ZONES = 281,
- FILENAME = 282,
- DISABLE_ANY = 283,
- SEMANTIC_CHECKS = 284,
- NOTIFY_RETRIES = 285,
- NOTIFY_TIMEOUT = 286,
- DBSYNC_TIMEOUT = 287,
- IXFR_FSLIMIT = 288,
- XFR_IN = 289,
- XFR_OUT = 290,
- UPDATE_IN = 291,
- NOTIFY_IN = 292,
- NOTIFY_OUT = 293,
- BUILD_DIFFS = 294,
- MAX_CONN_IDLE = 295,
- MAX_CONN_HS = 296,
- MAX_CONN_REPLY = 297,
- RATE_LIMIT = 298,
- RATE_LIMIT_SIZE = 299,
- RATE_LIMIT_SLIP = 300,
- TRANSFERS = 301,
- INTERFACES = 302,
- ADDRESS = 303,
- PORT = 304,
- IPA = 305,
- IPA6 = 306,
- VIA = 307,
- CONTROL = 308,
- ALLOW = 309,
- LISTEN_ON = 310,
- LOG = 311,
- LOG_DEST = 312,
- LOG_SRC = 313,
- LOG_LEVEL = 314
+ MAX_UDP_PAYLOAD = 274,
+ TSIG_ALGO_NAME = 275,
+ WORKERS = 276,
+ USER = 277,
+ RUNDIR = 278,
+ PIDFILE = 279,
+ REMOTES = 280,
+ GROUPS = 281,
+ ZONES = 282,
+ FILENAME = 283,
+ DISABLE_ANY = 284,
+ SEMANTIC_CHECKS = 285,
+ NOTIFY_RETRIES = 286,
+ NOTIFY_TIMEOUT = 287,
+ DBSYNC_TIMEOUT = 288,
+ IXFR_FSLIMIT = 289,
+ XFR_IN = 290,
+ XFR_OUT = 291,
+ UPDATE_IN = 292,
+ NOTIFY_IN = 293,
+ NOTIFY_OUT = 294,
+ BUILD_DIFFS = 295,
+ MAX_CONN_IDLE = 296,
+ MAX_CONN_HS = 297,
+ MAX_CONN_REPLY = 298,
+ RATE_LIMIT = 299,
+ RATE_LIMIT_SIZE = 300,
+ RATE_LIMIT_SLIP = 301,
+ TRANSFERS = 302,
+ INTERFACES = 303,
+ ADDRESS = 304,
+ PORT = 305,
+ IPA = 306,
+ IPA6 = 307,
+ VIA = 308,
+ CONTROL = 309,
+ ALLOW = 310,
+ LISTEN_ON = 311,
+ LOG = 312,
+ LOG_DEST = 313,
+ LOG_SRC = 314,
+ LOG_LEVEL = 315
};
#endif
/* Tokens. */
@@ -576,55 +574,58 @@ extern int cf_debug;
#define STORAGE 271
#define KEY 272
#define KEYS 273
-#define TSIG_ALGO_NAME 274
-#define WORKERS 275
-#define USER 276
-#define RUNDIR 277
-#define PIDFILE 278
-#define REMOTES 279
-#define GROUPS 280
-#define ZONES 281
-#define FILENAME 282
-#define DISABLE_ANY 283
-#define SEMANTIC_CHECKS 284
-#define NOTIFY_RETRIES 285
-#define NOTIFY_TIMEOUT 286
-#define DBSYNC_TIMEOUT 287
-#define IXFR_FSLIMIT 288
-#define XFR_IN 289
-#define XFR_OUT 290
-#define UPDATE_IN 291
-#define NOTIFY_IN 292
-#define NOTIFY_OUT 293
-#define BUILD_DIFFS 294
-#define MAX_CONN_IDLE 295
-#define MAX_CONN_HS 296
-#define MAX_CONN_REPLY 297
-#define RATE_LIMIT 298
-#define RATE_LIMIT_SIZE 299
-#define RATE_LIMIT_SLIP 300
-#define TRANSFERS 301
-#define INTERFACES 302
-#define ADDRESS 303
-#define PORT 304
-#define IPA 305
-#define IPA6 306
-#define VIA 307
-#define CONTROL 308
-#define ALLOW 309
-#define LISTEN_ON 310
-#define LOG 311
-#define LOG_DEST 312
-#define LOG_SRC 313
-#define LOG_LEVEL 314
+#define MAX_UDP_PAYLOAD 274
+#define TSIG_ALGO_NAME 275
+#define WORKERS 276
+#define USER 277
+#define RUNDIR 278
+#define PIDFILE 279
+#define REMOTES 280
+#define GROUPS 281
+#define ZONES 282
+#define FILENAME 283
+#define DISABLE_ANY 284
+#define SEMANTIC_CHECKS 285
+#define NOTIFY_RETRIES 286
+#define NOTIFY_TIMEOUT 287
+#define DBSYNC_TIMEOUT 288
+#define IXFR_FSLIMIT 289
+#define XFR_IN 290
+#define XFR_OUT 291
+#define UPDATE_IN 292
+#define NOTIFY_IN 293
+#define NOTIFY_OUT 294
+#define BUILD_DIFFS 295
+#define MAX_CONN_IDLE 296
+#define MAX_CONN_HS 297
+#define MAX_CONN_REPLY 298
+#define RATE_LIMIT 299
+#define RATE_LIMIT_SIZE 300
+#define RATE_LIMIT_SLIP 301
+#define TRANSFERS 302
+#define INTERFACES 303
+#define ADDRESS 304
+#define PORT 305
+#define IPA 306
+#define IPA6 307
+#define VIA 308
+#define CONTROL 309
+#define ALLOW 310
+#define LISTEN_ON 311
+#define LOG 312
+#define LOG_DEST 313
+#define LOG_SRC 314
+#define LOG_LEVEL 315
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-/* Line 387 of yacc.c */
-#line 421 "knot/conf/cf-parse.y"
+
+/* Line 293 of yacc.c */
+#line 422 "cf-parse.y"
struct {
char *t;
@@ -634,8 +635,9 @@ typedef union YYSTYPE
} tok;
-/* Line 387 of yacc.c */
-#line 639 "knot/conf/libknotd_la-cf-parse.c"
+
+/* Line 293 of yacc.c */
+#line 641 "knot/conf/libknotd_la-cf-parse.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -643,26 +645,11 @@ typedef union YYSTYPE
#endif
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int cf_parse (void *YYPARSE_PARAM);
-#else
-int cf_parse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int cf_parse (void *scanner);
-#else
-int cf_parse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-#endif /* !YY_CF_KNOT_CONF_LIBKNOTD_LA_CF_PARSE_H_INCLUDED */
-
/* Copy the second part of user declarations. */
-/* Line 390 of yacc.c */
-#line 666 "knot/conf/libknotd_la-cf-parse.c"
+
+/* Line 343 of yacc.c */
+#line 653 "knot/conf/libknotd_la-cf-parse.c"
#ifdef short
# undef short
@@ -715,33 +702,24 @@ typedef short int yytype_int16;
# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-# define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+# define YY_(msgid) dgettext ("bison-runtime", msgid)
# endif
# endif
# ifndef YY_
-# define YY_(Msgid) Msgid
-# endif
-#endif
-
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later. */
-# if (! defined __GNUC__ || __GNUC__ < 2 \
- || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-# define __attribute__(Spec) /* empty */
+# define YY_(msgid) msgid
# endif
#endif
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
+# define YYUSE(e) ((void) (e))
#else
-# define YYUSE(E) /* empty */
+# define YYUSE(e) /* empty */
#endif
-
/* Identity function, used to suppress warnings about constant conditions. */
#ifndef lint
-# define YYID(N) (N)
+# define YYID(n) (n)
#else
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
@@ -777,7 +755,6 @@ YYID (yyi)
# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
- /* Use EXIT_SUCCESS as a witness for stdlib.h. */
# ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0
# endif
@@ -869,20 +846,20 @@ union yyalloc
#endif
#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST. The source and destination do
+/* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */
# ifndef YYCOPY
# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(Dst, Src, Count) \
- __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
-# define YYCOPY(Dst, Src, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (Dst)[yyi] = (Src)[yyi]; \
- } \
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
while (YYID (0))
# endif
# endif
@@ -891,20 +868,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 267
+#define YYLAST 271
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 66
+#define YYNTOKENS 67
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 35
/* YYNRULES -- Number of rules. */
-#define YYNRULES 150
+#define YYNRULES 151
/* YYNRULES -- Number of states. */
-#define YYNSTATES 297
+#define YYNSTATES 300
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 314
+#define YYMAXUTOK 315
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -916,15 +893,15 @@ static const yytype_uint8 yytranslate[] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 65, 2, 2, 64, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 60,
- 2, 2, 2, 2, 61, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 66, 2, 2, 65, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 61,
+ 2, 2, 2, 2, 62, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 62, 2, 63, 2, 2, 2, 2,
+ 2, 2, 2, 63, 2, 64, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -943,7 +920,7 @@ static const yytype_uint8 yytranslate[] =
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59
+ 55, 56, 57, 58, 59, 60
};
#if YYDEBUG
@@ -954,127 +931,128 @@ static const yytype_uint16 yyprhs[] =
0, 0, 3, 6, 7, 10, 11, 13, 15, 17,
19, 21, 23, 24, 29, 34, 41, 46, 53, 56,
62, 65, 70, 75, 80, 85, 90, 95, 100, 105,
- 110, 115, 120, 126, 131, 136, 141, 146, 151, 156,
- 161, 166, 171, 176, 179, 185, 186, 188, 190, 192,
- 194, 196, 197, 202, 207, 214, 221, 226, 233, 240,
- 245, 250, 255, 260, 263, 269, 271, 272, 274, 278,
- 280, 283, 289, 291, 293, 295, 297, 299, 300, 302,
- 304, 306, 308, 310, 311, 315, 319, 320, 324, 325,
- 327, 329, 331, 333, 335, 337, 341, 343, 346, 352,
- 356, 361, 366, 371, 376, 381, 386, 391, 396, 401,
- 406, 409, 413, 418, 423, 428, 433, 438, 443, 448,
- 453, 458, 459, 461, 465, 469, 470, 474, 476, 479,
- 480, 481, 487, 493, 494, 500, 502, 504, 507, 513,
- 518, 524, 528, 530, 533, 536, 539, 542, 545, 548,
- 551
+ 110, 115, 120, 125, 131, 136, 141, 146, 151, 156,
+ 161, 166, 171, 176, 181, 184, 190, 191, 193, 195,
+ 197, 199, 201, 202, 207, 212, 219, 226, 231, 238,
+ 245, 250, 255, 260, 265, 268, 274, 276, 277, 279,
+ 283, 285, 288, 294, 296, 298, 300, 302, 304, 305,
+ 307, 309, 311, 313, 315, 316, 320, 324, 325, 329,
+ 330, 332, 334, 336, 338, 340, 342, 346, 348, 351,
+ 357, 361, 366, 371, 376, 381, 386, 391, 396, 401,
+ 406, 411, 414, 418, 423, 428, 433, 438, 443, 448,
+ 453, 458, 463, 464, 466, 470, 474, 475, 479, 481,
+ 484, 485, 486, 492, 498, 499, 505, 507, 509, 512,
+ 518, 523, 529, 533, 535, 538, 541, 544, 547, 550,
+ 553, 556
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 67, 0, -1, 68, 3, -1, -1, 68, 100, -1,
- -1, 5, -1, 24, -1, 58, -1, 56, -1, 59,
- -1, 53, -1, -1, 70, 49, 7, 60, -1, 70,
- 48, 50, 60, -1, 70, 48, 50, 61, 7, 60,
- -1, 70, 48, 51, 60, -1, 70, 48, 51, 61,
- 7, 60, -1, 47, 62, -1, 71, 69, 62, 70,
- 63, -1, 11, 62, -1, 72, 14, 5, 60, -1,
- 72, 14, 10, 60, -1, 72, 12, 5, 60, -1,
- 72, 12, 10, 60, -1, 72, 13, 5, 60, -1,
- 72, 15, 6, 60, -1, 72, 15, 5, 60, -1,
- 72, 15, 10, 60, -1, 72, 16, 5, 60, -1,
- 72, 22, 5, 60, -1, 72, 23, 5, 60, -1,
- 72, 17, 19, 5, 60, -1, 72, 20, 7, 60,
- -1, 72, 21, 5, 60, -1, 72, 40, 8, 60,
- -1, 72, 41, 8, 60, -1, 72, 42, 8, 60,
- -1, 72, 43, 7, 60, -1, 72, 44, 9, 60,
- -1, 72, 44, 7, 60, -1, 72, 45, 7, 60,
- -1, 72, 46, 7, 60, -1, 18, 62, -1, 73,
- 5, 19, 5, 60, -1, -1, 5, -1, 58, -1,
- 56, -1, 59, -1, 53, -1, -1, 75, 49, 7,
- 60, -1, 75, 48, 50, 60, -1, 75, 48, 50,
- 64, 7, 60, -1, 75, 48, 50, 61, 7, 60,
- -1, 75, 48, 51, 60, -1, 75, 48, 51, 64,
- 7, 60, -1, 75, 48, 51, 61, 7, 60, -1,
- 75, 17, 5, 60, -1, 75, 52, 50, 60, -1,
- 75, 52, 51, 60, -1, 75, 52, 5, 60, -1,
- 24, 62, -1, 76, 74, 62, 75, 63, -1, 5,
- -1, -1, 77, -1, 78, 65, 77, -1, 5, -1,
- 25, 62, -1, 80, 79, 62, 78, 63, -1, 34,
- -1, 35, -1, 37, -1, 38, -1, 36, -1, -1,
- 5, -1, 58, -1, 56, -1, 59, -1, 53, -1,
- -1, 83, 82, 65, -1, 83, 82, 60, -1, -1,
- 84, 5, 60, -1, -1, 21, -1, 24, -1, 58,
- -1, 56, -1, 59, -1, 53, -1, 7, 64, 5,
- -1, 5, -1, 85, 62, -1, 86, 81, 62, 84,
- 63, -1, 86, 81, 83, -1, 86, 27, 5, 60,
- -1, 86, 39, 10, 60, -1, 86, 29, 10, 60,
- -1, 86, 28, 10, 60, -1, 86, 32, 7, 60,
- -1, 86, 32, 8, 60, -1, 86, 33, 9, 60,
- -1, 86, 33, 7, 60, -1, 86, 30, 7, 60,
- -1, 86, 31, 7, 60, -1, 26, 62, -1, 87,
- 86, 63, -1, 87, 28, 10, 60, -1, 87, 39,
- 10, 60, -1, 87, 29, 10, 60, -1, 87, 33,
- 9, 60, -1, 87, 33, 7, 60, -1, 87, 30,
- 7, 60, -1, 87, 31, 7, 60, -1, 87, 32,
- 7, 60, -1, 87, 32, 8, 60, -1, -1, 88,
- -1, 89, 59, 65, -1, 89, 59, 60, -1, -1,
- 90, 58, 89, -1, 57, -1, 27, 5, -1, -1,
- -1, 94, 91, 62, 90, 63, -1, 94, 92, 62,
- 90, 63, -1, -1, 56, 96, 62, 94, 93, -1,
- 55, -1, 54, -1, 53, 62, -1, 99, 97, 62,
- 70, 63, -1, 99, 97, 5, 60, -1, 99, 98,
- 62, 84, 63, -1, 99, 98, 83, -1, 60, -1,
- 72, 63, -1, 71, 63, -1, 73, 63, -1, 76,
- 63, -1, 80, 63, -1, 87, 63, -1, 95, 63,
- -1, 99, 63, -1
+ 68, 0, -1, 69, 3, -1, -1, 69, 101, -1,
+ -1, 5, -1, 25, -1, 59, -1, 57, -1, 60,
+ -1, 54, -1, -1, 71, 50, 7, 61, -1, 71,
+ 49, 51, 61, -1, 71, 49, 51, 62, 7, 61,
+ -1, 71, 49, 52, 61, -1, 71, 49, 52, 62,
+ 7, 61, -1, 48, 63, -1, 72, 70, 63, 71,
+ 64, -1, 11, 63, -1, 73, 14, 5, 61, -1,
+ 73, 14, 10, 61, -1, 73, 12, 5, 61, -1,
+ 73, 12, 10, 61, -1, 73, 13, 5, 61, -1,
+ 73, 15, 6, 61, -1, 73, 15, 5, 61, -1,
+ 73, 15, 10, 61, -1, 73, 19, 7, 61, -1,
+ 73, 16, 5, 61, -1, 73, 23, 5, 61, -1,
+ 73, 24, 5, 61, -1, 73, 17, 20, 5, 61,
+ -1, 73, 21, 7, 61, -1, 73, 22, 5, 61,
+ -1, 73, 41, 8, 61, -1, 73, 42, 8, 61,
+ -1, 73, 43, 8, 61, -1, 73, 44, 7, 61,
+ -1, 73, 45, 9, 61, -1, 73, 45, 7, 61,
+ -1, 73, 46, 7, 61, -1, 73, 47, 7, 61,
+ -1, 18, 63, -1, 74, 5, 20, 5, 61, -1,
+ -1, 5, -1, 59, -1, 57, -1, 60, -1, 54,
+ -1, -1, 76, 50, 7, 61, -1, 76, 49, 51,
+ 61, -1, 76, 49, 51, 65, 7, 61, -1, 76,
+ 49, 51, 62, 7, 61, -1, 76, 49, 52, 61,
+ -1, 76, 49, 52, 65, 7, 61, -1, 76, 49,
+ 52, 62, 7, 61, -1, 76, 17, 5, 61, -1,
+ 76, 53, 51, 61, -1, 76, 53, 52, 61, -1,
+ 76, 53, 5, 61, -1, 25, 63, -1, 77, 75,
+ 63, 76, 64, -1, 5, -1, -1, 78, -1, 79,
+ 66, 78, -1, 5, -1, 26, 63, -1, 81, 80,
+ 63, 79, 64, -1, 35, -1, 36, -1, 38, -1,
+ 39, -1, 37, -1, -1, 5, -1, 59, -1, 57,
+ -1, 60, -1, 54, -1, -1, 84, 83, 66, -1,
+ 84, 83, 61, -1, -1, 85, 5, 61, -1, -1,
+ 22, -1, 25, -1, 59, -1, 57, -1, 60, -1,
+ 54, -1, 7, 65, 5, -1, 5, -1, 86, 63,
+ -1, 87, 82, 63, 85, 64, -1, 87, 82, 84,
+ -1, 87, 28, 5, 61, -1, 87, 40, 10, 61,
+ -1, 87, 30, 10, 61, -1, 87, 29, 10, 61,
+ -1, 87, 33, 7, 61, -1, 87, 33, 8, 61,
+ -1, 87, 34, 9, 61, -1, 87, 34, 7, 61,
+ -1, 87, 31, 7, 61, -1, 87, 32, 7, 61,
+ -1, 27, 63, -1, 88, 87, 64, -1, 88, 29,
+ 10, 61, -1, 88, 40, 10, 61, -1, 88, 30,
+ 10, 61, -1, 88, 34, 9, 61, -1, 88, 34,
+ 7, 61, -1, 88, 31, 7, 61, -1, 88, 32,
+ 7, 61, -1, 88, 33, 7, 61, -1, 88, 33,
+ 8, 61, -1, -1, 89, -1, 90, 60, 66, -1,
+ 90, 60, 61, -1, -1, 91, 59, 90, -1, 58,
+ -1, 28, 5, -1, -1, -1, 95, 92, 63, 91,
+ 64, -1, 95, 93, 63, 91, 64, -1, -1, 57,
+ 97, 63, 95, 94, -1, 56, -1, 55, -1, 54,
+ 63, -1, 100, 98, 63, 71, 64, -1, 100, 98,
+ 5, 61, -1, 100, 99, 63, 85, 64, -1, 100,
+ 99, 84, -1, 61, -1, 73, 64, -1, 72, 64,
+ -1, 74, 64, -1, 77, 64, -1, 81, 64, -1,
+ 88, 64, -1, 96, 64, -1, 100, 64, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 483, 483, 485, 487, 490, 491, 492, 493, 494,
- 495, 496, 499, 500, 507, 515, 528, 536, 552, 553,
- 561, 562, 563, 564, 565, 566, 571, 572, 573, 574,
- 575, 576, 577, 582, 589, 610, 611, 612, 613, 614,
- 615, 616, 617, 621, 622, 674, 675, 676, 677, 678,
- 679, 682, 683, 690, 699, 708, 722, 731, 740, 754,
- 762, 766, 770, 777, 778, 786, 789, 791, 792, 796,
- 800, 801, 805, 808, 811, 814, 817, 822, 823, 824,
- 825, 826, 827, 830, 831, 832, 835, 836, 864, 865,
- 866, 867, 868, 869, 870, 871, 888, 892, 893, 894,
- 895, 896, 897, 898, 899, 900, 901, 902, 903, 910,
- 920, 921, 922, 923, 924, 925, 926, 927, 934, 941,
- 948, 951, 960, 961, 962, 965, 966, 972, 995, 1022,
- 1026, 1027, 1028, 1031, 1031, 1035, 1039, 1045, 1046, 1053,
- 1059, 1060, 1063, 1063, 1063, 1063, 1063, 1063, 1063, 1063,
- 1063
+ 0, 485, 485, 487, 489, 492, 493, 494, 495, 496,
+ 497, 498, 501, 502, 509, 517, 530, 538, 554, 555,
+ 563, 564, 565, 566, 567, 568, 573, 574, 575, 576,
+ 584, 585, 586, 587, 592, 599, 620, 621, 622, 623,
+ 624, 625, 626, 627, 631, 632, 684, 685, 686, 687,
+ 688, 689, 692, 693, 700, 709, 718, 732, 741, 750,
+ 764, 772, 776, 780, 787, 788, 796, 799, 801, 802,
+ 806, 810, 811, 815, 818, 821, 824, 827, 832, 833,
+ 834, 835, 836, 837, 840, 841, 842, 845, 846, 874,
+ 875, 876, 877, 878, 879, 880, 881, 898, 902, 903,
+ 904, 905, 906, 907, 908, 909, 910, 911, 912, 913,
+ 920, 930, 931, 932, 933, 934, 935, 936, 937, 944,
+ 951, 958, 961, 970, 971, 972, 975, 976, 982, 1005,
+ 1032, 1036, 1037, 1038, 1041, 1041, 1045, 1049, 1055, 1056,
+ 1063, 1069, 1070, 1073, 1073, 1073, 1073, 1073, 1073, 1073,
+ 1073, 1073
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
"$end", "error", "$undefined", "END", "INVALID_TOKEN", "TEXT", "HEXSTR",
"NUM", "INTERVAL", "SIZE", "BOOL", "SYSTEM", "IDENTITY", "HOSTNAME",
- "SVERSION", "NSID", "STORAGE", "KEY", "KEYS", "TSIG_ALGO_NAME",
- "WORKERS", "USER", "RUNDIR", "PIDFILE", "REMOTES", "GROUPS", "ZONES",
- "FILENAME", "DISABLE_ANY", "SEMANTIC_CHECKS", "NOTIFY_RETRIES",
- "NOTIFY_TIMEOUT", "DBSYNC_TIMEOUT", "IXFR_FSLIMIT", "XFR_IN", "XFR_OUT",
- "UPDATE_IN", "NOTIFY_IN", "NOTIFY_OUT", "BUILD_DIFFS", "MAX_CONN_IDLE",
- "MAX_CONN_HS", "MAX_CONN_REPLY", "RATE_LIMIT", "RATE_LIMIT_SIZE",
- "RATE_LIMIT_SLIP", "TRANSFERS", "INTERFACES", "ADDRESS", "PORT", "IPA",
- "IPA6", "VIA", "CONTROL", "ALLOW", "LISTEN_ON", "LOG", "LOG_DEST",
- "LOG_SRC", "LOG_LEVEL", "';'", "'@'", "'{'", "'}'", "'/'", "','",
- "$accept", "config", "conf_entries", "interface_start", "interface",
- "interfaces", "system", "keys", "remote_start", "remote", "remotes",
- "group_member", "group", "group_start", "groups", "zone_acl_start",
- "zone_acl_item", "zone_acl_list", "zone_acl", "zone_start", "zone",
- "zones", "log_prios_start", "log_prios", "log_src", "log_dest",
- "log_file", "log_end", "log_start", "log", "$@1", "ctl_listen_start",
- "ctl_allow_start", "control", "conf", YY_NULL
+ "SVERSION", "NSID", "STORAGE", "KEY", "KEYS", "MAX_UDP_PAYLOAD",
+ "TSIG_ALGO_NAME", "WORKERS", "USER", "RUNDIR", "PIDFILE", "REMOTES",
+ "GROUPS", "ZONES", "FILENAME", "DISABLE_ANY", "SEMANTIC_CHECKS",
+ "NOTIFY_RETRIES", "NOTIFY_TIMEOUT", "DBSYNC_TIMEOUT", "IXFR_FSLIMIT",
+ "XFR_IN", "XFR_OUT", "UPDATE_IN", "NOTIFY_IN", "NOTIFY_OUT",
+ "BUILD_DIFFS", "MAX_CONN_IDLE", "MAX_CONN_HS", "MAX_CONN_REPLY",
+ "RATE_LIMIT", "RATE_LIMIT_SIZE", "RATE_LIMIT_SLIP", "TRANSFERS",
+ "INTERFACES", "ADDRESS", "PORT", "IPA", "IPA6", "VIA", "CONTROL",
+ "ALLOW", "LISTEN_ON", "LOG", "LOG_DEST", "LOG_SRC", "LOG_LEVEL", "';'",
+ "'@'", "'{'", "'}'", "'/'", "','", "$accept", "config", "conf_entries",
+ "interface_start", "interface", "interfaces", "system", "keys",
+ "remote_start", "remote", "remotes", "group_member", "group",
+ "group_start", "groups", "zone_acl_start", "zone_acl_item",
+ "zone_acl_list", "zone_acl", "zone_start", "zone", "zones",
+ "log_prios_start", "log_prios", "log_src", "log_dest", "log_file",
+ "log_end", "log_start", "log", "$@1", "ctl_listen_start",
+ "ctl_allow_start", "control", "conf", 0
};
#endif
@@ -1089,29 +1067,29 @@ static const yytype_uint16 yytoknum[] =
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 59, 64, 123, 125, 47, 44
+ 315, 59, 64, 123, 125, 47, 44
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 66, 67, 68, 68, 69, 69, 69, 69, 69,
- 69, 69, 70, 70, 70, 70, 70, 70, 71, 71,
- 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
- 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
- 72, 72, 72, 73, 73, 74, 74, 74, 74, 74,
- 74, 75, 75, 75, 75, 75, 75, 75, 75, 75,
- 75, 75, 75, 76, 76, 77, 78, 78, 78, 79,
- 80, 80, 81, 81, 81, 81, 81, 82, 82, 82,
- 82, 82, 82, 83, 83, 83, 84, 84, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 0, 67, 68, 69, 69, 70, 70, 70, 70, 70,
+ 70, 70, 71, 71, 71, 71, 71, 71, 72, 72,
+ 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+ 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
+ 73, 73, 73, 73, 74, 74, 75, 75, 75, 75,
+ 75, 75, 76, 76, 76, 76, 76, 76, 76, 76,
+ 76, 76, 76, 76, 77, 77, 78, 79, 79, 79,
+ 80, 81, 81, 82, 82, 82, 82, 82, 83, 83,
+ 83, 83, 83, 83, 84, 84, 84, 85, 85, 86,
+ 86, 86, 86, 86, 86, 86, 86, 86, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 88, 89, 89, 89, 90, 90, 91, 92, 93,
- 94, 94, 94, 96, 95, 97, 98, 99, 99, 99,
- 99, 99, 100, 100, 100, 100, 100, 100, 100, 100,
- 100
+ 87, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+ 88, 88, 89, 90, 90, 90, 91, 91, 92, 93,
+ 94, 95, 95, 95, 97, 96, 98, 99, 100, 100,
+ 100, 100, 100, 101, 101, 101, 101, 101, 101, 101,
+ 101, 101
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -1120,19 +1098,19 @@ static const yytype_uint8 yyr2[] =
0, 2, 2, 0, 2, 0, 1, 1, 1, 1,
1, 1, 0, 4, 4, 6, 4, 6, 2, 5,
2, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 5, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 2, 5, 0, 1, 1, 1, 1,
- 1, 0, 4, 4, 6, 6, 4, 6, 6, 4,
- 4, 4, 4, 2, 5, 1, 0, 1, 3, 1,
- 2, 5, 1, 1, 1, 1, 1, 0, 1, 1,
- 1, 1, 1, 0, 3, 3, 0, 3, 0, 1,
- 1, 1, 1, 1, 1, 3, 1, 2, 5, 3,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 2, 3, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 0, 1, 3, 3, 0, 3, 1, 2, 0,
- 0, 5, 5, 0, 5, 1, 1, 2, 5, 4,
- 5, 3, 1, 2, 2, 2, 2, 2, 2, 2,
- 2
+ 4, 4, 4, 5, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 2, 5, 0, 1, 1, 1,
+ 1, 1, 0, 4, 4, 6, 6, 4, 6, 6,
+ 4, 4, 4, 4, 2, 5, 1, 0, 1, 3,
+ 1, 2, 5, 1, 1, 1, 1, 1, 0, 1,
+ 1, 1, 1, 1, 0, 3, 3, 0, 3, 0,
+ 1, 1, 1, 1, 1, 1, 3, 1, 2, 5,
+ 3, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 2, 3, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 0, 1, 3, 3, 0, 3, 1, 2,
+ 0, 0, 5, 5, 0, 5, 1, 1, 2, 5,
+ 4, 5, 3, 1, 2, 2, 2, 2, 2, 2,
+ 2, 2
};
/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -1141,198 +1119,200 @@ static const yytype_uint8 yyr2[] =
static const yytype_uint8 yydefact[] =
{
3, 0, 0, 1, 2, 0, 0, 0, 0, 0,
- 0, 0, 133, 142, 5, 0, 0, 45, 0, 88,
- 0, 0, 4, 20, 43, 63, 70, 110, 18, 137,
- 0, 6, 7, 11, 9, 8, 10, 144, 0, 0,
+ 0, 0, 134, 143, 5, 0, 0, 46, 0, 89,
+ 0, 0, 4, 20, 44, 64, 71, 111, 18, 138,
+ 0, 6, 7, 11, 9, 8, 10, 145, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 143, 0, 145, 46,
- 50, 48, 47, 49, 146, 0, 69, 147, 0, 96,
- 0, 89, 90, 0, 0, 0, 0, 0, 0, 0,
- 94, 92, 91, 93, 148, 0, 0, 149, 136, 135,
- 150, 0, 83, 130, 12, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 144, 0, 146,
+ 47, 51, 49, 48, 50, 147, 0, 70, 148, 0,
+ 97, 0, 90, 91, 0, 0, 0, 0, 0, 0,
+ 0, 95, 93, 92, 94, 149, 0, 0, 150, 137,
+ 136, 151, 0, 84, 131, 12, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 51, 66,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 97, 0, 0, 0, 0, 0, 0, 0, 72, 73,
- 76, 74, 75, 0, 111, 83, 0, 12, 86, 141,
- 129, 0, 23, 24, 25, 21, 22, 27, 26, 28,
- 29, 0, 33, 34, 30, 31, 35, 36, 37, 38,
- 40, 39, 41, 42, 0, 0, 65, 67, 0, 95,
- 112, 114, 117, 118, 119, 120, 116, 115, 113, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 86,
- 99, 139, 0, 0, 78, 82, 80, 79, 81, 0,
- 0, 127, 0, 0, 134, 0, 0, 19, 32, 44,
- 0, 0, 0, 0, 64, 71, 0, 100, 103, 102,
- 108, 109, 104, 105, 107, 106, 101, 0, 138, 0,
- 140, 85, 84, 128, 125, 125, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 68, 98, 87, 0,
- 0, 14, 0, 16, 0, 13, 59, 53, 0, 0,
- 56, 0, 0, 52, 62, 60, 61, 121, 131, 132,
- 0, 0, 0, 0, 0, 0, 122, 126, 15, 17,
- 55, 54, 58, 57, 0, 124, 123
+ 52, 67, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 98, 0, 0, 0, 0, 0, 0, 0,
+ 73, 74, 77, 75, 76, 0, 112, 84, 0, 12,
+ 87, 142, 130, 0, 23, 24, 25, 21, 22, 27,
+ 26, 28, 30, 0, 29, 34, 35, 31, 32, 36,
+ 37, 38, 39, 41, 40, 42, 43, 0, 0, 66,
+ 68, 0, 96, 113, 115, 118, 119, 120, 121, 117,
+ 116, 114, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 87, 100, 140, 0, 0, 79, 83, 81,
+ 80, 82, 0, 0, 128, 0, 0, 135, 0, 0,
+ 19, 33, 45, 0, 0, 0, 0, 65, 72, 0,
+ 101, 104, 103, 109, 110, 105, 106, 108, 107, 102,
+ 0, 139, 0, 141, 86, 85, 129, 126, 126, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 69,
+ 99, 88, 0, 0, 14, 0, 16, 0, 13, 60,
+ 54, 0, 0, 57, 0, 0, 53, 63, 61, 62,
+ 122, 132, 133, 0, 0, 0, 0, 0, 0, 123,
+ 127, 15, 17, 56, 55, 59, 58, 0, 125, 124
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 1, 2, 38, 151, 14, 15, 16, 65, 175,
- 17, 177, 178, 68, 18, 145, 209, 149, 203, 85,
- 86, 19, 286, 287, 259, 212, 213, 214, 150, 20,
- 30, 91, 92, 21, 22
+ -1, 1, 2, 38, 153, 14, 15, 16, 66, 178,
+ 17, 180, 181, 69, 18, 147, 212, 151, 206, 86,
+ 87, 19, 289, 290, 262, 215, 216, 217, 152, 20,
+ 30, 92, 93, 21, 22
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -47
+#define YYPACT_NINF -49
static const yytype_int16 yypact[] =
{
- -47, 16, 72, -47, -47, -25, 9, 12, 25, 33,
- 58, 91, -47, -47, 14, 93, 0, 23, 1, 3,
- 5, -42, -47, -47, -47, -47, -47, -47, -47, -47,
- 98, -47, -47, -47, -47, -47, -47, -47, 99, 13,
- 73, 35, 20, 79, 105, 152, 157, 158, 159, 160,
- 161, 162, 164, 84, 165, 166, -47, 146, -47, -47,
- -47, -47, -47, -47, -47, 112, -47, -47, 115, -47,
- 102, -47, -47, 168, 169, 173, 174, 36, 95, 172,
- -47, -47, -47, -47, -47, 121, 113, -47, -47, -47,
- -47, -4, 122, -47, -47, 107, 125, 126, 127, 128,
- 129, 130, 131, 132, 170, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 200, -47, 201,
- 202, 148, 149, 150, 151, 153, 154, 155, 156, 163,
- -47, 207, 208, 209, 210, 213, 104, 120, -47, -47,
- -47, -47, -47, 211, -47, 167, 171, -47, -47, -5,
- -18, -46, -47, -47, -47, -47, -47, -47, -47, -47,
- -47, 175, -47, -47, -47, -47, -47, -47, -47, -47,
- -47, -47, -47, -47, 176, 40, -47, -47, -43, -47,
- -47, -47, -47, -47, -47, -47, -47, -47, -47, 177,
- 178, 179, 180, 181, 182, 183, 184, 185, 186, -47,
- -5, -47, -34, 2, -47, -47, -47, -47, -47, -19,
- 217, -47, 187, 188, -47, 50, 218, -47, -47, -47,
- 219, 80, 220, -1, -47, -47, 201, -47, -47, -47,
- -47, -47, -47, -47, -47, -47, -47, 6, -47, 191,
- -47, -47, -47, -47, -47, -47, 94, 97, 192, 193,
- 57, 62, 194, 195, 196, 197, -47, -47, -47, -11,
- 22, -47, 221, -47, 223, -47, -47, -47, 225, 226,
- -47, 227, 240, -47, -47, -47, -47, -47, -47, -47,
- 198, 199, 203, 204, 205, 206, -47, 189, -47, -47,
- -47, -47, -47, -47, 34, -47, -47
+ -49, 9, 66, -49, -49, -43, -25, 31, 34, 52,
+ 56, 61, -49, -49, 14, 87, 0, 22, 1, 3,
+ -48, -34, -49, -49, -49, -49, -49, -49, -49, -49,
+ 63, -49, -49, -49, -49, -49, -49, -49, 101, 8,
+ 42, 21, 35, 53, 115, 65, 143, 158, 160, 161,
+ 159, 162, 163, 165, 37, 167, 168, -49, 148, -49,
+ -49, -49, -49, -49, -49, -49, 113, -49, -49, 114,
+ -49, 104, -49, -49, 169, 170, 171, 174, 110, 78,
+ 172, -49, -49, -49, -49, -49, 120, 109, -49, -49,
+ -49, -49, -4, 121, -49, -49, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 189, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 144, 145, 146, 149, 199,
+ -49, 203, 204, 150, 151, 152, 153, 154, 155, 156,
+ 157, 164, -49, 214, 210, 211, 215, 216, 147, 89,
+ -49, -49, -49, -49, -49, 217, -49, 166, 173, -49,
+ -49, -5, -16, -47, -49, -49, -49, -49, -49, -49,
+ -49, -49, -49, 175, -49, -49, -49, -49, -49, -49,
+ -49, -49, -49, -49, -49, -49, -49, 176, 72, -49,
+ -49, 41, -49, -49, -49, -49, -49, -49, -49, -49,
+ -49, -49, 177, 178, 179, 180, 181, 182, 183, 184,
+ 185, 186, -49, -5, -49, -35, 2, -49, -49, -49,
+ -49, -49, -13, 219, -49, 187, 188, -49, -28, 221,
+ -49, -49, -49, 225, 106, 224, -1, -49, -49, 203,
+ -49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
+ 6, -49, 191, -49, -49, -49, -49, -49, -49, 98,
+ 100, 192, 193, 51, 91, 194, 195, 196, 197, -49,
+ -49, -49, 16, 24, -49, 226, -49, 228, -49, -49,
+ -49, 241, 242, -49, 252, 253, -49, -49, -49, -49,
+ -49, -49, -49, 200, 201, 202, 205, 206, 207, -49,
+ 209, -49, -49, -49, -49, -49, -49, 29, -49, -49
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -47, -47, -47, -47, 114, -47, -47, -47, -47, -47,
- -47, 41, -47, -47, -47, -47, -47, 81, 61, -47,
- -47, -47, -47, -47, 17, -47, -47, -47, -47, -47,
- -47, -47, -47, -47, -47
+ -49, -49, -49, -49, 77, -49, -49, -49, -49, -49,
+ -49, 36, -49, -49, -49, -49, -49, 85, 62, -49,
+ -49, -49, -49, -49, 23, -49, -49, -49, -49, -49,
+ -49, -49, -49, -49, -49
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -78
+#define YYTABLE_NINF -79
static const yytype_int16 yytable[] =
{
- 204, 146, 215, 216, 253, 57, 66, 239, 69, 210,
- 70, 239, 88, 89, 215, 216, 3, 217, 95, 31,
- 225, 90, 226, 96, 71, 100, 101, 72, 59, 238,
- 102, 73, 74, 75, 76, 77, 78, 23, 32, 211,
- 98, 241, 79, 125, 126, 99, 242, 277, 205, 254,
- 255, 206, 278, 207, 208, -77, 80, 220, 147, 81,
- -77, 82, 83, 58, 67, 240, 84, 33, 87, 257,
- 34, 24, 35, 36, 25, 4, 60, 37, 97, 61,
- 277, 62, 63, 5, 103, 279, 64, 26, 221, 222,
- 6, 113, 223, 114, 295, 27, 7, 8, 9, 296,
- 246, 247, 127, 224, 128, 39, 40, 41, 42, 43,
- 44, 194, 195, 45, 46, 47, 48, 267, 268, 10,
- 28, 269, 270, 271, 104, 11, 272, 196, 12, 197,
- 250, 251, 13, 49, 50, 51, 52, 53, 54, 55,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 29, 261, 262, 56, 263, 264, 105,
- 93, 94, 106, 107, 108, 117, 120, 152, 109, 110,
- 111, 112, 115, 116, 118, 161, 144, 119, 121, 122,
- 123, 124, 129, 130, 148, 153, 154, 155, 156, 157,
- 158, 159, 160, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 174, 176, 179, 180, 181,
- 182, 183, 189, 184, 185, 186, 187, 192, 190, 191,
- 193, 198, 243, 188, 249, 248, 200, 252, 280, 199,
- 281, 201, 282, 283, 284, 218, 219, 227, 228, 229,
- 230, 231, 232, 233, 234, 235, 236, 285, 294, 244,
- 245, 258, 265, 266, 273, 274, 275, 276, 288, 289,
- 237, 202, 260, 290, 291, 292, 293, 256
+ 207, 148, 218, 219, 256, 58, 67, 242, 70, 3,
+ 71, 242, 213, 96, 218, 219, 88, 220, 97, 31,
+ 23, 89, 90, 249, 250, 72, 99, 60, 73, 241,
+ 91, 100, 74, 75, 76, 77, 78, 79, 24, 32,
+ 101, 102, 214, 80, 115, 103, 116, 98, 244, 208,
+ 257, 258, 209, 245, 210, 211, -78, 81, 104, 149,
+ 82, -78, 83, 84, 59, 68, 243, 85, 33, 4,
+ 260, 34, 106, 35, 36, 280, 61, 5, 37, 62,
+ 281, 63, 64, 280, 6, 129, 65, 130, 282, 223,
+ 298, 7, 8, 9, 25, 299, 199, 26, 200, 39,
+ 40, 41, 42, 43, 44, 228, 45, 229, 46, 47,
+ 48, 49, 270, 271, 10, 27, 272, 127, 128, 28,
+ 11, 224, 225, 12, 29, 226, 94, 13, 50, 51,
+ 52, 53, 54, 55, 56, 105, 227, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 107, 57, 273, 274, 197, 198, 275, 253, 254, 264,
+ 265, 266, 267, 108, 95, 109, 110, 111, 119, 122,
+ 112, 113, 114, 146, 117, 118, 120, 121, 125, 123,
+ 124, 126, 131, 132, 150, 154, 155, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 177, 173, 174, 175, 179, 182,
+ 176, 183, 184, 185, 186, 187, 188, 189, 190, 192,
+ 193, 194, 195, 196, 246, 191, 205, 201, 251, 202,
+ 252, 255, 203, 283, 204, 284, 221, 222, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 285, 286,
+ 247, 248, 261, 268, 269, 276, 277, 278, 279, 287,
+ 288, 291, 292, 293, 240, 259, 294, 295, 296, 297,
+ 0, 263
};
-#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-47)))
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-49))
-#define yytable_value_is_error(Yytable_value) \
+#define yytable_value_is_error(yytable_value) \
YYID (0)
-static const yytype_uint8 yycheck[] =
+static const yytype_int16 yycheck[] =
{
- 5, 5, 48, 49, 5, 5, 5, 5, 5, 27,
- 7, 5, 54, 55, 48, 49, 0, 63, 5, 5,
- 63, 63, 65, 10, 21, 5, 6, 24, 5, 63,
- 10, 28, 29, 30, 31, 32, 33, 62, 24, 57,
- 5, 60, 39, 7, 8, 10, 65, 58, 53, 50,
- 51, 56, 63, 58, 59, 60, 53, 17, 62, 56,
- 65, 58, 59, 63, 63, 63, 63, 53, 63, 63,
- 56, 62, 58, 59, 62, 3, 53, 63, 5, 56,
- 58, 58, 59, 11, 5, 63, 63, 62, 48, 49,
- 18, 7, 52, 9, 60, 62, 24, 25, 26, 65,
- 50, 51, 7, 63, 9, 12, 13, 14, 15, 16,
- 17, 7, 8, 20, 21, 22, 23, 60, 61, 47,
- 62, 64, 60, 61, 19, 53, 64, 7, 56, 9,
- 50, 51, 60, 40, 41, 42, 43, 44, 45, 46,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 62, 60, 61, 63, 60, 61, 7,
- 62, 62, 5, 5, 5, 19, 64, 60, 8, 8,
- 8, 7, 7, 7, 62, 5, 63, 62, 10, 10,
- 7, 7, 10, 62, 62, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 5, 5, 5, 60, 60,
- 60, 60, 5, 60, 60, 60, 60, 7, 10, 10,
- 7, 10, 5, 60, 5, 7, 145, 7, 7, 62,
- 7, 60, 7, 7, 7, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 60, 60, 7, 59, 62,
- 62, 60, 60, 60, 60, 60, 60, 60, 60, 60,
- 199, 147, 245, 60, 60, 60, 60, 226
+ 5, 5, 49, 50, 5, 5, 5, 5, 5, 0,
+ 7, 5, 28, 5, 49, 50, 64, 64, 10, 5,
+ 63, 55, 56, 51, 52, 22, 5, 5, 25, 64,
+ 64, 10, 29, 30, 31, 32, 33, 34, 63, 25,
+ 5, 6, 58, 40, 7, 10, 9, 5, 61, 54,
+ 51, 52, 57, 66, 59, 60, 61, 54, 5, 63,
+ 57, 66, 59, 60, 64, 64, 64, 64, 54, 3,
+ 64, 57, 7, 59, 60, 59, 54, 11, 64, 57,
+ 64, 59, 60, 59, 18, 7, 64, 9, 64, 17,
+ 61, 25, 26, 27, 63, 66, 7, 63, 9, 12,
+ 13, 14, 15, 16, 17, 64, 19, 66, 21, 22,
+ 23, 24, 61, 62, 48, 63, 65, 7, 8, 63,
+ 54, 49, 50, 57, 63, 53, 63, 61, 41, 42,
+ 43, 44, 45, 46, 47, 20, 64, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 7, 64, 61, 62, 7, 8, 65, 51, 52, 61,
+ 62, 61, 62, 5, 63, 5, 5, 8, 20, 65,
+ 8, 8, 7, 64, 7, 7, 63, 63, 7, 10,
+ 10, 7, 10, 63, 63, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 5, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 5, 61, 61, 61, 5, 5,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 5,
+ 10, 10, 7, 7, 5, 61, 149, 10, 7, 63,
+ 5, 7, 147, 7, 61, 7, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 61, 7, 7,
+ 63, 63, 61, 61, 61, 61, 61, 61, 61, 7,
+ 7, 61, 61, 61, 202, 229, 61, 61, 61, 60,
+ -1, 248
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 67, 68, 0, 3, 11, 18, 24, 25, 26,
- 47, 53, 56, 60, 71, 72, 73, 76, 80, 87,
- 95, 99, 100, 62, 62, 62, 62, 62, 62, 62,
- 96, 5, 24, 53, 56, 58, 59, 63, 69, 12,
- 13, 14, 15, 16, 17, 20, 21, 22, 23, 40,
- 41, 42, 43, 44, 45, 46, 63, 5, 63, 5,
- 53, 56, 58, 59, 63, 74, 5, 63, 79, 5,
- 7, 21, 24, 28, 29, 30, 31, 32, 33, 39,
- 53, 56, 58, 59, 63, 85, 86, 63, 54, 55,
- 63, 97, 98, 62, 62, 5, 10, 5, 5, 10,
- 5, 6, 10, 5, 19, 7, 5, 5, 5, 8,
- 8, 8, 7, 7, 9, 7, 7, 19, 62, 62,
- 64, 10, 10, 7, 7, 7, 8, 7, 9, 10,
- 62, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 63, 81, 5, 62, 62, 83,
- 94, 70, 60, 60, 60, 60, 60, 60, 60, 60,
- 60, 5, 60, 60, 60, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 5, 75, 5, 77, 78, 5,
- 60, 60, 60, 60, 60, 60, 60, 60, 60, 5,
- 10, 10, 7, 7, 7, 8, 7, 9, 10, 62,
- 83, 60, 70, 84, 5, 53, 56, 58, 59, 82,
- 27, 57, 91, 92, 93, 48, 49, 63, 60, 60,
- 17, 48, 49, 52, 63, 63, 65, 60, 60, 60,
- 60, 60, 60, 60, 60, 60, 60, 84, 63, 5,
- 63, 60, 65, 5, 62, 62, 50, 51, 7, 5,
- 50, 51, 7, 5, 50, 51, 77, 63, 60, 90,
- 90, 60, 61, 60, 61, 60, 60, 60, 61, 64,
- 60, 61, 64, 60, 60, 60, 60, 58, 63, 63,
- 7, 7, 7, 7, 7, 7, 88, 89, 60, 60,
- 60, 60, 60, 60, 59, 60, 65
+ 0, 68, 69, 0, 3, 11, 18, 25, 26, 27,
+ 48, 54, 57, 61, 72, 73, 74, 77, 81, 88,
+ 96, 100, 101, 63, 63, 63, 63, 63, 63, 63,
+ 97, 5, 25, 54, 57, 59, 60, 64, 70, 12,
+ 13, 14, 15, 16, 17, 19, 21, 22, 23, 24,
+ 41, 42, 43, 44, 45, 46, 47, 64, 5, 64,
+ 5, 54, 57, 59, 60, 64, 75, 5, 64, 80,
+ 5, 7, 22, 25, 29, 30, 31, 32, 33, 34,
+ 40, 54, 57, 59, 60, 64, 86, 87, 64, 55,
+ 56, 64, 98, 99, 63, 63, 5, 10, 5, 5,
+ 10, 5, 6, 10, 5, 20, 7, 7, 5, 5,
+ 5, 8, 8, 8, 7, 7, 9, 7, 7, 20,
+ 63, 63, 65, 10, 10, 7, 7, 7, 8, 7,
+ 9, 10, 63, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 64, 82, 5, 63,
+ 63, 84, 95, 71, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 5, 61, 61, 61, 61, 61, 61,
+ 61, 61, 61, 61, 61, 61, 61, 5, 76, 5,
+ 78, 79, 5, 61, 61, 61, 61, 61, 61, 61,
+ 61, 61, 5, 10, 10, 7, 7, 7, 8, 7,
+ 9, 10, 63, 84, 61, 71, 85, 5, 54, 57,
+ 59, 60, 83, 28, 58, 92, 93, 94, 49, 50,
+ 64, 61, 61, 17, 49, 50, 53, 64, 64, 66,
+ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
+ 85, 64, 5, 64, 61, 66, 5, 63, 63, 51,
+ 52, 7, 5, 51, 52, 7, 5, 51, 52, 78,
+ 64, 61, 91, 91, 61, 62, 61, 62, 61, 61,
+ 61, 62, 65, 61, 62, 65, 61, 61, 61, 61,
+ 59, 64, 64, 7, 7, 7, 7, 7, 7, 89,
+ 90, 61, 61, 61, 61, 61, 61, 60, 61, 66
};
#define yyerrok (yyerrstatus = 0)
@@ -1362,35 +1342,62 @@ static const yytype_uint8 yystos[] =
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- YYPOPSTACK (yylen); \
- yystate = *yyssp; \
- goto yybackup; \
- } \
- else \
- { \
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY && yylen == 1) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (1); \
+ goto yybackup; \
+ } \
+ else \
+ { \
yyerror (scanner, YY_("syntax error: cannot back up")); \
YYERROR; \
} \
while (YYID (0))
-/* Error token number */
+
#define YYTERROR 1
#define YYERRCODE 256
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+ If N is 0, then set CURRENT to the empty location which ends
+ the previous symbol: RHS[0] (always defined). */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
+ while (YYID (0))
+#endif
+
+
/* This macro is provided for backward compatibility. */
+
#ifndef YY_LOCATION_PRINT
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
/* YYLEX -- calling `yylex' with the right arguments. */
+
#ifdef YYLEX_PARAM
# define YYLEX yylex (&yylval, YYLEX_PARAM)
#else
@@ -1441,8 +1448,6 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner)
void *scanner;
#endif
{
- FILE *yyo = yyoutput;
- YYUSE (yyo);
if (!yyvaluep)
return;
YYUSE (scanner);
@@ -1452,7 +1457,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner)
# else
YYUSE (yyoutput);
# endif
- YYUSE (yytype);
+ switch (yytype)
+ {
+ default:
+ break;
+ }
}
@@ -1693,11 +1702,12 @@ static int
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yytype_int16 *yyssp, int yytoken)
{
- YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */
- const char *yyformat = YY_NULL;
+ const char *yyformat = 0;
/* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per
@@ -1757,13 +1767,11 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
break;
}
yyarg[yycount++] = yytname[yyx];
- {
- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
- }
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
}
}
}
@@ -1783,12 +1791,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
# undef YYCASE_
}
- {
- YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
- }
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
if (*yymsg_alloc < yysize)
{
@@ -1846,10 +1852,29 @@ yydestruct (yymsg, yytype, yyvaluep, scanner)
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
- YYUSE (yytype);
+ switch (yytype)
+ {
+
+ default:
+ break;
+ }
}
+/* Prevent warnings from -Wmissing-prototypes. */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *scanner);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
/*----------.
@@ -1881,31 +1906,8 @@ yyparse (scanner)
/* The lookahead symbol. */
int yychar;
-
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized. */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
- _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
- _Pragma ("GCC diagnostic pop")
-#else
-/* Default value used for initialization, for pacifying older GCCs
- or non-GCC compilers. */
-static YYSTYPE yyval_default;
-# define YY_INITIAL_VALUE(Value) = Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
+YYSTYPE yylval;
/* Number of syntax errors so far. */
int yynerrs;
@@ -1918,7 +1920,7 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
`yyss': related to states.
`yyvs': related to semantic values.
- Refer to the stacks through separate pointers, to allow yyoverflow
+ Refer to the stacks thru separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
/* The state stack. */
@@ -1936,7 +1938,7 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
int yyn;
int yyresult;
/* Lookahead token as an internal (translated) token number. */
- int yytoken = 0;
+ int yytoken;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
@@ -1954,8 +1956,9 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yyssp = yyss = yyssa;
- yyvsp = yyvs = yyvsa;
+ yytoken = 0;
+ yyss = yyssa;
+ yyvs = yyvsa;
yystacksize = YYINITDEPTH;
YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1964,6 +1967,14 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
yyerrstatus = 0;
yynerrs = 0;
yychar = YYEMPTY; /* Cause a token to be read. */
+
+ /* Initialize stack pointers.
+ Waste one element of value and location stack
+ so that they stay on the same level as the state stack.
+ The wasted elements are never initialized. */
+ yyssp = yyss;
+ yyvsp = yyvs;
+
goto yysetstate;
/*------------------------------------------------------------.
@@ -2104,9 +2115,7 @@ yybackup:
yychar = YYEMPTY;
yystate = yyn;
- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
- YY_IGNORE_MAYBE_UNINITIALIZED_END
goto yynewstate;
@@ -2143,50 +2152,58 @@ yyreduce:
switch (yyn)
{
case 2:
-/* Line 1787 of yacc.c */
-#line 483 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 485 "cf-parse.y"
{ return 0; }
break;
case 6:
-/* Line 1787 of yacc.c */
-#line 491 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 493 "cf-parse.y"
{ conf_start_iface(scanner, (yyvsp[(1) - (1)].tok).t); }
break;
case 7:
-/* Line 1787 of yacc.c */
-#line 492 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 494 "cf-parse.y"
{ conf_start_iface(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 8:
-/* Line 1787 of yacc.c */
-#line 493 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 495 "cf-parse.y"
{ conf_start_iface(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 9:
-/* Line 1787 of yacc.c */
-#line 494 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 496 "cf-parse.y"
{ conf_start_iface(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 10:
-/* Line 1787 of yacc.c */
-#line 495 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 497 "cf-parse.y"
{ conf_start_iface(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 11:
-/* Line 1787 of yacc.c */
-#line 496 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 498 "cf-parse.y"
{ conf_start_iface(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 13:
-/* Line 1787 of yacc.c */
-#line 500 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 502 "cf-parse.y"
{
if (this_iface->port > 0) {
cf_error(scanner, "only one port definition is allowed in interface section\n");
@@ -2197,8 +2214,9 @@ yyreduce:
break;
case 14:
-/* Line 1787 of yacc.c */
-#line 507 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 509 "cf-parse.y"
{
if (this_iface->address != 0) {
cf_error(scanner, "only one address is allowed in interface section\n");
@@ -2210,8 +2228,9 @@ yyreduce:
break;
case 15:
-/* Line 1787 of yacc.c */
-#line 515 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 517 "cf-parse.y"
{
if (this_iface->address != 0) {
cf_error(scanner, "only one address is allowed in interface section\n");
@@ -2228,8 +2247,9 @@ yyreduce:
break;
case 16:
-/* Line 1787 of yacc.c */
-#line 528 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 530 "cf-parse.y"
{
if (this_iface->address != 0) {
cf_error(scanner, "only one address is allowed in interface section\n");
@@ -2241,8 +2261,9 @@ yyreduce:
break;
case 17:
-/* Line 1787 of yacc.c */
-#line 536 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 538 "cf-parse.y"
{
if (this_iface->address != 0) {
cf_error(scanner, "only one address is allowed in interface section\n");
@@ -2259,8 +2280,9 @@ yyreduce:
break;
case 19:
-/* Line 1787 of yacc.c */
-#line 553 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 555 "cf-parse.y"
{
if (this_iface->address == 0) {
cf_error(scanner, "interface '%s' has no defined address", this_iface->name);
@@ -2269,32 +2291,37 @@ yyreduce:
break;
case 21:
-/* Line 1787 of yacc.c */
-#line 562 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 564 "cf-parse.y"
{ new_config->version = (yyvsp[(3) - (4)].tok).t; }
break;
case 22:
-/* Line 1787 of yacc.c */
-#line 563 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 565 "cf-parse.y"
{ ident_auto(SVERSION, new_config, (yyvsp[(3) - (4)].tok).i); }
break;
case 23:
-/* Line 1787 of yacc.c */
-#line 564 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 566 "cf-parse.y"
{ new_config->identity = (yyvsp[(3) - (4)].tok).t; }
break;
case 24:
-/* Line 1787 of yacc.c */
-#line 565 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 567 "cf-parse.y"
{ ident_auto(IDENTITY, new_config, (yyvsp[(3) - (4)].tok).i); }
break;
case 25:
-/* Line 1787 of yacc.c */
-#line 566 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 568 "cf-parse.y"
{
fprintf(stderr, "warning: Config option 'system.hostname' is deprecated. "
"Use 'system.identity' instead.\n");
@@ -2303,44 +2330,65 @@ yyreduce:
break;
case 26:
-/* Line 1787 of yacc.c */
-#line 571 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 573 "cf-parse.y"
{ new_config->nsid = (yyvsp[(3) - (4)].tok).t; new_config->nsid_len = (yyvsp[(3) - (4)].tok).l; }
break;
case 27:
-/* Line 1787 of yacc.c */
-#line 572 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 574 "cf-parse.y"
{ new_config->nsid = (yyvsp[(3) - (4)].tok).t; new_config->nsid_len = strlen(new_config->nsid); }
break;
case 28:
-/* Line 1787 of yacc.c */
-#line 573 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 575 "cf-parse.y"
{ ident_auto(NSID, new_config, (yyvsp[(3) - (4)].tok).i); }
break;
case 29:
-/* Line 1787 of yacc.c */
-#line 574 "knot/conf/cf-parse.y"
- { new_config->storage = (yyvsp[(3) - (4)].tok).t; }
+
+/* Line 1806 of yacc.c */
+#line 576 "cf-parse.y"
+ {
+ if ((yyvsp[(3) - (4)].tok).i < EDNS_MIN_UDP_PAYLOAD || (yyvsp[(3) - (4)].tok).i > EDNS_MAX_UDP_PAYLOAD) {
+ cf_error(scanner, "maximal UDP payload size is out of range (%u-%u)",
+ EDNS_MIN_UDP_PAYLOAD, EDNS_MAX_UDP_PAYLOAD);
+ } else {
+ new_config->max_udp_payload = (yyvsp[(3) - (4)].tok).i;
+ }
+ }
break;
case 30:
-/* Line 1787 of yacc.c */
-#line 575 "knot/conf/cf-parse.y"
- { new_config->rundir = (yyvsp[(3) - (4)].tok).t; }
+
+/* Line 1806 of yacc.c */
+#line 584 "cf-parse.y"
+ { new_config->storage = (yyvsp[(3) - (4)].tok).t; }
break;
case 31:
-/* Line 1787 of yacc.c */
-#line 576 "knot/conf/cf-parse.y"
- { new_config->pidfile = (yyvsp[(3) - (4)].tok).t; }
+
+/* Line 1806 of yacc.c */
+#line 585 "cf-parse.y"
+ { new_config->rundir = (yyvsp[(3) - (4)].tok).t; }
break;
case 32:
-/* Line 1787 of yacc.c */
-#line 577 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 586 "cf-parse.y"
+ { new_config->pidfile = (yyvsp[(3) - (4)].tok).t; }
+ break;
+
+ case 33:
+
+/* Line 1806 of yacc.c */
+#line 587 "cf-parse.y"
{
fprintf(stderr, "warning: Config option 'system.key' is deprecated "
"and has no effect.\n");
@@ -2348,9 +2396,10 @@ yyreduce:
}
break;
- case 33:
-/* Line 1787 of yacc.c */
-#line 582 "knot/conf/cf-parse.y"
+ case 34:
+
+/* Line 1806 of yacc.c */
+#line 592 "cf-parse.y"
{
if ((yyvsp[(3) - (4)].tok).i <= 0) {
cf_error(scanner, "worker count must be greater than 0\n");
@@ -2360,9 +2409,10 @@ yyreduce:
}
break;
- case 34:
-/* Line 1787 of yacc.c */
-#line 589 "knot/conf/cf-parse.y"
+ case 35:
+
+/* Line 1806 of yacc.c */
+#line 599 "cf-parse.y"
{
new_config->uid = new_config->gid = -1; // Invalidate
char* dpos = strchr((yyvsp[(3) - (4)].tok).t, '.'); // Find uid.gid format
@@ -2386,57 +2436,66 @@ yyreduce:
}
break;
- case 35:
-/* Line 1787 of yacc.c */
-#line 610 "knot/conf/cf-parse.y"
+ case 36:
+
+/* Line 1806 of yacc.c */
+#line 620 "cf-parse.y"
{ new_config->max_conn_idle = (yyvsp[(3) - (4)].tok).i; }
break;
- case 36:
-/* Line 1787 of yacc.c */
-#line 611 "knot/conf/cf-parse.y"
+ case 37:
+
+/* Line 1806 of yacc.c */
+#line 621 "cf-parse.y"
{ new_config->max_conn_hs = (yyvsp[(3) - (4)].tok).i; }
break;
- case 37:
-/* Line 1787 of yacc.c */
-#line 612 "knot/conf/cf-parse.y"
+ case 38:
+
+/* Line 1806 of yacc.c */
+#line 622 "cf-parse.y"
{ new_config->max_conn_reply = (yyvsp[(3) - (4)].tok).i; }
break;
- case 38:
-/* Line 1787 of yacc.c */
-#line 613 "knot/conf/cf-parse.y"
+ case 39:
+
+/* Line 1806 of yacc.c */
+#line 623 "cf-parse.y"
{ new_config->rrl = (yyvsp[(3) - (4)].tok).i; }
break;
- case 39:
-/* Line 1787 of yacc.c */
-#line 614 "knot/conf/cf-parse.y"
+ case 40:
+
+/* Line 1806 of yacc.c */
+#line 624 "cf-parse.y"
{ new_config->rrl_size = (yyvsp[(3) - (4)].tok).l; }
break;
- case 40:
-/* Line 1787 of yacc.c */
-#line 615 "knot/conf/cf-parse.y"
+ case 41:
+
+/* Line 1806 of yacc.c */
+#line 625 "cf-parse.y"
{ new_config->rrl_size = (yyvsp[(3) - (4)].tok).i; }
break;
- case 41:
-/* Line 1787 of yacc.c */
-#line 616 "knot/conf/cf-parse.y"
+ case 42:
+
+/* Line 1806 of yacc.c */
+#line 626 "cf-parse.y"
{ new_config->rrl_slip = (yyvsp[(3) - (4)].tok).i; }
break;
- case 42:
-/* Line 1787 of yacc.c */
-#line 617 "knot/conf/cf-parse.y"
+ case 43:
+
+/* Line 1806 of yacc.c */
+#line 627 "cf-parse.y"
{ new_config->xfers = (yyvsp[(3) - (4)].tok).i; }
break;
- case 44:
-/* Line 1787 of yacc.c */
-#line 622 "knot/conf/cf-parse.y"
+ case 45:
+
+/* Line 1806 of yacc.c */
+#line 632 "cf-parse.y"
{
/* Check algorithm length. */
if (knot_tsig_digest_length((yyvsp[(3) - (5)].tok).alg) == 0) {
@@ -2490,39 +2549,45 @@ yyreduce:
}
break;
- case 46:
-/* Line 1787 of yacc.c */
-#line 675 "knot/conf/cf-parse.y"
- { conf_start_remote(scanner, (yyvsp[(1) - (1)].tok).t); }
- break;
-
case 47:
-/* Line 1787 of yacc.c */
-#line 676 "knot/conf/cf-parse.y"
- { conf_start_remote(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
+
+/* Line 1806 of yacc.c */
+#line 685 "cf-parse.y"
+ { conf_start_remote(scanner, (yyvsp[(1) - (1)].tok).t); }
break;
case 48:
-/* Line 1787 of yacc.c */
-#line 677 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 686 "cf-parse.y"
{ conf_start_remote(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 49:
-/* Line 1787 of yacc.c */
-#line 678 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 687 "cf-parse.y"
{ conf_start_remote(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 50:
-/* Line 1787 of yacc.c */
-#line 679 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 688 "cf-parse.y"
{ conf_start_remote(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
- case 52:
-/* Line 1787 of yacc.c */
-#line 683 "knot/conf/cf-parse.y"
+ case 51:
+
+/* Line 1806 of yacc.c */
+#line 689 "cf-parse.y"
+ { conf_start_remote(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
+ break;
+
+ case 53:
+
+/* Line 1806 of yacc.c */
+#line 693 "cf-parse.y"
{
if (this_remote->port != 0) {
cf_error(scanner, "only one port definition is allowed in remote section\n");
@@ -2532,9 +2597,10 @@ yyreduce:
}
break;
- case 53:
-/* Line 1787 of yacc.c */
-#line 690 "knot/conf/cf-parse.y"
+ case 54:
+
+/* Line 1806 of yacc.c */
+#line 700 "cf-parse.y"
{
if (this_remote->address != 0) {
cf_error(scanner, "only one address is allowed in remote section\n");
@@ -2546,9 +2612,10 @@ yyreduce:
}
break;
- case 54:
-/* Line 1787 of yacc.c */
-#line 699 "knot/conf/cf-parse.y"
+ case 55:
+
+/* Line 1806 of yacc.c */
+#line 709 "cf-parse.y"
{
if (this_remote->address != 0) {
cf_error(scanner, "only one address is allowed in remote section\n");
@@ -2560,9 +2627,10 @@ yyreduce:
}
break;
- case 55:
-/* Line 1787 of yacc.c */
-#line 708 "knot/conf/cf-parse.y"
+ case 56:
+
+/* Line 1806 of yacc.c */
+#line 718 "cf-parse.y"
{
if (this_remote->address != 0) {
cf_error(scanner, "only one address is allowed in remote section\n");
@@ -2579,9 +2647,10 @@ yyreduce:
}
break;
- case 56:
-/* Line 1787 of yacc.c */
-#line 722 "knot/conf/cf-parse.y"
+ case 57:
+
+/* Line 1806 of yacc.c */
+#line 732 "cf-parse.y"
{
if (this_remote->address != 0) {
cf_error(scanner, "only one address is allowed in remote section\n");
@@ -2593,9 +2662,10 @@ yyreduce:
}
break;
- case 57:
-/* Line 1787 of yacc.c */
-#line 731 "knot/conf/cf-parse.y"
+ case 58:
+
+/* Line 1806 of yacc.c */
+#line 741 "cf-parse.y"
{
if (this_remote->address != 0) {
cf_error(scanner, "only one address is allowed in remote section\n");
@@ -2607,9 +2677,10 @@ yyreduce:
}
break;
- case 58:
-/* Line 1787 of yacc.c */
-#line 740 "knot/conf/cf-parse.y"
+ case 59:
+
+/* Line 1806 of yacc.c */
+#line 750 "cf-parse.y"
{
if (this_remote->address != 0) {
cf_error(scanner, "only one address is allowed in remote section\n");
@@ -2626,9 +2697,10 @@ yyreduce:
}
break;
- case 59:
-/* Line 1787 of yacc.c */
-#line 754 "knot/conf/cf-parse.y"
+ case 60:
+
+/* Line 1806 of yacc.c */
+#line 764 "cf-parse.y"
{
if (this_remote->key != 0) {
cf_error(scanner, "only one TSIG key definition is allowed in remote section\n");
@@ -2639,36 +2711,40 @@ yyreduce:
}
break;
- case 60:
-/* Line 1787 of yacc.c */
-#line 762 "knot/conf/cf-parse.y"
+ case 61:
+
+/* Line 1806 of yacc.c */
+#line 772 "cf-parse.y"
{
sockaddr_set(&this_remote->via, AF_INET, (yyvsp[(3) - (4)].tok).t, 0);
free((yyvsp[(3) - (4)].tok).t);
}
break;
- case 61:
-/* Line 1787 of yacc.c */
-#line 766 "knot/conf/cf-parse.y"
+ case 62:
+
+/* Line 1806 of yacc.c */
+#line 776 "cf-parse.y"
{
sockaddr_set(&this_remote->via, AF_INET6, (yyvsp[(3) - (4)].tok).t, 0);
free((yyvsp[(3) - (4)].tok).t);
}
break;
- case 62:
-/* Line 1787 of yacc.c */
-#line 770 "knot/conf/cf-parse.y"
+ case 63:
+
+/* Line 1806 of yacc.c */
+#line 780 "cf-parse.y"
{
conf_remote_set_via(scanner, (yyvsp[(3) - (4)].tok).t);
free((yyvsp[(3) - (4)].tok).t);
}
break;
- case 64:
-/* Line 1787 of yacc.c */
-#line 778 "knot/conf/cf-parse.y"
+ case 65:
+
+/* Line 1806 of yacc.c */
+#line 788 "cf-parse.y"
{
if (this_remote->address == 0) {
cf_error(scanner, "remote '%s' has no defined address", this_remote->name);
@@ -2676,91 +2752,104 @@ yyreduce:
}
break;
- case 65:
-/* Line 1787 of yacc.c */
-#line 786 "knot/conf/cf-parse.y"
+ case 66:
+
+/* Line 1806 of yacc.c */
+#line 796 "cf-parse.y"
{ conf_add_member_into_group(scanner, (yyvsp[(1) - (1)].tok).t); }
break;
- case 69:
-/* Line 1787 of yacc.c */
-#line 796 "knot/conf/cf-parse.y"
+ case 70:
+
+/* Line 1806 of yacc.c */
+#line 806 "cf-parse.y"
{ conf_start_group(scanner, (yyvsp[(1) - (1)].tok).t); }
break;
- case 72:
-/* Line 1787 of yacc.c */
-#line 805 "knot/conf/cf-parse.y"
+ case 73:
+
+/* Line 1806 of yacc.c */
+#line 815 "cf-parse.y"
{
this_list = &this_zone->acl.xfr_in;
}
break;
- case 73:
-/* Line 1787 of yacc.c */
-#line 808 "knot/conf/cf-parse.y"
+ case 74:
+
+/* Line 1806 of yacc.c */
+#line 818 "cf-parse.y"
{
this_list = &this_zone->acl.xfr_out;
}
break;
- case 74:
-/* Line 1787 of yacc.c */
-#line 811 "knot/conf/cf-parse.y"
+ case 75:
+
+/* Line 1806 of yacc.c */
+#line 821 "cf-parse.y"
{
this_list = &this_zone->acl.notify_in;
}
break;
- case 75:
-/* Line 1787 of yacc.c */
-#line 814 "knot/conf/cf-parse.y"
+ case 76:
+
+/* Line 1806 of yacc.c */
+#line 824 "cf-parse.y"
{
this_list = &this_zone->acl.notify_out;
}
break;
- case 76:
-/* Line 1787 of yacc.c */
-#line 817 "knot/conf/cf-parse.y"
+ case 77:
+
+/* Line 1806 of yacc.c */
+#line 827 "cf-parse.y"
{
this_list = &this_zone->acl.update_in;
}
break;
- case 78:
-/* Line 1787 of yacc.c */
-#line 823 "knot/conf/cf-parse.y"
- { conf_acl_item(scanner, (yyvsp[(1) - (1)].tok).t); }
- break;
-
case 79:
-/* Line 1787 of yacc.c */
-#line 824 "knot/conf/cf-parse.y"
- { conf_acl_item(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
+
+/* Line 1806 of yacc.c */
+#line 833 "cf-parse.y"
+ { conf_acl_item(scanner, (yyvsp[(1) - (1)].tok).t); }
break;
case 80:
-/* Line 1787 of yacc.c */
-#line 825 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 834 "cf-parse.y"
{ conf_acl_item(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 81:
-/* Line 1787 of yacc.c */
-#line 826 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 835 "cf-parse.y"
{ conf_acl_item(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 82:
-/* Line 1787 of yacc.c */
-#line 827 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 836 "cf-parse.y"
{ conf_acl_item(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
- case 87:
-/* Line 1787 of yacc.c */
-#line 836 "knot/conf/cf-parse.y"
+ case 83:
+
+/* Line 1806 of yacc.c */
+#line 837 "cf-parse.y"
+ { conf_acl_item(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
+ break;
+
+ case 88:
+
+/* Line 1806 of yacc.c */
+#line 846 "cf-parse.y"
{
/* Find existing node in remotes. */
node* r = 0; conf_iface_t* found = 0;
@@ -2789,45 +2878,52 @@ yyreduce:
}
break;
- case 89:
-/* Line 1787 of yacc.c */
-#line 865 "knot/conf/cf-parse.y"
- { conf_zone_start(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
- break;
-
case 90:
-/* Line 1787 of yacc.c */
-#line 866 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 875 "cf-parse.y"
{ conf_zone_start(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 91:
-/* Line 1787 of yacc.c */
-#line 867 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 876 "cf-parse.y"
{ conf_zone_start(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 92:
-/* Line 1787 of yacc.c */
-#line 868 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 877 "cf-parse.y"
{ conf_zone_start(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 93:
-/* Line 1787 of yacc.c */
-#line 869 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 878 "cf-parse.y"
{ conf_zone_start(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 94:
-/* Line 1787 of yacc.c */
-#line 870 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 879 "cf-parse.y"
{ conf_zone_start(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
break;
case 95:
-/* Line 1787 of yacc.c */
-#line 871 "knot/conf/cf-parse.y"
+
+/* Line 1806 of yacc.c */
+#line 880 "cf-parse.y"
+ { conf_zone_start(scanner, strdup((yyvsp[(1) - (1)].tok).t)); }
+ break;
+
+ case 96:
+
+/* Line 1806 of yacc.c */
+#line 881 "cf-parse.y"
{
if ((yyvsp[(1) - (3)].tok).i < 0 || (yyvsp[(1) - (3)].tok).i > 255) {
cf_error(scanner, "rfc2317 origin prefix '%ld' out of bounds", (yyvsp[(1) - (3)].tok).i);
@@ -2847,63 +2943,73 @@ yyreduce:
}
break;
- case 96:
-/* Line 1787 of yacc.c */
-#line 888 "knot/conf/cf-parse.y"
+ case 97:
+
+/* Line 1806 of yacc.c */
+#line 898 "cf-parse.y"
{ conf_zone_start(scanner, (yyvsp[(1) - (1)].tok).t); }
break;
- case 100:
-/* Line 1787 of yacc.c */
-#line 895 "knot/conf/cf-parse.y"
+ case 101:
+
+/* Line 1806 of yacc.c */
+#line 905 "cf-parse.y"
{ this_zone->file = (yyvsp[(3) - (4)].tok).t; }
break;
- case 101:
-/* Line 1787 of yacc.c */
-#line 896 "knot/conf/cf-parse.y"
+ case 102:
+
+/* Line 1806 of yacc.c */
+#line 906 "cf-parse.y"
{ this_zone->build_diffs = (yyvsp[(3) - (4)].tok).i; }
break;
- case 102:
-/* Line 1787 of yacc.c */
-#line 897 "knot/conf/cf-parse.y"
+ case 103:
+
+/* Line 1806 of yacc.c */
+#line 907 "cf-parse.y"
{ this_zone->enable_checks = (yyvsp[(3) - (4)].tok).i; }
break;
- case 103:
-/* Line 1787 of yacc.c */
-#line 898 "knot/conf/cf-parse.y"
+ case 104:
+
+/* Line 1806 of yacc.c */
+#line 908 "cf-parse.y"
{ this_zone->disable_any = (yyvsp[(3) - (4)].tok).i; }
break;
- case 104:
-/* Line 1787 of yacc.c */
-#line 899 "knot/conf/cf-parse.y"
+ case 105:
+
+/* Line 1806 of yacc.c */
+#line 909 "cf-parse.y"
{ this_zone->dbsync_timeout = (yyvsp[(3) - (4)].tok).i; }
break;
- case 105:
-/* Line 1787 of yacc.c */
-#line 900 "knot/conf/cf-parse.y"
+ case 106:
+
+/* Line 1806 of yacc.c */
+#line 910 "cf-parse.y"
{ this_zone->dbsync_timeout = (yyvsp[(3) - (4)].tok).i; }
break;
- case 106:
-/* Line 1787 of yacc.c */
-#line 901 "knot/conf/cf-parse.y"
+ case 107:
+
+/* Line 1806 of yacc.c */
+#line 911 "cf-parse.y"
{ new_config->ixfr_fslimit = (yyvsp[(3) - (4)].tok).l; }
break;
- case 107:
-/* Line 1787 of yacc.c */
-#line 902 "knot/conf/cf-parse.y"
+ case 108:
+
+/* Line 1806 of yacc.c */
+#line 912 "cf-parse.y"
{ this_zone->ixfr_fslimit = (yyvsp[(3) - (4)].tok).i; }
break;
- case 108:
-/* Line 1787 of yacc.c */
-#line 903 "knot/conf/cf-parse.y"
+ case 109:
+
+/* Line 1806 of yacc.c */
+#line 913 "cf-parse.y"
{
if ((yyvsp[(3) - (4)].tok).i < 1) {
cf_error(scanner, "notify retries must be positive integer");
@@ -2913,9 +3019,10 @@ yyreduce:
}
break;
- case 109:
-/* Line 1787 of yacc.c */
-#line 910 "knot/conf/cf-parse.y"
+ case 110:
+
+/* Line 1806 of yacc.c */
+#line 920 "cf-parse.y"
{
if ((yyvsp[(3) - (4)].tok).i < 1) {
cf_error(scanner, "notify timeout must be positive integer");
@@ -2925,39 +3032,45 @@ yyreduce:
}
break;
- case 112:
-/* Line 1787 of yacc.c */
-#line 922 "knot/conf/cf-parse.y"
+ case 113:
+
+/* Line 1806 of yacc.c */
+#line 932 "cf-parse.y"
{ new_config->disable_any = (yyvsp[(3) - (4)].tok).i; }
break;
- case 113:
-/* Line 1787 of yacc.c */
-#line 923 "knot/conf/cf-parse.y"
+ case 114:
+
+/* Line 1806 of yacc.c */
+#line 933 "cf-parse.y"
{ new_config->build_diffs = (yyvsp[(3) - (4)].tok).i; }
break;
- case 114:
-/* Line 1787 of yacc.c */
-#line 924 "knot/conf/cf-parse.y"
+ case 115:
+
+/* Line 1806 of yacc.c */
+#line 934 "cf-parse.y"
{ new_config->zone_checks = (yyvsp[(3) - (4)].tok).i; }
break;
- case 115:
-/* Line 1787 of yacc.c */
-#line 925 "knot/conf/cf-parse.y"
+ case 116:
+
+/* Line 1806 of yacc.c */
+#line 935 "cf-parse.y"
{ new_config->ixfr_fslimit = (yyvsp[(3) - (4)].tok).l; }
break;
- case 116:
-/* Line 1787 of yacc.c */
-#line 926 "knot/conf/cf-parse.y"
+ case 117:
+
+/* Line 1806 of yacc.c */
+#line 936 "cf-parse.y"
{ new_config->ixfr_fslimit = (yyvsp[(3) - (4)].tok).i; }
break;
- case 117:
-/* Line 1787 of yacc.c */
-#line 927 "knot/conf/cf-parse.y"
+ case 118:
+
+/* Line 1806 of yacc.c */
+#line 937 "cf-parse.y"
{
if ((yyvsp[(3) - (4)].tok).i < 1) {
cf_error(scanner, "notify retries must be positive integer");
@@ -2967,9 +3080,10 @@ yyreduce:
}
break;
- case 118:
-/* Line 1787 of yacc.c */
-#line 934 "knot/conf/cf-parse.y"
+ case 119:
+
+/* Line 1806 of yacc.c */
+#line 944 "cf-parse.y"
{
if ((yyvsp[(3) - (4)].tok).i < 1) {
cf_error(scanner, "notify timeout must be positive integer");
@@ -2979,9 +3093,10 @@ yyreduce:
}
break;
- case 119:
-/* Line 1787 of yacc.c */
-#line 941 "knot/conf/cf-parse.y"
+ case 120:
+
+/* Line 1806 of yacc.c */
+#line 951 "cf-parse.y"
{
if ((yyvsp[(3) - (4)].tok).i < 1) {
cf_error(scanner, "zonefile sync timeout must be positive integer");
@@ -2991,15 +3106,17 @@ yyreduce:
}
break;
- case 120:
-/* Line 1787 of yacc.c */
-#line 948 "knot/conf/cf-parse.y"
+ case 121:
+
+/* Line 1806 of yacc.c */
+#line 958 "cf-parse.y"
{ new_config->dbsync_timeout = (yyvsp[(3) - (4)].tok).i; }
break;
- case 121:
-/* Line 1787 of yacc.c */
-#line 951 "knot/conf/cf-parse.y"
+ case 122:
+
+/* Line 1806 of yacc.c */
+#line 961 "cf-parse.y"
{
this_logmap = malloc(sizeof(conf_log_map_t));
this_logmap->source = 0;
@@ -3008,30 +3125,34 @@ yyreduce:
}
break;
- case 123:
-/* Line 1787 of yacc.c */
-#line 961 "knot/conf/cf-parse.y"
+ case 124:
+
+/* Line 1806 of yacc.c */
+#line 971 "cf-parse.y"
{ this_logmap->prios |= (yyvsp[(2) - (3)].tok).i; }
break;
- case 124:
-/* Line 1787 of yacc.c */
-#line 962 "knot/conf/cf-parse.y"
+ case 125:
+
+/* Line 1806 of yacc.c */
+#line 972 "cf-parse.y"
{ this_logmap->prios |= (yyvsp[(2) - (3)].tok).i; }
break;
- case 126:
-/* Line 1787 of yacc.c */
-#line 966 "knot/conf/cf-parse.y"
+ case 127:
+
+/* Line 1806 of yacc.c */
+#line 976 "cf-parse.y"
{
this_logmap->source = (yyvsp[(2) - (3)].tok).i;
this_logmap = 0;
}
break;
- case 127:
-/* Line 1787 of yacc.c */
-#line 972 "knot/conf/cf-parse.y"
+ case 128:
+
+/* Line 1806 of yacc.c */
+#line 982 "cf-parse.y"
{
/* Find already existing rule. */
this_log = 0;
@@ -3055,9 +3176,10 @@ yyreduce:
}
break;
- case 128:
-/* Line 1787 of yacc.c */
-#line 995 "knot/conf/cf-parse.y"
+ case 129:
+
+/* Line 1806 of yacc.c */
+#line 1005 "cf-parse.y"
{
/* Find already existing rule. */
this_log = 0;
@@ -3085,42 +3207,48 @@ yyreduce:
}
break;
- case 129:
-/* Line 1787 of yacc.c */
-#line 1022 "knot/conf/cf-parse.y"
+ case 130:
+
+/* Line 1806 of yacc.c */
+#line 1032 "cf-parse.y"
{
}
break;
- case 133:
-/* Line 1787 of yacc.c */
-#line 1031 "knot/conf/cf-parse.y"
+ case 134:
+
+/* Line 1806 of yacc.c */
+#line 1041 "cf-parse.y"
{ new_config->logs_count = 0; }
break;
- case 135:
-/* Line 1787 of yacc.c */
-#line 1035 "knot/conf/cf-parse.y"
+ case 136:
+
+/* Line 1806 of yacc.c */
+#line 1045 "cf-parse.y"
{ conf_init_iface(scanner, NULL, -1); }
break;
- case 136:
-/* Line 1787 of yacc.c */
-#line 1039 "knot/conf/cf-parse.y"
+ case 137:
+
+/* Line 1806 of yacc.c */
+#line 1049 "cf-parse.y"
{
this_list = &new_config->ctl.allow;
}
break;
- case 137:
-/* Line 1787 of yacc.c */
-#line 1045 "knot/conf/cf-parse.y"
+ case 138:
+
+/* Line 1806 of yacc.c */
+#line 1055 "cf-parse.y"
{ new_config->ctl.have = true; }
break;
- case 138:
-/* Line 1787 of yacc.c */
-#line 1046 "knot/conf/cf-parse.y"
+ case 139:
+
+/* Line 1806 of yacc.c */
+#line 1056 "cf-parse.y"
{
if (this_iface->address == 0) {
cf_error(scanner, "control interface has no defined address");
@@ -3130,9 +3258,10 @@ yyreduce:
}
break;
- case 139:
-/* Line 1787 of yacc.c */
-#line 1053 "knot/conf/cf-parse.y"
+ case 140:
+
+/* Line 1806 of yacc.c */
+#line 1063 "cf-parse.y"
{
this_iface->address = (yyvsp[(3) - (4)].tok).t;
this_iface->family = AF_UNIX;
@@ -3142,8 +3271,9 @@ yyreduce:
break;
-/* Line 1787 of yacc.c */
-#line 3147 "knot/conf/libknotd_la-cf-parse.c"
+
+/* Line 1806 of yacc.c */
+#line 3277 "knot/conf/libknotd_la-cf-parse.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -3306,9 +3436,7 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
- YY_IGNORE_MAYBE_UNINITIALIZED_END
/* Shift the error token. */
@@ -3332,7 +3460,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -3374,6 +3502,8 @@ yyreturn:
}
-/* Line 2050 of yacc.c */
-#line 1065 "knot/conf/cf-parse.y"
+
+/* Line 2067 of yacc.c */
+#line 1075 "cf-parse.y"
+
diff --git a/src/knot/conf/libknotd_la-cf-parse.h b/src/knot/conf/libknotd_la-cf-parse.h
index bfd87b7..9f475fc 100644
--- a/src/knot/conf/libknotd_la-cf-parse.h
+++ b/src/knot/conf/libknotd_la-cf-parse.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
+/* A Bison parser, made by GNU Bison 2.5. */
/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -30,15 +30,6 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-#ifndef YY_CF_KNOT_CONF_LIBKNOTD_LA_CF_PARSE_H_INCLUDED
-# define YY_CF_KNOT_CONF_LIBKNOTD_LA_CF_PARSE_H_INCLUDED
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int cf_debug;
-#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -62,47 +53,48 @@ extern int cf_debug;
STORAGE = 271,
KEY = 272,
KEYS = 273,
- TSIG_ALGO_NAME = 274,
- WORKERS = 275,
- USER = 276,
- RUNDIR = 277,
- PIDFILE = 278,
- REMOTES = 279,
- GROUPS = 280,
- ZONES = 281,
- FILENAME = 282,
- DISABLE_ANY = 283,
- SEMANTIC_CHECKS = 284,
- NOTIFY_RETRIES = 285,
- NOTIFY_TIMEOUT = 286,
- DBSYNC_TIMEOUT = 287,
- IXFR_FSLIMIT = 288,
- XFR_IN = 289,
- XFR_OUT = 290,
- UPDATE_IN = 291,
- NOTIFY_IN = 292,
- NOTIFY_OUT = 293,
- BUILD_DIFFS = 294,
- MAX_CONN_IDLE = 295,
- MAX_CONN_HS = 296,
- MAX_CONN_REPLY = 297,
- RATE_LIMIT = 298,
- RATE_LIMIT_SIZE = 299,
- RATE_LIMIT_SLIP = 300,
- TRANSFERS = 301,
- INTERFACES = 302,
- ADDRESS = 303,
- PORT = 304,
- IPA = 305,
- IPA6 = 306,
- VIA = 307,
- CONTROL = 308,
- ALLOW = 309,
- LISTEN_ON = 310,
- LOG = 311,
- LOG_DEST = 312,
- LOG_SRC = 313,
- LOG_LEVEL = 314
+ MAX_UDP_PAYLOAD = 274,
+ TSIG_ALGO_NAME = 275,
+ WORKERS = 276,
+ USER = 277,
+ RUNDIR = 278,
+ PIDFILE = 279,
+ REMOTES = 280,
+ GROUPS = 281,
+ ZONES = 282,
+ FILENAME = 283,
+ DISABLE_ANY = 284,
+ SEMANTIC_CHECKS = 285,
+ NOTIFY_RETRIES = 286,
+ NOTIFY_TIMEOUT = 287,
+ DBSYNC_TIMEOUT = 288,
+ IXFR_FSLIMIT = 289,
+ XFR_IN = 290,
+ XFR_OUT = 291,
+ UPDATE_IN = 292,
+ NOTIFY_IN = 293,
+ NOTIFY_OUT = 294,
+ BUILD_DIFFS = 295,
+ MAX_CONN_IDLE = 296,
+ MAX_CONN_HS = 297,
+ MAX_CONN_REPLY = 298,
+ RATE_LIMIT = 299,
+ RATE_LIMIT_SIZE = 300,
+ RATE_LIMIT_SLIP = 301,
+ TRANSFERS = 302,
+ INTERFACES = 303,
+ ADDRESS = 304,
+ PORT = 305,
+ IPA = 306,
+ IPA6 = 307,
+ VIA = 308,
+ CONTROL = 309,
+ ALLOW = 310,
+ LISTEN_ON = 311,
+ LOG = 312,
+ LOG_DEST = 313,
+ LOG_SRC = 314,
+ LOG_LEVEL = 315
};
#endif
/* Tokens. */
@@ -122,55 +114,58 @@ extern int cf_debug;
#define STORAGE 271
#define KEY 272
#define KEYS 273
-#define TSIG_ALGO_NAME 274
-#define WORKERS 275
-#define USER 276
-#define RUNDIR 277
-#define PIDFILE 278
-#define REMOTES 279
-#define GROUPS 280
-#define ZONES 281
-#define FILENAME 282
-#define DISABLE_ANY 283
-#define SEMANTIC_CHECKS 284
-#define NOTIFY_RETRIES 285
-#define NOTIFY_TIMEOUT 286
-#define DBSYNC_TIMEOUT 287
-#define IXFR_FSLIMIT 288
-#define XFR_IN 289
-#define XFR_OUT 290
-#define UPDATE_IN 291
-#define NOTIFY_IN 292
-#define NOTIFY_OUT 293
-#define BUILD_DIFFS 294
-#define MAX_CONN_IDLE 295
-#define MAX_CONN_HS 296
-#define MAX_CONN_REPLY 297
-#define RATE_LIMIT 298
-#define RATE_LIMIT_SIZE 299
-#define RATE_LIMIT_SLIP 300
-#define TRANSFERS 301
-#define INTERFACES 302
-#define ADDRESS 303
-#define PORT 304
-#define IPA 305
-#define IPA6 306
-#define VIA 307
-#define CONTROL 308
-#define ALLOW 309
-#define LISTEN_ON 310
-#define LOG 311
-#define LOG_DEST 312
-#define LOG_SRC 313
-#define LOG_LEVEL 314
+#define MAX_UDP_PAYLOAD 274
+#define TSIG_ALGO_NAME 275
+#define WORKERS 276
+#define USER 277
+#define RUNDIR 278
+#define PIDFILE 279
+#define REMOTES 280
+#define GROUPS 281
+#define ZONES 282
+#define FILENAME 283
+#define DISABLE_ANY 284
+#define SEMANTIC_CHECKS 285
+#define NOTIFY_RETRIES 286
+#define NOTIFY_TIMEOUT 287
+#define DBSYNC_TIMEOUT 288
+#define IXFR_FSLIMIT 289
+#define XFR_IN 290
+#define XFR_OUT 291
+#define UPDATE_IN 292
+#define NOTIFY_IN 293
+#define NOTIFY_OUT 294
+#define BUILD_DIFFS 295
+#define MAX_CONN_IDLE 296
+#define MAX_CONN_HS 297
+#define MAX_CONN_REPLY 298
+#define RATE_LIMIT 299
+#define RATE_LIMIT_SIZE 300
+#define RATE_LIMIT_SLIP 301
+#define TRANSFERS 302
+#define INTERFACES 303
+#define ADDRESS 304
+#define PORT 305
+#define IPA 306
+#define IPA6 307
+#define VIA 308
+#define CONTROL 309
+#define ALLOW 310
+#define LISTEN_ON 311
+#define LOG 312
+#define LOG_DEST 313
+#define LOG_SRC 314
+#define LOG_LEVEL 315
+
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-/* Line 2053 of yacc.c */
-#line 421 "knot/conf/cf-parse.y"
+
+/* Line 2068 of yacc.c */
+#line 422 "cf-parse.y"
struct {
char *t;
@@ -180,8 +175,9 @@ typedef union YYSTYPE
} tok;
-/* Line 2053 of yacc.c */
-#line 185 "knot/conf/libknotd_la-cf-parse.h"
+
+/* Line 2068 of yacc.c */
+#line 181 "knot/conf/libknotd_la-cf-parse.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -189,18 +185,5 @@ typedef union YYSTYPE
#endif
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int cf_parse (void *YYPARSE_PARAM);
-#else
-int cf_parse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int cf_parse (void *scanner);
-#else
-int cf_parse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-#endif /* !YY_CF_KNOT_CONF_LIBKNOTD_LA_CF_PARSE_H_INCLUDED */
+
diff --git a/src/knot/main.c b/src/knot/main.c
index 3c5102f..66eb450 100644
--- a/src/knot/main.c
+++ b/src/knot/main.c
@@ -158,6 +158,12 @@ int main(int argc, char **argv)
}
}
+ // Check for non-option parameters.
+ if (argc - optind > 0) {
+ help();
+ return 1;
+ }
+
// Now check if we want to daemonize
if (daemonize) {
if (daemon(1, 0) != 0) {
diff --git a/src/knot/server/zones.c b/src/knot/server/zones.c
index 17bd0f8..0fb9001 100644
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
@@ -2667,7 +2667,7 @@ int zones_ns_conf_hook(const struct conf_t *conf, void *data)
log_server_error("Couldn't create OPT RR, please restart.\n");
} else {
knot_edns_set_version(opt_rr, EDNS_VERSION);
- knot_edns_set_payload(opt_rr, EDNS_MAX_UDP_PAYLOAD);
+ knot_edns_set_payload(opt_rr, conf->max_udp_payload);
if (conf->nsid_len > 0) {
knot_edns_add_option(opt_rr, EDNS_OPTION_NSID,
conf->nsid_len,
diff --git a/src/libknot/edns.h b/src/libknot/edns.h
index 76dae27..d3631ba 100644
--- a/src/libknot/edns.h
+++ b/src/libknot/edns.h
@@ -72,8 +72,8 @@ typedef struct knot_opt_rr knot_opt_rr_t;
/*----------------------------------------------------------------------------*/
/*! \brief Constants for EDNS. */
enum knot_edns_const {
-
- EDNS_MAX_UDP_PAYLOAD = 4096, /*!< Maximum UDP payload with EDNS enabled. */
+ EDNS_MIN_UDP_PAYLOAD = 512, /*!< Minimal UDP payload with EDNS enabled. */
+ EDNS_MAX_UDP_PAYLOAD = 4096, /*!< Maximal UDP payload with EDNS enabled. */
EDNS_VERSION = 0, /*!< Supported EDNS version. */
EDNS_NOT_SUPPORTED = 255, /*!< EDNS not supported. */
EDNS_OPTION_NSID = 3, /*!< NSID option code. */
diff --git a/src/libknot/nameserver/name-server.c b/src/libknot/nameserver/name-server.c
index a033f0d..9da91f4 100644
--- a/src/libknot/nameserver/name-server.c
+++ b/src/libknot/nameserver/name-server.c
@@ -41,7 +41,7 @@
/*----------------------------------------------------------------------------*/
/*! \brief Maximum UDP payload with EDNS disabled. */
-static const uint16_t MAX_UDP_PAYLOAD = 504; // 512 - 8B header
+static const uint16_t MAX_UDP_PAYLOAD = 512;
/*! \brief TTL of a CNAME synthetized from a DNAME. */
static const uint32_t SYNTH_CNAME_TTL = 0;
@@ -3425,7 +3425,7 @@ int knot_ns_prep_normal_response(knot_nameserver_t *nameserver,
// set the OPT RR to the response
if (knot_query_edns_supported(query)) {
- ret = knot_response_add_opt(*resp, nameserver->opt_rr, 1,
+ ret = knot_response_add_opt(*resp, nameserver->opt_rr,
knot_query_nsid_requested(query));
if (ret != KNOT_EOK) {
dbg_ns("Failed to set OPT RR to the response"
@@ -3568,7 +3568,7 @@ int knot_ns_prep_update_response(knot_nameserver_t *nameserver,
// set the OPT RR to the response
if (knot_query_edns_supported(query)) {
- ret = knot_response_add_opt(*resp, nameserver->opt_rr, 1,
+ ret = knot_response_add_opt(*resp, nameserver->opt_rr,
knot_query_nsid_requested(query));
if (ret != KNOT_EOK) {
dbg_ns("Failed to set OPT RR to the response"
diff --git a/src/libknot/packet/response.c b/src/libknot/packet/response.c
index 8e1f1b0..ddd594c 100644
--- a/src/libknot/packet/response.c
+++ b/src/libknot/packet/response.c
@@ -449,7 +449,6 @@ void knot_response_clear(knot_packet_t *resp, int clear_question)
int knot_response_add_opt(knot_packet_t *resp,
const knot_opt_rr_t *opt_rr,
- int override_max_size,
int add_nsid)
{
if (resp == NULL || opt_rr == NULL) {
@@ -498,21 +497,6 @@ int knot_response_add_opt(knot_packet_t *resp,
resp->opt_rr.size = EDNS_MIN_SIZE;
}
- // if max size is set, it means there is some reason to be that way,
- // so we can't just set it to higher value
-
- if (override_max_size && resp->max_size > 0
- && resp->max_size < opt_rr->payload) {
- return KNOT_EOK;
- }
-
- // set max size (less is OK)
- if (override_max_size) {
- dbg_response("Overriding max size to: %u\n",
- resp->opt_rr.payload);
- return knot_packet_set_max_size(resp, resp->opt_rr.payload);
- }
-
return KNOT_EOK;
}
diff --git a/src/libknot/packet/response.h b/src/libknot/packet/response.h
index b68ca45..799a88c 100644
--- a/src/libknot/packet/response.h
+++ b/src/libknot/packet/response.h
@@ -130,6 +130,9 @@ void knot_response_clear(knot_packet_t *resp, int clear_question);
*
* \note The contents of the OPT RR are copied.
*
+ * \note It is expected that resp.max_size is already set to correct value as
+ * it is impossible to distinguish TCP scenario in this function.
+ *
* \param resp Response to set the OPT RR to.
* \param opt_rr OPT RR to set.
*
@@ -140,9 +143,8 @@ void knot_response_clear(knot_packet_t *resp, int clear_question);
* \todo Needs test.
*/
int knot_response_add_opt(knot_packet_t *resp,
- const knot_opt_rr_t *opt_rr,
- int override_max_size,
- int add_nsid);
+ const knot_opt_rr_t *opt_rr,
+ int add_nsid);
/*!
* \brief Adds a RRSet to the Answer section of the response.
diff --git a/src/libknot/util/endian.h b/src/libknot/util/endian.h
index 1702bbc..cfb779d 100644
--- a/src/libknot/util/endian.h
+++ b/src/libknot/util/endian.h
@@ -13,12 +13,24 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#ifndef _KNOT_ENDIAN_H
#define _KNOT_ENDIAN_H
#if defined(__linux__)
# include <endian.h>
+# ifndef HAVE_BE64TOH
+# include <arpa/inet.h>
+# define be32toh(x) ntohl(x)
+# define be16toh(x) ntohs(x)
+# if BYTE_ORDER == LITTLE_ENDIAN
+# include <byteswap.h>
+# define be64toh(x) bswap_64 (x)
+# else
+# define be64toh(x) (x)
+# endif
+# endif
#elif defined(__FreeBSD__) || defined(__NetBSD__)
# include <sys/endian.h>
#elif defined(__OpenBSD__)
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 7baeaf2..90e5110 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in 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.
@@ -14,51 +15,6 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -80,8 +36,7 @@ host_triplet = @host@
check_PROGRAMS = unittests$(EXEEXT)
TESTS = unittests$(EXEEXT)
subdir = src/tests
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp $(top_srcdir)/test-driver
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -113,19 +68,6 @@ unittests_DEPENDENCIES = ../libknotd.la ../libknots.la @LIBOBJS@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
-am__v_lt_1 =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -138,246 +80,26 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(unittests_SOURCES) $(nodist_unittests_SOURCES)
DIST_SOURCES = $(unittests_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-am__tty_colors_dummy = \
- mgn= red= grn= lgn= blu= brg= std=; \
- am__color_tests=no
-am__tty_colors = { \
- $(am__tty_colors_dummy); \
- if test "X$(AM_COLOR_TESTS)" = Xno; then \
- am__color_tests=no; \
- elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
- am__color_tests=yes; \
- elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
- am__color_tests=yes; \
- fi; \
- if test $$am__color_tests = yes; then \
- red=''; \
- grn=''; \
- lgn=''; \
- blu=''; \
- mgn=''; \
- brg=''; \
- std=''; \
- fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__recheck_rx = ^[ ]*:recheck:[ ]*
-am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
-am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
- recheck = 1; \
- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
- { \
- if (rc < 0) \
- { \
- if ((getline line2 < ($$0 ".log")) < 0) \
- recheck = 0; \
- break; \
- } \
- else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
- { \
- recheck = 0; \
- break; \
- } \
- else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
- { \
- break; \
- } \
- }; \
- if (recheck) \
- print $$0; \
- close ($$0 ".trs"); \
- close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
- print "fatal: making $@: " msg | "cat >&2"; \
- exit 1; \
-} \
-function rst_section(header) \
-{ \
- print header; \
- len = length(header); \
- for (i = 1; i <= len; i = i + 1) \
- printf "="; \
- printf "\n\n"; \
-} \
-{ \
- copy_in_global_log = 1; \
- global_test_result = "RUN"; \
- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
- { \
- if (rc < 0) \
- fatal("failed to read from " $$0 ".trs"); \
- if (line ~ /$(am__global_test_result_rx)/) \
- { \
- sub("$(am__global_test_result_rx)", "", line); \
- sub("[ ]*$$", "", line); \
- global_test_result = line; \
- } \
- else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
- copy_in_global_log = 0; \
- }; \
- if (copy_in_global_log) \
- { \
- rst_section(global_test_result ": " $$0); \
- while ((rc = (getline line < ($$0 ".log"))) != 0) \
- { \
- if (rc < 0) \
- fatal("failed to read from " $$0 ".log"); \
- print line; \
- }; \
- printf "\n"; \
- }; \
- close ($$0 ".trs"); \
- close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
- --color-tests "$$am__color_tests" \
- --enable-hard-errors "$$am__enable_hard_errors" \
- --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test. Creates the
-# directory for the log if needed. Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log. Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup); \
-$(am__vpath_adj_setup) $(am__vpath_adj) \
-$(am__tty_colors); \
-srcdir=$(srcdir); export srcdir; \
-case "$@" in \
- */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
- *) am__odir=.;; \
-esac; \
-test "x$$am__odir" = x"." || test -d "$$am__odir" \
- || $(MKDIR_P) "$$am__odir" || exit $$?; \
-if test -f "./$$f"; then dir=./; \
-elif test -f "$$f"; then dir=; \
-else dir="$(srcdir)/"; fi; \
-tst=$$dir$$f; log='$@'; \
-if test -n '$(DISABLE_HARD_ERRORS)'; then \
- am__enable_hard_errors=no; \
-else \
- am__enable_hard_errors=yes; \
-fi; \
-case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
- am__expect_failure=yes;; \
- *) \
- am__expect_failure=no;; \
-esac; \
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed). The result is saved in the shell variable
-# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
- bases='$(TEST_LOGS)'; \
- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
- bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
- case '$@' in \
- */*) \
- case '$*' in \
- */*) b='$*';; \
- *) b=`echo '$@' | sed 's/\.log$$//'`; \
- esac;; \
- *) \
- b='$*';; \
- esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
- $(TEST_LOG_FLAGS)
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -573,7 +295,7 @@ all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -675,17 +397,31 @@ libknot/rrset_tests.$(OBJEXT): libknot/$(am__dirstamp) \
libknot/$(DEPDIR)/$(am__dirstamp)
libknot/sign_tests.$(OBJEXT): libknot/$(am__dirstamp) \
libknot/$(DEPDIR)/$(am__dirstamp)
-
unittests$(EXEEXT): $(unittests_OBJECTS) $(unittests_DEPENDENCIES) $(EXTRA_unittests_DEPENDENCIES)
@rm -f unittests$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(unittests_OBJECTS) $(unittests_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f common/*.$(OBJEXT)
- -rm -f knot/*.$(OBJEXT)
- -rm -f libknot/*.$(OBJEXT)
- -rm -f zscanner/*.$(OBJEXT)
+ -rm -f common/acl_tests.$(OBJEXT)
+ -rm -f common/base32hex_tests.$(OBJEXT)
+ -rm -f common/base64_tests.$(OBJEXT)
+ -rm -f common/descriptor_tests.$(OBJEXT)
+ -rm -f common/events_tests.$(OBJEXT)
+ -rm -f common/fdset_tests.$(OBJEXT)
+ -rm -f common/hattrie_tests.$(OBJEXT)
+ -rm -f common/slab_tests.$(OBJEXT)
+ -rm -f knot/conf_tests.$(OBJEXT)
+ -rm -f knot/dthreads_tests.$(OBJEXT)
+ -rm -f knot/journal_tests.$(OBJEXT)
+ -rm -f knot/rrl_tests.$(OBJEXT)
+ -rm -f knot/server_tests.$(OBJEXT)
+ -rm -f libknot/dname_tests.$(OBJEXT)
+ -rm -f libknot/rrset_tests.$(OBJEXT)
+ -rm -f libknot/sign_tests.$(OBJEXT)
+ -rm -f libknot/wire_tests.$(OBJEXT)
+ -rm -f libknot/ztree_tests.$(OBJEXT)
+ -rm -f zscanner/zscanner_tests.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -741,15 +477,26 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
- $(am__define_uniq_tagged_files); \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -761,11 +508,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
$$unique; \
fi; \
fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -774,187 +525,102 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
- rm -f $< $@
- $(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
- @:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
- @$(am__set_TESTS_bases); \
- am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
- redo_bases=`for i in $$bases; do \
- am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
- done`; \
- if test -n "$$redo_bases"; then \
- redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
- redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
- if $(am__make_dryrun); then :; else \
- rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
- fi; \
- fi; \
- if test -n "$$am__remaking_logs"; then \
- echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
- "recursion detected" >&2; \
- else \
- am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
- fi; \
- if $(am__make_dryrun); then :; else \
- st=0; \
- errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
- for i in $$redo_bases; do \
- test -f $$i.trs && test -r $$i.trs \
- || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
- test -f $$i.log && test -r $$i.log \
- || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
done; \
- test $$st -eq 0 || exit 1; \
- fi
- @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
- ws='[ ]'; \
- results=`for b in $$bases; do echo $$b.trs; done`; \
- test -n "$$results" || results=/dev/null; \
- all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
- pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
- fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
- skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
- xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
- xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
- error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
- if test `expr $$fail + $$xpass + $$error` -eq 0; then \
- success=true; \
- else \
- success=false; \
- fi; \
- br='==================='; br=$$br$$br$$br$$br; \
- result_count () \
- { \
- if test x"$$1" = x"--maybe-color"; then \
- maybe_colorize=yes; \
- elif test x"$$1" = x"--no-color"; then \
- maybe_colorize=no; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
else \
- echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
fi; \
- shift; \
- desc=$$1 count=$$2; \
- if test $$maybe_colorize = yes && test $$count -gt 0; then \
- color_start=$$3 color_end=$$std; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
else \
- color_start= color_end=; \
+ skipped="($$skip tests were not run)"; \
fi; \
- echo "$${color_start}# $$desc $$count$${color_end}"; \
- }; \
- create_testsuite_report () \
- { \
- result_count $$1 "TOTAL:" $$all "$$brg"; \
- result_count $$1 "PASS: " $$pass "$$grn"; \
- result_count $$1 "SKIP: " $$skip "$$blu"; \
- result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
- result_count $$1 "FAIL: " $$fail "$$red"; \
- result_count $$1 "XPASS:" $$xpass "$$red"; \
- result_count $$1 "ERROR:" $$error "$$mgn"; \
- }; \
- { \
- echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
- $(am__rst_title); \
- create_testsuite_report --no-color; \
- echo; \
- echo ".. contents:: :depth: 2"; \
- echo; \
- for b in $$bases; do echo $$b; done \
- | $(am__create_global_log); \
- } >$(TEST_SUITE_LOG).tmp || exit 1; \
- mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
- if $$success; then \
- col="$$grn"; \
- else \
- col="$$red"; \
- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
- fi; \
- echo "$${col}$$br$${std}"; \
- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
- echo "$${col}$$br$${std}"; \
- create_testsuite_report --maybe-color; \
- echo "$$col$$br$$std"; \
- if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
- if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
- fi; \
- echo "$$col$$br$$std"; \
- fi; \
- $$success || exit 1
-
-check-TESTS:
- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set +e; $(am__set_TESTS_bases); \
- log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
- exit $$?;
-recheck: all $(check_PROGRAMS)
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @set +e; $(am__set_TESTS_bases); \
- bases=`for i in $$bases; do echo $$i; done \
- | $(am__list_recheck_tests)` || exit 1; \
- log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
- am__force_recheck=am--force-recheck \
- TEST_LOGS="$$log_list"; \
- exit $$?
-unittests.log: unittests$(EXEEXT)
- @p='unittests$(EXEEXT)'; \
- b='unittests'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-.test.log:
- @p='$<'; \
- $(am__set_b); \
- $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@ @p='$<'; \
-@am__EXEEXT_TRUE@ $(am__set_b); \
-@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1014,9 +680,6 @@ install-strip:
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -1110,9 +773,9 @@ uninstall-am:
.MAKE: all check check-am install install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
- clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
@@ -1122,7 +785,7 @@ uninstall-am:
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- recheck tags tags-am uninstall uninstall-am
+ tags uninstall uninstall-am
sample_conf.rc: files/sample_conf
diff --git a/src/utils/dig/dig_exec.c b/src/utils/dig/dig_exec.c
index 8a13e96..95185fc 100644
--- a/src/utils/dig/dig_exec.c
+++ b/src/utils/dig/dig_exec.c
@@ -149,7 +149,7 @@ static knot_packet_t* create_query_packet(const query_t *query,
knot_edns_set_version(opt_rr, 0);
knot_edns_set_payload(opt_rr, max_size);
- if (knot_response_add_opt(packet, opt_rr, 0, 0) != KNOT_EOK) {
+ if (knot_response_add_opt(packet, opt_rr, 0) != KNOT_EOK) {
ERR("can't set EDNS section\n");
knot_edns_free(&opt_rr);
knot_packet_free(&packet);
diff --git a/src/zscanner/scanner.c b/src/zscanner/scanner.c
index 4236ad4..2a2a974 100644
--- a/src/zscanner/scanner.c
+++ b/src/zscanner/scanner.c
@@ -7786,6 +7786,13 @@ _again:
return -1;
}
+ // Check unclosed multiline record.
+ if (is_last_block && s->multiline) {
+ SCANNER_ERROR(ZSCANNER_UNCLOSED_MULTILINE);
+ s->error_counter++;
+ s->process_error(s);
+ }
+
// Storing scanner states.
s->cs = cs;
s->top = top;
diff --git a/src/zscanner/scanner.rl b/src/zscanner/scanner.rl
index 833e043..a204814 100644
--- a/src/zscanner/scanner.rl
+++ b/src/zscanner/scanner.rl
@@ -169,6 +169,13 @@ int scanner_process(const char *start,
return -1;
}
+ // Check unclosed multiline record.
+ if (is_last_block && s->multiline) {
+ SCANNER_ERROR(ZSCANNER_UNCLOSED_MULTILINE);
+ s->error_counter++;
+ s->process_error(s);
+ }
+
// Storing scanner states.
s->cs = cs;
s->top = top;
diff --git a/src/zscanner/test/cases/00_general.in b/src/zscanner/test/cases/00-0_general.in
index de9c3f0..de9c3f0 100644
--- a/src/zscanner/test/cases/00_general.in
+++ b/src/zscanner/test/cases/00-0_general.in
diff --git a/src/zscanner/test/cases/00_general.out b/src/zscanner/test/cases/00-0_general.out
index c9c6a43..c9c6a43 100644
--- a/src/zscanner/test/cases/00_general.out
+++ b/src/zscanner/test/cases/00-0_general.out
diff --git a/src/zscanner/test/cases/00-1_general.in b/src/zscanner/test/cases/00-1_general.in
new file mode 100644
index 0000000..2423909
--- /dev/null
+++ b/src/zscanner/test/cases/00-1_general.in
@@ -0,0 +1,7 @@
+$ORIGIN .
+$TTL 1
+
+; KO
+@ TXT ( "text" ; Unclosed multiline block
+
+;comment
diff --git a/src/zscanner/test/cases/00-1_general.out b/src/zscanner/test/cases/00-1_general.out
new file mode 100644
index 0000000..81d503c
--- /dev/null
+++ b/src/zscanner/test/cases/00-1_general.out
@@ -0,0 +1,2 @@
+ERROR=ZSCANNER_UNCLOSED_MULTILINE
+------
diff --git a/src/zscanner/test/cases/06-0_INCLUDE.in b/src/zscanner/test/cases/06-0_INCLUDE.in
index 2b85692..3c1aa44 100644
--- a/src/zscanner/test/cases/06-0_INCLUDE.in
+++ b/src/zscanner/test/cases/06-0_INCLUDE.in
@@ -19,10 +19,10 @@ $INCLUDE \./includes/include2 _a_.-b-c-./d/. ; Slashed character in file name,
$INCLUDE ./includes/include2 \0320\ \\\"\.\@\*.tld. ; Origin with special chars
5. NS @
-$INCLUDE /home/vavrusam/knot/src/zscanner/test/cases/includes/include2 ; Absolute path without origin
+$INCLUDE /home/lubos/Development/knot/releases/knot-1.3.2/src/zscanner/test/cases/includes/include2 ; Absolute path without origin
6. NS @
-$INCLUDE /home/vavrusam/knot/src/zscanner/test/cases/includes/include2 tld. ; Absolute path with origin
+$INCLUDE /home/lubos/Development/knot/releases/knot-1.3.2/src/zscanner/test/cases/includes/include2 tld. ; Absolute path with origin
7. NS @
; KO
diff --git a/src/zscanner/test/cases/06-3_INCLUDE.in b/src/zscanner/test/cases/06-3_INCLUDE.in
index 0f59e45..cc70b47 100644
--- a/src/zscanner/test/cases/06-3_INCLUDE.in
+++ b/src/zscanner/test/cases/06-3_INCLUDE.in
@@ -2,4 +2,4 @@ $ORIGIN .
$TTL 1
; KO
-$INCLUDE /home/vavrusam/knot/src/zscanner/test/cases/ ; Given file is a directory
+$INCLUDE /home/lubos/Development/knot/releases/knot-1.3.2/src/zscanner/test/cases/ ; Given file is a directory
diff --git a/src/zscanner/test/cases/06-4_INCLUDE.in b/src/zscanner/test/cases/06-4_INCLUDE.in
index 80b9ef1..4c0bfd2 100644
--- a/src/zscanner/test/cases/06-4_INCLUDE.in
+++ b/src/zscanner/test/cases/06-4_INCLUDE.in
@@ -2,4 +2,4 @@ $ORIGIN .
$TTL 1
; KO
-$INCLUDE /home/vavrusam/knot/src/zscanner/test/cases/zscanner_tests/file-doesnt-exist ; File doesn't exist
+$INCLUDE /home/lubos/Development/knot/releases/knot-1.3.2/src/zscanner/test/cases/zscanner_tests/file-doesnt-exist ; File doesn't exist
diff --git a/src/zscanner/test/processing.c b/src/zscanner/test/processing.c
index b9319d5..7d0e75f 100644
--- a/src/zscanner/test/processing.c
+++ b/src/zscanner/test/processing.c
@@ -27,6 +27,7 @@
#define ERROR_CODE_TO_STRING(code) [code - ZSCANNER_UNCOVERED_STATE] = #code
const char *error_names[] = {
ERROR_CODE_TO_STRING(ZSCANNER_UNCOVERED_STATE),
+ ERROR_CODE_TO_STRING(ZSCANNER_UNCLOSED_MULTILINE),
ERROR_CODE_TO_STRING(ZSCANNER_ELEFT_PARENTHESIS),
ERROR_CODE_TO_STRING(ZSCANNER_ERIGHT_PARENTHESIS),
ERROR_CODE_TO_STRING(ZSCANNER_EUNSUPPORTED_TYPE),
diff --git a/src/zscanner/test/run_tests.sh b/src/zscanner/test/run_tests.sh
index 682d50a..7ffe363 100644
--- a/src/zscanner/test/run_tests.sh
+++ b/src/zscanner/test/run_tests.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-TESTS_DIR="/home/vavrusam/knot/src/zscanner/test/cases"
-OUTS_DIR="/home/vavrusam/knot/src/zscanner/test/.out"
+TESTS_DIR="/home/lubos/Development/knot/releases/knot-1.3.2/src/zscanner/test/cases"
+OUTS_DIR="/home/lubos/Development/knot/releases/knot-1.3.2/src/zscanner/test/.out"
TEST_BIN="./../zscanner-tool -m 2"
# Delete temporary output directory at exit.
diff --git a/test-driver b/test-driver
deleted file mode 100755
index 32bf39e..0000000
--- a/test-driver
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2012-06-27.10; # UTC
-
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 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 <http://www.gnu.org/licenses/>.
-
-# 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 <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-# Make unconditional expansion of undefined variables an error. This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
- echo "$0: $*" >&2
- print_usage >&2
- exit 2
-}
-
-print_usage ()
-{
- cat <<END
-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
-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.
-expect_failure=no
-color_tests=no
-enable_hard_errors=yes
-while test $# -gt 0; do
- case $1 in
- --help) print_usage; exit $?;;
- --version) echo "test-driver $scriptversion"; exit $?;;
- --test-name) test_name=$2; shift;;
- --log-file) log_file=$2; shift;;
- --trs-file) trs_file=$2; shift;;
- --color-tests) color_tests=$2; shift;;
- --expect-failure) expect_failure=$2; shift;;
- --enable-hard-errors) enable_hard_errors=$2; shift;;
- --) shift; break;;
- -*) usage_error "invalid option: '$1'";;
- esac
- shift
-done
-
-if test $color_tests = yes; then
- # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
- red='' # Red.
- grn='' # Green.
- lgn='' # Light green.
- blu='' # Blue.
- mgn='' # Magenta.
- std='' # No color.
-else
- red= grn= lgn= blu= mgn= std=
-fi
-
-do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-trap "st=129; $do_exit" 1
-trap "st=130; $do_exit" 2
-trap "st=141; $do_exit" 13
-trap "st=143; $do_exit" 15
-
-# Test script is run here.
-"$@" >$log_file 2>&1
-estatus=$?
-if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
-fi
-
-case $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;;
- 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
- *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
- *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
-esac
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# 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/ylwrap b/ylwrap
index 8f072a8..9253635 100755
--- a/ylwrap
+++ b/ylwrap
@@ -1,9 +1,10 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2013-01-12.17; # UTC
+scriptversion=2011-08-25.18; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
#
# Written by Tom Tromey <tromey@cygnus.com>.
#
@@ -29,41 +30,9 @@ scriptversion=2013-01-12.17; # UTC
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
-get_dirname ()
-{
- case $1 in
- */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';;
- # Otherwise, we want the empty string (not ".").
- esac
-}
-
-# guard FILE
-# ----------
-# The CPP macro used to guard inclusion of FILE.
-guard ()
-{
- printf '%s\n' "$1" \
- | sed \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
- -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g' \
- -e 's/__*/_/g'
-}
-
-# quote_for_sed [STRING]
-# ----------------------
-# Return STRING (or stdin) quoted to be used as a sed pattern.
-quote_for_sed ()
-{
- case $# in
- 0) cat;;
- 1) printf '%s\n' "$1";;
- esac \
- | sed -e 's|[][\\.*]|\\&|g'
-}
-
case "$1" in
'')
- echo "$0: No files given. Try '$0 --help' for more information." 1>&2
+ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
exit 1
;;
--basedir)
@@ -96,71 +65,39 @@ esac
# The input.
-input=$1
+input="$1"
shift
-# We'll later need for a correct munging of "#line" directives.
-input_sub_rx=`get_dirname "$input" | quote_for_sed`
-case $input in
+case "$input" in
[\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
*)
# Relative path. Make it absolute.
- input=`pwd`/$input
+ input="`pwd`/$input"
;;
esac
-input_rx=`get_dirname "$input" | quote_for_sed`
-
-# Since DOS filename conventions don't allow two dots,
-# the DOS version of Bison writes out y_tab.c instead of y.tab.c
-# and y_tab.h instead of y.tab.h. Test to see if this is the case.
-y_tab_nodot=false
-if test -f y_tab.c || test -f y_tab.h; then
- y_tab_nodot=true
-fi
-
-# The parser itself, the first file, is the destination of the .y.c
-# rule in the Makefile.
-parser=$1
-
-# A sed program to s/FROM/TO/g for all the FROM/TO so that, for
-# instance, we rename #include "y.tab.h" into #include "parse.h"
-# during the conversion from y.tab.c to parse.c.
-sed_fix_filenames=
-# Also rename header guards, as Bison 2.7 for instance uses its header
-# guard in its implementation file.
-sed_fix_header_guards=
-
-while test $# -ne 0; do
- if test x"$1" = x"--"; then
+pairlist=
+while test "$#" -ne 0; do
+ if test "$1" = "--"; then
shift
break
fi
- from=$1
- # Handle y_tab.c and y_tab.h output by DOS
- if $y_tab_nodot; then
- case $from in
- "y.tab.c") from=y_tab.c;;
- "y.tab.h") from=y_tab.h;;
- esac
- fi
+ pairlist="$pairlist $1"
shift
- to=$1
- shift
- sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;"
- sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;"
done
# The program to run.
-prog=$1
+prog="$1"
shift
# Make any relative path in $prog absolute.
-case $prog in
+case "$prog" in
[\\/]* | ?:[\\/]*) ;;
- *[\\/]*) prog=`pwd`/$prog ;;
+ *[\\/]*) prog="`pwd`/$prog" ;;
esac
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines. But that might take us over the 14-char limit.
dirname=ylwrap$$
do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
@@ -178,56 +115,98 @@ esac
ret=$?
if test $ret -eq 0; then
- for from in *
- do
- to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"`
+ set X $pairlist
+ shift
+ first=yes
+ # Since DOS filename conventions don't allow two dots,
+ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+ y_tab_nodot="no"
+ if test -f y_tab.c || test -f y_tab.h; then
+ y_tab_nodot="yes"
+ fi
+
+ # The directory holding the input.
+ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+ # Quote $INPUT_DIR so we can use it in a regexp.
+ # FIXME: really we should care about more than `.' and `\'.
+ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+ while test "$#" -ne 0; do
+ from="$1"
+ # Handle y_tab.c and y_tab.h output by DOS
+ if test $y_tab_nodot = "yes"; then
+ if test $from = "y.tab.c"; then
+ from="y_tab.c"
+ else
+ if test $from = "y.tab.h"; then
+ from="y_tab.h"
+ fi
+ fi
+ fi
if test -f "$from"; then
# If $2 is an absolute path name, then just use that,
- # otherwise prepend '../'.
- case $to in
- [\\/]* | ?:[\\/]*) target=$to;;
- *) target=../$to;;
+ # otherwise prepend `../'.
+ case "$2" in
+ [\\/]* | ?:[\\/]*) target="$2";;
+ *) target="../$2";;
esac
- # Do not overwrite unchanged header files to avoid useless
- # recompilations. Always update the parser itself: it is the
- # destination of the .y.c rule in the Makefile. Divert the
- # output of all other files to a temporary file so we can
- # compare them to existing versions.
- if test $from != $parser; then
- realtarget=$target
- target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
+ # We do not want to overwrite a header file if it hasn't
+ # changed. This avoid useless recompilations. However the
+ # parser itself (the first file) should always be updated,
+ # because it is the destination of the .y.c rule in the
+ # Makefile. Divert the output of all other files to a temporary
+ # file so we can compare them to existing versions.
+ if test $first = no; then
+ realtarget="$target"
+ target="tmp-`echo $target | sed s/.*[\\/]//g`"
fi
-
- # Munge "#line" or "#" directives. Don't let the resulting
- # debug information point at an absolute srcdir. Use the real
- # output file name, not yy.lex.c for instance. Adjust the
- # include guards too.
- sed -e "/^#/!b" \
- -e "s|$input_rx|$input_sub_rx|" \
- -e "$sed_fix_filenames" \
- -e "$sed_fix_header_guards" \
- "$from" >"$target" || ret=$?
-
- # Check whether files must be updated.
- if test "$from" != "$parser"; then
+ # Edit out `#line' or `#' directives.
+ #
+ # We don't want the resulting debug information to point at
+ # an absolute srcdir; it is better for it to just mention the
+ # .y file with no path.
+ #
+ # We want to use the real output file name, not yy.lex.c for
+ # instance.
+ #
+ # We want the include guards to be adjusted too.
+ FROM=`echo "$from" | sed \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+ TARGET=`echo "$2" | sed \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+ # Check whether header files must be updated.
+ if test $first = no; then
if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
- echo "$to is unchanged"
+ echo "$2" is unchanged
rm -f "$target"
else
- echo "updating $to"
+ echo updating "$2"
mv -f "$target" "$realtarget"
fi
fi
else
- # A missing file is only an error for the parser. This is a
- # blatant hack to let us support using "yacc -d". If -d is not
- # specified, don't fail when the header file is "missing".
- if test "$from" = "$parser"; then
+ # A missing file is only an error for the first file. This
+ # is a blatant hack to let us support using "yacc -d". If -d
+ # is not specified, we don't want an error when the header
+ # file is "missing".
+ if test $first = yes; then
ret=1
fi
fi
+ shift
+ shift
+ first=no
done
+else
+ ret=$?
fi
# Remove the directory.