#136 Feature to convert DTD to XSD

2013-12-05 00:22:00 +08:00 · 2013-12-05 00:22:00 +08:00 · 0c3e138c22
parent 35385f971a
commit 0c3e138c22
9 changed files with 1328 additions and 467 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-# 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.
@ -15,23 +14,51 @@
@SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-  { \
+am__make_running_with_option = \
-    am__dry=no; \
+  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 \
      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+        bs=\\; \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-      *) \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
        for am__flg in $$MAKEFLAGS; do \
          case $$am__flg in \
            *=*|--*) ;; \
            *n*) am__dry=yes; break;; \
          esac; \
        done;; \
    esac; \
-    test $$am__dry = yes; \
+  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@
@ -51,10 +78,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
+	$(top_srcdir)/configure $(am__configure_deps) AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
+	ChangeLog INSTALL NEWS README TODO config.guess config.sub \
-	install-sh ltmain.sh missing
+	depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -64,15 +91,28 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 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_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 dvi-recursive \
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	html-recursive info-recursive install-data-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-dvi-recursive install-exec-recursive \
+	install-data-recursive install-dvi-recursive \
-	install-html-recursive install-info-recursive \
+	install-exec-recursive install-html-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
+	install-info-recursive install-pdf-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
-	ps-recursive uninstall-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;; \
@ -80,11 +120,32 @@ am__can_run_installinfo = \
  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+am__recursive_targets = \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+  $(RECURSIVE_TARGETS) \
-	distdir dist dist-all distcheck
+  $(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)`
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@ -95,6 +156,7 @@ 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,'; \
@ -122,12 +184,14 @@ am__relativize = \
  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 ASPELL_LIBS = @ASPELL_LIBS@
 AUTOCONF = @AUTOCONF@
@ -303,22 +367,25 @@ 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.
+# into them and run 'make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
+# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
+# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
+#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the `make' command line.
+# (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS):
+$(am__recursive_targets):
-	@fail= failcom='exit 1'; \
+	@fail=; \
-	for f in x $$MAKEFLAGS; do \
+	if $(am__make_keepgoing); then \
-	  case $$f in \
+	  failcom='fail=yes'; \
-	    *=* | --[!k]*);; \
+	else \
-	    *k*) failcom='fail=yes';; \
+	  failcom='exit 1'; \
-	  esac; \
+	fi; \
 	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@ -333,57 +400,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
+ID: $(am__tagged_files)
-	@fail= failcom='exit 1'; \
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
-	for f in x $$MAKEFLAGS; do \
+tags: tags-recursive
-	  case $$f in \
+TAGS: tags
 	    *=* | --[!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
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+tags-am: $(TAGS_DEPENDENCIES) $(am__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; }; }'`; \
 	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 \
@ -399,12 +421,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	$(am__define_uniq_tagged_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; \
@ -416,15 +433,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
+ctags: ctags-recursive
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+
-		$(TAGS_FILES) $(LISP)
+CTAGS: ctags
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	unique=`for i in $$list; do \
+	$(am__define_uniq_tagged_files); \
 	    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
@ -433,9 +446,31 @@ 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)
 	$(am__remove_distdir)
@ -503,40 +538,36 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
+	$(am__post_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__remove_distdir)
+	$(am__post_remove_distdir)
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
-dist dist-all: distdir
+dist dist-all:
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__remove_distdir)
+	$(am__post_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
@ -547,8 +578,6 @@ 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*) \
@ -560,9 +589,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
+	chmod -R a-w $(distdir)
-	mkdir $(distdir)/_build
+	chmod u+w $(distdir)
-	mkdir $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@ -594,7 +623,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_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'
@ -729,14 +758,13 @@ ps-am:
 uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+.MAKE: $(am__recursive_targets) install-am install-strip
 	install-am install-strip tags-recursive
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	all all-am am--refresh check check-am clean clean-generic \
+	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-zip distcheck distclean distclean-generic \
+	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 \
@ -746,7 +774,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-recursive uninstall uninstall-am
+	ps ps-am tags tags-am uninstall uninstall-am
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # 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.
@ -12,13 +11,14 @@
 # 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.
 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'.])])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
@ -8776,25 +8776,22 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 # 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.11'
+[am__api_version='1.13'
 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.11.6], [],
+m4_if([$1], [1.13.3], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
@ -8810,24 +8807,22 @@ 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.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.13.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# 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.
 # 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
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# '$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
@ -8846,7 +8841,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # 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,
@ -8872,22 +8867,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 # AM_CONDITIONAL                                            -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 # 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
+[AC_PREREQ([2.52])dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+       [$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
@ -8906,16 +8898,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # 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
@ -8925,7 +8915,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # 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
@ -8938,12 +8928,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-                   [depcc="$$1"   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],
@ -8951,8 +8942,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
+  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D'.
+  # in D".
  rm -rf conftest.dir
  mkdir conftest.dir
  # Copy depcomp to subdir because otherwise we won't find it if we're
@ -8992,16 +8983,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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
+      # Solaris 10 /bin/sh.
-      touch sub/conftst$i.h
+      echo '/* dummy */' > 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
+    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # versions had trouble with output in subdirs.
    am__obj=sub/conftest.${OBJEXT-o}
    am__minus_obj="-o $am__obj"
    case $depmode in
@ -9010,8 +9001,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
+      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # only be used when explicitly requested.
      if test "x$enable_dependency_tracking" = xyes; then
 	continue
      else
@ -9019,7 +9010,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}
@ -9067,7 +9058,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
@ -9077,9 +9068,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
+[AC_ARG_ENABLE([dependency-tracking], [dnl
-[  --disable-dependency-tracking  speeds up one-time build
+AS_HELP_STRING(
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+  [--enable-dependency-tracking],
  [do not reject slow dependency extractors])
 AS_HELP_STRING(
  [--disable-dependency-tracking],
  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
  am_depcomp="$ac_aux_dir/depcomp"
  AMDEPBACKSLASH='\'
@ -9094,20 +9089,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # 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],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf 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
@ -9120,7 +9113,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.
@ -9132,21 +9125,19 @@ 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' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
      fdir=`AS_DIRNAME(["$file"])`
@ -9164,7 +9155,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],
@ -9174,15 +9165,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # Do all the work for Automake.                             -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # 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.
@ -9198,7 +9186,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # 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.62])dnl
+[AC_PREREQ([2.65])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
@ -9227,31 +9215,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
             [$0: two- and three-arguments forms are deprecated.])
 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], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
  [ok:ok],,
  [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([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ 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([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])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)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@ -9262,28 +9259,32 @@ _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)],
+		  [_AM_DEPENDENCIES([CC])],
-		  [define([AC_PROG_CC],
+		  [m4_define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
+		  [_AM_DEPENDENCIES([CXX])],
-		  [define([AC_PROG_CXX],
+		  [m4_define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
+		  [_AM_DEPENDENCIES([OBJC])],
-		  [define([AC_PROG_OBJC],
+		  [m4_define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+			     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_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+dnl macro 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
 ])
-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],
@ -9311,15 +9312,12 @@ 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, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 # 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.
@ -9333,16 +9331,14 @@ 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, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-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.
 # 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],
@ -9358,14 +9354,12 @@ AC_SUBST([am__leading_dot])])
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# 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.
 # serial 4
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@ -9383,7 +9377,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
@ -9410,15 +9404,12 @@ rm -f confinc confmf
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 # 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],
@ -9426,11 +9417,10 @@ 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 supports --run.
+# Define MISSING if not defined so far and test if it is modern enough.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# If it is, 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
@ -9443,54 +9433,22 @@ if test x"${MISSING+set}" != xset; then
  esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
+if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING --run "
+  am_missing_run="$MISSING "
 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, 2002, 2003, 2005, 2008, 2010 Free Software
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 # 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],
@ -9500,7 +9458,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)
 # ------------------------
@ -9516,22 +9474,16 @@ AC_DEFUN([_AM_IF_OPTION],
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # 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='
@ -9542,32 +9494,40 @@ 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 (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   am_has_slept=no
-   if test "$[*]" = "X"; then
+   for am_try in 1 2; do
-      # -L didn't work.
+     echo "timestamp, slept: $am_has_slept" > conftest.file
-      set X `ls -t "$srcdir/configure" conftest.file`
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   fi
+     if test "$[*]" = "X"; then
-   rm -f conftest.file
+	# -L didn't work.
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
+	set X `ls -t "$srcdir/configure" conftest.file`
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+     fi
-
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
-      # If neither matched, then we have a broken ls.  This can happen
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
      # 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 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
   test "$[2]" = conftest.file
   )
 then
@ -9577,46 +9537,118 @@ else
   AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+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
 ])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-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.
-# serial 1
+# AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
 # ("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]);;
 esac
 dnl
 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}
 AC_CACHE_CHECK([whether $am_make supports nested variables],
   [am_cv_make_support_nested_variables],
   [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])
 if test $am_cv_make_support_nested_variables = yes; then
  dnl Using '$V' instead of '$(V)' breaks IRIX make.
  AM_V='$(V)'
  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
  AM_V=$AM_DEFAULT_VERBOSITY
  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
 fi
 AC_SUBST([AM_V])dnl
 AM_SUBST_NOTMAKE([AM_V])dnl
 AC_SUBST([AM_DEFAULT_V])dnl
 AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 # 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_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
+# Installed binaries are usually stripped using 'strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# 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.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+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, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-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.
 # serial 3
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@ -9630,18 +9662,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Check how to create a tarball.                            -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-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.
 # 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
@ -9651,76 +9681,114 @@ 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}'])
-m4_if([$1], [v7],
+
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+# We'll loop over all known methods to create a tar archive until one works.
     [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
-  # If the value was cached, stop now.  We just wanted to have am__tar
+m4_if([$1], [v7],
-  # and am__untar set.
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
  test -n "${am_cv_prog_tar_$1}" && break
-  # tar/untar a dummy directory, and stop if the command works
+  [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
    # 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
  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_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
--- a/209
+++ b/209
@ -694,6 +694,10 @@ CPPFLAGS
 LDFLAGS
 CXXFLAGS
 CXX
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
 am__untar
 am__tar
 AMTAR
@ -758,6 +762,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
 enable_dependency_tracking
 enable_shared
 enable_static
@ -1403,8 +1408,12 @@ 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]
-  --disable-dependency-tracking  speeds up one-time build
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --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-shared[=PKGS]  build shared libraries [default=yes]
  --enable-static[=PKGS]  build static libraries [default=yes]
  --enable-fast-install[=PKGS]
@ -2432,7 +2441,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.11'
+am__api_version='1.13'
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@ -2558,9 +2567,6 @@ 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='
@ -2571,32 +2577,40 @@ 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 (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   am_has_slept=no
-   if test "$*" = "X"; then
+   for am_try in 1 2; do
-      # -L didn't work.
+     echo "timestamp, slept: $am_has_slept" > conftest.file
-      set X `ls -t "$srcdir/configure" conftest.file`
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   fi
+     if test "$*" = "X"; then
-   rm -f conftest.file
+	# -L didn't work.
-   if test "$*" != "X $srcdir/configure conftest.file" \
+	set X `ls -t "$srcdir/configure" conftest.file`
-      && test "$*" != "X conftest.file $srcdir/configure"; then
+     fi
-
+     if test "$*" != "X $srcdir/configure conftest.file" \
-      # If neither matched, then we have a broken ls.  This can happen
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
      # 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 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
   test "$2" = conftest.file
   )
 then
@ -2608,6 +2622,16 @@ 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.
@ -2630,12 +2654,12 @@ if test x"${MISSING+set}" != xset; then
  esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
+if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING --run "
+  am_missing_run="$MISSING "
 else
  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+  { $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: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 if test x"${install_sh}" != xset; then
@ -2647,10 +2671,10 @@ if test x"${install_sh}" != xset; then
  esac
 fi
-# Installed binaries are usually stripped using `strip' when the user
+# Installed binaries are usually stripped using 'strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# 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.
@ -2789,12 +2813,6 @@ 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.
@ -2877,6 +2895,45 @@ 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."
@ -2898,6 +2955,7 @@ fi
 # Define the identity of the package.
 PACKAGE=xmlcopyeditor
 VERSION=1.2.0.11
@ -2927,12 +2985,22 @@ 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 -'
@ -2940,6 +3008,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -3465,7 +3534,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
@ -3521,8 +3590,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
+  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D'.
+  # in D".
  rm -rf conftest.dir
  mkdir conftest.dir
  # Copy depcomp to subdir because otherwise we won't find it if we're
@ -3557,16 +3626,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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
+      # Solaris 10 /bin/sh.
-      touch sub/conftst$i.h
+      echo '/* dummy */' > 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
+    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # versions had trouble with output in subdirs.
    am__obj=sub/conftest.${OBJEXT-o}
    am__minus_obj="-o $am__obj"
    case $depmode in
@ -3575,8 +3644,8 @@ else
      test "$am__universal" = false || continue
      ;;
    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
+      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # only be used when explicitly requested.
      if test "x$enable_dependency_tracking" = xyes; then
 	continue
      else
@ -3584,7 +3653,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}
@ -4358,8 +4427,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
+  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D'.
+  # in D".
  rm -rf conftest.dir
  mkdir conftest.dir
  # Copy depcomp to subdir because otherwise we won't find it if we're
@ -4394,16 +4463,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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
+      # Solaris 10 /bin/sh.
-      touch sub/conftst$i.h
+      echo '/* dummy */' > 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
+    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # versions had trouble with output in subdirs.
    am__obj=sub/conftest.${OBJEXT-o}
    am__minus_obj="-o $am__obj"
    case $depmode in
@ -4412,8 +4481,8 @@ else
      test "$am__universal" = false || continue
      ;;
    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
+      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # only be used when explicitly requested.
      if test "x$enable_dependency_tracking" = xyes; then
 	continue
      else
@ -4421,7 +4490,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}
@ -15637,6 +15706,14 @@ 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='#'
@ -17038,7 +17115,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
  case $ac_file$ac_mode in
    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf 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
@ -17051,7 +17128,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.
@ -17085,21 +17162,19 @@ $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' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
      fdir=`$as_dirname -- "$file" ||
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -14,7 +14,7 @@ applicationsdir = /usr/share/applications
 # the application source, library search path, and link libraries
 xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
-	contexthandler.cpp globalreplacedialog.cpp housestyle.cpp \
+	contexthandler.cpp dtd2schema.cpp globalreplacedialog.cpp housestyle.cpp \
 	housestylereader.cpp myhtmlpane.cpp nocasecompare.cpp readfile.cpp \
 	replace.cpp styledialog.cpp threadreaper.cpp wraplibxml.cpp \
 	wrapregex.cpp wraptempfilename.cpp xmlassociatedtd.cpp xmlassociatexsd.cpp \
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -68,8 +68,8 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applicationsdir)" \
 	"$(DESTDIR)$(xmlcopyeditordir)" "$(DESTDIR)$(pixmapdir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \
-	associatedialog.$(OBJEXT) casehandler.$(OBJEXT) \
+	associatedialog.$(OBJEXT) casehandler.$(OBJEXT) contexthandler.$(OBJEXT)\
-	contexthandler.$(OBJEXT) globalreplacedialog.$(OBJEXT) \
+	dtd2schema.$(OBJEXT) globalreplacedialog.$(OBJEXT) \
 	housestyle.$(OBJEXT) housestylereader.$(OBJEXT) \
 	myhtmlpane.$(OBJEXT) nocasecompare.$(OBJEXT) \
 	readfile.$(OBJEXT) replace.$(OBJEXT) styledialog.$(OBJEXT) \
@ -287,7 +287,7 @@ applicationsdir = /usr/share/applications
 # the application source, library search path, and link libraries
 xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
-	contexthandler.cpp globalreplacedialog.cpp housestyle.cpp \
+	contexthandler.cpp dtd2schema.cpp globalreplacedialog.cpp housestyle.cpp \
 	housestylereader.cpp myhtmlpane.cpp nocasecompare.cpp readfile.cpp \
 	replace.cpp styledialog.cpp threadreaper.cpp wraplibxml.cpp \
 	wrapregex.cpp wraptempfilename.cpp xmlassociatedtd.cpp xmlassociatexsd.cpp \
--- a/src/dtd2schema.cpp
+++ b/src/dtd2schema.cpp
@ -0,0 +1,594 @@
 /*
 * Copyright 2013 Zane U. Ji
 *
 * This file is part of Xml Copy Editor.
 *
 * Xml Copy Editor 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; version 2 of the License.
 *
 * Xml Copy Editor 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 Xml Copy Editor; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #include <wx/tokenzr.h>
 #endif
 #include "dtd2schema.h"
 #include "wrapxerces.h"
 #include "xmlschemagenerator.h" // for addIndent
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/validators/common/ContentSpecNode.hpp>
 Dtd2Schema::Dtd2Schema()
 {
 }
 Dtd2Schema::~Dtd2Schema()
 {
 }
 const wxString &Dtd2Schema::convert ( const wxString &dtdFile )
 {
 	XercesDOMParser parser;
 	MySAX2Handler errorHandler;
 	DTDGrammar *grammar;
 	try {
 		parser.setErrorHandler ( &errorHandler );
 		grammar = ( DTDGrammar * ) parser.loadGrammar
 				( ( const XMLCh * ) WrapXerces::toString ( dtdFile ).GetData()
 				, Grammar::DTDGrammarType
 				);
 	}
 	catch ( const SAXParseException &e )
 	{
 		mErrors << wxString::Format ( _("Line %lld column %lld: %s[br]"),
 				e.getLineNumber(), e.getColumnNumber(),
 				WrapXerces::toString ( e.getMessage() ).c_str() );
 		return mSchema;
 	}
 	mSchema << _T("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
 			_T("<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"");
 	wxString elements;
 	const size_t nIndent = 1;
 	NameIdPoolEnumerator<DTDElementDecl>
 		elemEnum = grammar->getElemEnumerator();
 	while ( elemEnum.hasMoreElements() )
 	{
 		elements << convertElement ( elemEnum.nextElement(), nIndent );
 	}
 	const XMLCh *targetNameSpace = grammar->getTargetNamespace();
 	if ( targetNameSpace != NULL && *targetNameSpace != 0 )
 	{
 		wxString targetNS = WrapXerces::toString ( targetNameSpace );
 		if ( mTargetNameSpace.empty() )
 			mTargetNameSpace = targetNS;
 		else if ( targetNS != mTargetNameSpace )
 			mErrors << wxString::Format (
 					_("Target namespace is redefined: %s -> %s[br]"),
 					targetNS.c_str(), mTargetNameSpace.c_str() );
 	}
 	if ( !mTargetNameSpace.empty() )
 		mSchema << _T("\n    targetNamespace=\"") << mTargetNameSpace
 				<< _T("\"\n    xmlns=\"") << mTargetNameSpace << _T("\"");
 	wxString importNS;
 	std::map<wxString, wxString>::iterator itr;
 	itr = mNameSpaceMap.find ( _T("xml") );
 	if ( itr != mNameSpaceMap.end() && itr->second.empty() )
 		itr->second = wxString::FromUTF8 ( (const char *) XML_XML_NAMESPACE );
 	for ( itr = mNameSpaceMap.begin(); itr != mNameSpaceMap.end(); ++itr )
 	{
 		mSchema << _T("\n    xmlns:") << itr->first << _T("=\"")
 				<< itr->second << _T("\"");
 		importNS << _T("  <xs:import namespace=\"")
 				<< ( itr->second.empty() ? itr->first : itr->second )
 				<< _T("\"/>\n");
 	}
 	mSchema << _T(">\n")
 			<< importNS
 			<< _T("\n")
 			<< elements;
 #if 0
 	NameIdPoolEnumerator<DTDEntityDecl>
 		entityEnum = grammar->getEntityEnumerator();
 	while ( entityEnum.hasMoreElements() )
 	{
 		mSchema << convertEntity ( entityEnum.nextElement(), nIndent );
 	}
 #endif
 	NameIdPoolEnumerator<XMLNotationDecl>
 		notationEnum = grammar->getNotationEnumerator();
 	while ( notationEnum.hasMoreElements() )
 	{
 		mSchema << convertNotation ( notationEnum.nextElement(), nIndent );
 	}
 	mSchema << _T("</xs:schema>\n");
 	return mSchema;
 }
 wxString Dtd2Schema::convertElement
 	( const DTDElementDecl &element
 	, size_t nIndent
 	)
 {
 	wxString schema;
 	wxString elementName = WrapXerces::toString ( element.getBaseName() );
 	XmlSchemaGenerator::addIndent ( schema, nIndent );
 	schema << _T("<xs:element name=\"") << elementName;
 	// Check if it's a #PCDATA element
 	const ContentSpecNode *contentSpec = element.getContentSpec();
 	if ( !element.hasAttDefs() )
 	{
 		bool pcdata = false;
 		if ( contentSpec == NULL )
 			pcdata = true;
 		else if ( contentSpec->getType() == ContentSpecNode::Leaf )
 		{
 			const QName *qname = contentSpec->getElement();
 			if ( qname == NULL )
 				pcdata = true;
 			else
 			{
 				const XMLCh *name = qname->getRawName();
 				pcdata = ( name == NULL || *name == 0 );
 			}
 		}
 		if ( pcdata )
 		{
 			schema << _T("\" type=\"xs:string\"/>\n\n");
 			return schema;
 		}
 	}
 	// else Complex type
 	schema << _T("\">\n");
 	// Content
 	XmlSchemaGenerator::addIndent ( schema, nIndent + 1 );
 	schema << _T("<xs:complexType>\n")
 			<< convertContent ( contentSpec, nIndent + 2 );
 	// Attributes
 	const XMLAttDefList &attList = element.getAttDefList();
 	size_t i, count;
 	count = attList.getAttDefCount();
 	for ( i = 0; i < count; i++ )
 	{
 		schema << convertAttribute (
 				attList.getAttDef ( i ), nIndent + 2, elementName );
 	}
 	XmlSchemaGenerator::addIndent ( schema, nIndent + 1);
 	schema << _T("</xs:complexType>\n");
 	XmlSchemaGenerator::addIndent ( schema, nIndent );
 	schema << _T("</xs:element>\n\n");
 	return schema;
 }
 wxString Dtd2Schema::convertContent
 	( const ContentSpecNode *content
 	, size_t nIndent
 	, const ContentSpecNode *parent /* = NULL */
 	)
 {
 	wxString schema, suffix;
 	if ( content == NULL )
 		return schema;
 	ContentSpecNode::NodeTypes type = content->getType();
 	switch ( type )
 	{
 	case ContentSpecNode::ZeroOrOne:
 		if ( parent != NULL && parent->getType() == type )
 		{
 			--nIndent;
 			break;
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:sequence minOccurs=\"0\">\n");
 		XmlSchemaGenerator::addIndent ( suffix, nIndent );
 		suffix << _T("</xs:sequence>\n");
 		break;
 	case ContentSpecNode::ZeroOrMore:
 		if ( parent != NULL && parent->getType() == type )
 		{
 			--nIndent;
 			break;
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:sequence minOccurs=\"0\" maxOccurs=\"unbounded\">\n");
 		XmlSchemaGenerator::addIndent ( suffix, nIndent );
 		suffix << _T("</xs:sequence>\n");
 		break;
 	case ContentSpecNode::OneOrMore:
 		if ( parent != NULL && parent->getType() == type )
 		{
 			--nIndent;
 			break;
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:sequence maxOccurs=\"unbounded\">\n");
 		XmlSchemaGenerator::addIndent ( suffix, nIndent );
 		suffix << _T("</xs:sequence>\n");
 		break;
 	case ContentSpecNode::Choice:
 		if ( parent != NULL && parent->getType() == type
 			&& parent->getMinOccurs() == content->getMinOccurs()
 			&& parent->getMaxOccurs() == content->getMaxOccurs()
 			)
 		{
 			--nIndent;
 			break;
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:choice")
 				<< convertOccurrence ( content ) << _T(">\n");
 		XmlSchemaGenerator::addIndent ( suffix, nIndent );
 		suffix << _T("</xs:choice>\n");
 		break;
 	case ContentSpecNode::Sequence:
 		if ( parent != NULL && parent->getType() == type
 			&& parent->getMinOccurs() == content->getMinOccurs()
 			&& parent->getMaxOccurs() == content->getMaxOccurs()
 			)
 		{
 			--nIndent;
 			break;
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:sequence")
 				<< convertOccurrence ( content ) << _T(">\n");
 		XmlSchemaGenerator::addIndent ( suffix, nIndent );
 		suffix << _T("</xs:sequence>\n");
 		break;
 	case ContentSpecNode::Any:
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:any") << convertOccurrence ( content ) << _T(">\n");
 		XmlSchemaGenerator::addIndent ( suffix, nIndent );
 		suffix << _T("</xs:any>\n");
 		break;
 	case ContentSpecNode::All:
 		if ( parent != NULL && parent->getType() == type
 			&& parent->getMinOccurs() == content->getMinOccurs()
 			&& parent->getMaxOccurs() == content->getMaxOccurs()
 			)
 		{
 			--nIndent;
 			break;
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:all") << convertOccurrence ( content ) << _T(">\n");
 		XmlSchemaGenerator::addIndent ( suffix, nIndent );
 		suffix << _T("</xs:all>\n");
 		break;
 	default:
 	{
 		const QName *qnm = content->getElement();
 		if ( qnm == NULL )
 		{
 			mErrors << _("Ignored content type: ") << type << _T("[br]");
 			break;
 		}
 		wxString name = WrapXerces::toString ( qnm->getRawName() );
 		if ( name.empty() )
 		{// #PCDATA
 			wxASSERT ( type == ContentSpecNode::Leaf );
 			break;
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:element ref=\"")
 				<< name
 				<< _T("\"")
 				<< convertOccurrence ( content )
 				<< _T("/>\n");
 		size_t index = name.Index ( ':' );
 		if ( index != wxString::npos )
 		{ // Validate the name space
 			wxString nameSpace = name.Left ( index );
 			if ( mNameSpaceMap.find ( nameSpace ) == mNameSpaceMap.end() )
 			{
 				if ( nameSpace != _T("xml") )
 					mErrors << wxString::Format (
 						_("Unknown namespace: %s[br]"), nameSpace.c_str() );
 				mNameSpaceMap [ nameSpace ]; // Initialize it.
 			}
 		}
 		break;
 	} // default:
 	} // switch
 	schema << convertContent ( content->getFirst(), nIndent + 1, content )
 		<< convertContent ( content->getSecond(), nIndent + 1, content )
 		<< suffix;
 	return schema;
 }
 wxString Dtd2Schema::convertOccurrence ( const ContentSpecNode *content )
 {
 	wxString schema;
 	int count = content->getMinOccurs();
 	if (count < 0)
 		schema << _T(" minOccurs=\"unbounded\"");
 	else if ( count != 1 )
 		schema << _T(" minOccurs=\"") << count << _T("\"");
 	count = content->getMaxOccurs();
 	if ( count < 0 )
 		schema << _T(" maxOccurs=\"unbounded\"");
 	else if ( count != 1 )
 		schema << _T(" maxOccurs=\"") << count << _T("\"");
 	return schema;
 }
 wxString Dtd2Schema::convertAttribute
 	( const XMLAttDef &att
 	, size_t nIndent
 	, const wxString &element
 	)
 {
 	wxString schema;
 	if ( att.getType() == XMLAttDef::Any_Any )
 	{
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:anyAttribute/>\n");
 		return schema;
 	}
 	wxString name = WrapXerces::toString ( att.getFullName() );
 	// targetNamespace?
 	if ( name == _T("xmlns") )
 	{
 		wxString ns = WrapXerces::toString ( att.getValue() );
 		if ( mTargetNameSpace.empty() )
 			mTargetNameSpace = ns;
 		else if ( mTargetNameSpace != ns )
 			mErrors << wxString::Format (
 					_("Ignored namespace of %s: %s[br]"),
 					element.c_str(), ns.c_str() );
 		return wxEmptyString;
 	}
 	// Reference?
 	size_t index = name.Index ( ':' );
 	if ( index != wxString::npos )
 	{
 		wxString ns = name.Left ( index );
 		if ( ns == _T("xmlns") ) // A new name space is defined
 		{
 			wxString url = WrapXerces::toString ( att.getValue() );
 			ns = name.substr ( index + 1 );
 			// A new name space or it's been referenced in a element content
 			if ( mNameSpaceMap [ ns ].empty() )
 				mNameSpaceMap [ ns ] = url;
 			else if ( mNameSpaceMap [ ns ] != url )
 				mErrors << wxString::Format (
 						_("Namespace redefined: %s -> %s[br]"),
 						mNameSpaceMap [ ns ].c_str(), url.c_str() );
 			return wxEmptyString;
 		}
 		else if ( mNameSpaceMap.find ( ns ) == mNameSpaceMap.end() )
 		{
 			if ( ns != _T("xml") )
 				mErrors << wxString::Format (
 						_("Unknown namespace: %s[br]"), ns.c_str() );
 			mNameSpaceMap [ ns ]; // Initialize it
 		}
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("<xs:attribute ref=\"") << name << _T("\"/>\n");
 		return schema;
 	}
 	XmlSchemaGenerator::addIndent ( schema, nIndent );
 	schema << _T("<xs:attribute name=\"") << name << _T("\"");
 	// Enumerations are prefixed with a type in docbook DTDs
 	if ( att.getEnumeration() != NULL )
 	//if ( att.getType() == XMLAttDef::Enumeration )
 	{
 		schema << convertAttValue ( att )
 			<< _T(">\n")
 			<< convertAttType ( att, nIndent + 1 );
 		XmlSchemaGenerator::addIndent ( schema, nIndent );
 		schema << _T("</xs:attribute>\n");
 	}
 	else
 	{
 		schema << convertAttType ( att, nIndent + 1 )
 				<< convertAttValue ( att )
 				<< _T("/>\n");
 	}
 	return schema;
 }
 wxString Dtd2Schema::convertAttType ( const XMLAttDef &att, size_t nIndent )
 {
 	wxString type;
 	wxASSERT ( att.getType() != XMLAttDef::Any_Any );
 	// Enumerations are prefixed with a type in docbook DTDs
 	if ( att.getEnumeration() != NULL )
 	//case XMLAttDef::Enumeration:
 	{
 		XmlSchemaGenerator::addIndent ( type, nIndent );
 		type << _T("<xs:simpleType>\n");
 		XmlSchemaGenerator::addIndent ( type, nIndent + 1 );
 		type << _T("<xs:restriction base=\"xs:string\">\n");
 		wxStringTokenizer tokens (
 				WrapXerces::toString ( att.getEnumeration() ), _T(" ") );
 		while ( tokens.HasMoreTokens() )
 		{
 			XmlSchemaGenerator::addIndent ( type, nIndent + 2);
 			type << _T("<xs:enumeration value=\"")
 					<< tokens.GetNextToken()
 					<< _T("\"/>\n");
 		}
 		XmlSchemaGenerator::addIndent ( type, nIndent + 1 );
 		type << _T("</xs:restriction>\n");
 		XmlSchemaGenerator::addIndent ( type, nIndent );
 		type << _T("</xs:simpleType>\n");
 		return type;
 	}
 	switch ( att.getType() )
 	{
 	case XMLAttDef::CData:
 		type << _T(" type=\"xs:string\"");
 		break;
 	case XMLAttDef::ID:
 		type << _T(" type=\"xs:ID\"");
 		break;
 	case XMLAttDef::IDRef:
 		type << _T(" type=\"xs:IDREF\"");
 		break;
 	case XMLAttDef::IDRefs:
 		type << _T(" type=\"xs:IDREFS\"");
 		break;
 	case XMLAttDef::Entity:
 		type << _T(" type=\"xs:ENTITY\"");
 		break;
 	case XMLAttDef::Entities:
 		type << _T(" type=\"xs:ENTITIES\"");
 		break;
 	case XMLAttDef::NmToken:
 		type << _T(" type=\"xs:NMTOKEN\"");
 		break;
 	case XMLAttDef::NmTokens:
 		type << _T(" type=\"xs:NMTOKENS\"");
 		break;
 	case XMLAttDef::Notation:
 		type << _T(" type=\"xs:NOTATION\"");
 		break;
 	default:
 		const XMLCh *type;
 		type = att.getAttTypeString( att.getType() );
 		mErrors << wxString::Format (
 				_("Ignored attribute \"%s\"'s type: %s[br]"),
 				WrapXerces::toString ( att.getFullName() ).c_str(),
 				WrapXerces::toString ( type ).c_str() );
 		break;
 	}
 	return type;
 }
 wxString Dtd2Schema::convertAttValue ( const XMLAttDef &att)
 {
 	wxString value;
 	if ( att.getValue() != NULL )
 	{
 		if ( att.getDefaultType() == XMLAttDef::Fixed )
 			value << _T(" fixed=\"");
 		else
 			value << _T(" default=\"");
 		value << WrapXerces::toString ( att.getValue() ) << _T("\"");
 	}
 	switch ( att.getDefaultType() )
 	{
 	case XMLAttDef::Default:
 	case XMLAttDef::Implied:
 	case XMLAttDef::Fixed:
 		break;
 	case XMLAttDef::Required:
 		value << _T(" use=\"required\"");
 		break;
 	case XMLAttDef::Prohibited:
 		value << _T(" use=\"prohibited\"");
 		break;
 	default:
 		const XMLCh *defaultType;
 		defaultType = XMLAttDef::getDefAttTypeString( att.getDefaultType() );
 		mErrors << wxString::Format (
 				_("Unknown default type of attribute \"%s\": %s[br]"),
 				WrapXerces::toString ( att.getFullName() ).c_str(),
 				WrapXerces::toString ( defaultType ).c_str() );
 		break;
 	}
 	return value;
 }
 wxString Dtd2Schema::convertEntity
 	( const DTDEntityDecl &entity
 	, size_t nIndent
 	)
 {
 	wxString schema;
 	return schema;
 }
 wxString Dtd2Schema::convertNotation
 	( const XMLNotationDecl &notation
 	, size_t nIndent
 	)
 {
 	wxString schema;
 	XmlSchemaGenerator::addIndent ( schema, nIndent );
 	schema << _T("<xs:notation name=\"")
 			<< WrapXerces::toString ( notation.getName() );
 	const XMLCh *id = notation.getPublicId();
 	if ( id != NULL )
 		schema << _T("\" public=\"")
 				<< WrapXerces::toString ( id );
 	id = notation.getSystemId();
 	if ( id != NULL )
 		schema << _T("\" system=\"")
 				<< WrapXerces::toString ( id );
 	schema << _T("\"/>\n\n");
 	return schema;
 }
 void Dtd2Schema::reset()
 {
 	mErrors.clear();
 	mSchema.clear();
 	mTargetNameSpace.clear();
 	mNameSpaceMap.clear();
 }
--- a/src/dtd2schema.h
+++ b/src/dtd2schema.h
@ -0,0 +1,58 @@
 /*
 * Copyright 2013 Zane U. Ji
 *
 * This file is part of Xml Copy Editor.
 *
 * Xml Copy Editor 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; version 2 of the License.
 *
 * Xml Copy Editor 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 Xml Copy Editor; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef DTD2SCHEMA_H_
 #define DTD2SCHEMA_H_
 #include <map>
 #include <xercesc/validators/DTD/DTDGrammar.hpp>
 using namespace xercesc;
 class Dtd2Schema
 {
 public:
 	Dtd2Schema();
 	virtual ~Dtd2Schema();
 	const wxString &convert ( const wxString &dtdFile );
 	const wxString &getErrors() { return mErrors; }
 	void reset ();
 protected:
 	wxString convertElement ( const DTDElementDecl &element, size_t nIndent );
 	wxString convertContent ( const ContentSpecNode *content, size_t nIndent,
 			const ContentSpecNode *parent = NULL );
 	wxString convertOccurrence (const ContentSpecNode *content );
 	wxString convertAttribute ( const XMLAttDef &att, size_t nIndent,
 			const wxString &element );
 	wxString convertAttType ( const XMLAttDef &att, size_t nIndent );
 	wxString convertAttValue ( const XMLAttDef &att );
 	wxString convertEntity ( const DTDEntityDecl &entity, size_t nIndent );
 	wxString convertNotation ( const XMLNotationDecl &notation, size_t nIndent );
 protected:
 	wxString mSchema;
 	wxString mErrors;
 	wxString mTargetNameSpace;
 	std::map<wxString, wxString> mNameSpaceMap;
 };
 #endif /* DTD2SCHEMA_H_ */
--- a/src/xmlcopyeditor.cpp
+++ b/src/xmlcopyeditor.cpp
@ -63,6 +63,7 @@
 #include "xmlschemagenerator.h"
 #include "threadreaper.h"
 #include <wx/wupdlock.h>
 #include "dtd2schema.h"
 #define ngettext wxGetTranslation
@ -139,6 +140,7 @@ BEGIN_EVENT_TABLE ( MyFrame, wxFrame )
 	EVT_MENU ( ID_VALIDATE_RELAX_NG, MyFrame::OnValidateRelaxNG )
 	EVT_MENU ( ID_VALIDATE_W3C_SCHEMA, MyFrame::OnValidateSchema )
 	EVT_MENU ( ID_CREATE_SCHEMA, MyFrame::OnCreateSchema )
 	EVT_MENU ( ID_DTD_TO_SCHEMA, MyFrame::OnDtd2Schema )
 	EVT_MENU ( ID_XPATH, MyFrame::OnXPath )
 	EVT_MENU_RANGE ( ID_XSLT, ID_XSLT_WORDML_DOCBOOK, MyFrame::OnXslt )
 	EVT_MENU ( ID_PRETTYPRINT, MyFrame::OnPrettyPrint )
@ -4044,6 +4046,37 @@ void MyFrame::OnCreateSchema ( wxCommandEvent& event )
 	newDocument ( schema );
 }
 void MyFrame::OnDtd2Schema ( wxCommandEvent& event )
 {
 	closePane();
 #if wxCHECK_VERSION(2,9,0)
 	long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST;
 #else
 	long style = wxOPEN | wxFILE_MUST_EXIST;
 #endif
 	wxFileDialog fd ( this, _ ( "Please select a DTD file" ), wxEmptyString,
 	    wxEmptyString, _T ( "DTD files (*.dtd)|*.dtd|All files (*.*)|*.*" ),
 	    style );
 	if (fd.ShowModal() != wxID_OK)
 		return;
 	statusProgress ( _ ( "Converting..." ) );
 	Dtd2Schema dtd2xsd;
 	const wxString &schema = dtd2xsd.convert ( fd.GetPath() );
 	const wxString &error = dtd2xsd.getErrors();
 	if ( !error.empty() )
 		messagePane ( error, CONST_STOP );
 	if ( !schema.empty() )
 	{
 		statusProgress ( _ ( "Creating view..." ) );
 		newDocument ( schema );
 	}
 	statusProgress ( wxEmptyString );
 }
 void MyFrame::OnXPath ( wxCommandEvent& event )
 {
 	statusProgress ( wxEmptyString );
@ -5302,7 +5335,9 @@ wxMenuBar *MyFrame::getMenuBar()
 	    _ ( "&Validate" ),
 	    validationMenu );
 	xmlMenu->Append ( ID_CREATE_SCHEMA, _ ( "Create &Schema...\tF10" ),
-	    _ ( "Create schema" ) );
+	    _ ( "Create schema..." ) );
 	xmlMenu->Append ( ID_DTD_TO_SCHEMA, _ ( "DTD -> Schema..." ),
 	    _ ( "DTD -> Schema..." ) );
 	xmlMenu->AppendSeparator();
 	xmlMenu->Append (
 	    wxID_ANY,
@ -5663,12 +5698,13 @@ void MyFrame::messagePane ( const wxString& s, int iconType, bool forcePane )
 	htmlString.Replace ( _T ( "<" ), _T ( "&lt;" ), true );
 	htmlString.Replace ( _T ( ">" ), _T ( "&gt;" ), true );
-    htmlString.Replace ( _T("[br/]"), _T("<br/>"), true );
+	// have to use <br> on Ubuntu
-    htmlString.Replace ( _T("[b]"), _T("<b>"), true );
+	htmlString.Replace ( _T("[br]"), _T("<br>"), true );
-    htmlString.Replace ( _T("[/b]"), _T("</b>"), true );
+	htmlString.Replace ( _T("[br/]"), _T("<br/>"), true );
-    htmlString.Replace ( _T("[i]"), _T("<i>"), true );
+	htmlString.Replace ( _T("[b]"), _T("<b>"), true );
-    htmlString.Replace ( _T("[/i]"), _T("</i>"), true );
+	htmlString.Replace ( _T("[/b]"), _T("</b>"), true );
-    
+	htmlString.Replace ( _T("[i]"), _T("<i>"), true );
 	htmlString.Replace ( _T("[/i]"), _T("</i>"), true );
 	wxString htmlBuffer;
 	htmlBuffer += _T ( "<html><body><table><tr><td width=\"5%\"><img src=\"" );
--- a/src/xmlcopyeditor.h
+++ b/src/xmlcopyeditor.h
@ -121,6 +121,7 @@ enum
 	ID_VALIDATE_RELAX_NG,
 	ID_VALIDATE_W3C_SCHEMA,
 	ID_CREATE_SCHEMA,
 	ID_DTD_TO_SCHEMA,
 	ID_XPATH,
 	ID_XSLT,
 	ID_XSLT_TEI_FO,
@ -286,6 +287,7 @@ class MyFrame : public wxFrame
 		void OnValidateRelaxNG ( wxCommandEvent& event );
 		void OnValidateSchema ( wxCommandEvent& event );
 		void OnCreateSchema ( wxCommandEvent& event );
 		void OnDtd2Schema ( wxCommandEvent& event );
 		void OnXPath ( wxCommandEvent& event );
 		void OnXslt ( wxCommandEvent& event );
 		void OnValidatePreset ( wxCommandEvent& event );