Explorar o código

The reconfigured autotools

Serj Kalichev %!s(int64=13) %!d(string=hai) anos
pai
achega
82d400436b
Modificáronse 7 ficheiros con 187 adicións e 242 borrados
  1. 76 192
      Makefile.in
  2. 8 34
      aclocal.m4
  3. 6 2
      aux_scripts/config.guess
  4. 5 2
      aux_scripts/config.sub
  5. 74 1
      aux_scripts/depcomp
  6. 17 10
      configure
  7. 1 1
      configure.ac

+ 76 - 192
Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -53,7 +53,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = bin/clish$(EXEEXT) bin/konfd$(EXEEXT) bin/konf$(EXEEXT)
+bin_PROGRAMS = bin/clish$(EXEEXT) bin/konfd$(EXEEXT) bin/konf$(EXEEXT) \
+	bin/sigexec$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/aux_scripts/compile \
@@ -230,6 +231,9 @@ bin_konf_DEPENDENCIES = libkonf.la liblub.la
 am_bin_konfd_OBJECTS = bin/konfd.$(OBJEXT)
 bin_konfd_OBJECTS = $(am_bin_konfd_OBJECTS)
 bin_konfd_DEPENDENCIES = libkonf.la liblub.la
+am_bin_sigexec_OBJECTS = bin/sigexec.$(OBJEXT)
+bin_sigexec_OBJECTS = $(am_bin_sigexec_OBJECTS)
+bin_sigexec_LDADD = $(LDADD)
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/aux_scripts/depcomp
 am__depfiles_maybe = depfiles
@@ -255,11 +259,13 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libclish_la_SOURCES) $(libkonf_la_SOURCES) \
 	$(liblub_la_SOURCES) $(libtinyrl_la_SOURCES) \
 	$(libtinyxml_la_SOURCES) $(bin_clish_SOURCES) \
-	$(bin_konf_SOURCES) $(bin_konfd_SOURCES)
+	$(bin_konf_SOURCES) $(bin_konfd_SOURCES) \
+	$(bin_sigexec_SOURCES)
 DIST_SOURCES = $(libclish_la_SOURCES) $(libkonf_la_SOURCES) \
 	$(liblub_la_SOURCES) $(libtinyrl_la_SOURCES) \
 	$(libtinyxml_la_SOURCES) $(bin_clish_SOURCES) \
-	$(bin_konf_SOURCES) $(bin_konfd_SOURCES)
+	$(bin_konf_SOURCES) $(bin_konfd_SOURCES) \
+	$(bin_sigexec_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -400,6 +406,7 @@ libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -463,6 +470,7 @@ bin_konf_LDADD = \
 	libkonf.la \
 	liblub.la
 
+bin_sigexec_SOURCES = bin/sigexec.c
 libclish_la_SOURCES = clish/callback_access.c clish/callback_script.c \
 	clish/callback_config.c clish/callback_log.c clish/private.h \
 	clish/command/command.c clish/command/command_dump.c \
@@ -1073,194 +1081,69 @@ bin/konfd.$(OBJEXT): bin/$(am__dirstamp) bin/$(DEPDIR)/$(am__dirstamp)
 bin/konfd$(EXEEXT): $(bin_konfd_OBJECTS) $(bin_konfd_DEPENDENCIES) $(EXTRA_bin_konfd_DEPENDENCIES) bin/$(am__dirstamp)
 	@rm -f bin/konfd$(EXEEXT)
 	$(LINK) $(bin_konfd_OBJECTS) $(bin_konfd_LDADD) $(LIBS)
+bin/sigexec.$(OBJEXT): bin/$(am__dirstamp) \
+	bin/$(DEPDIR)/$(am__dirstamp)
+bin/sigexec$(EXEEXT): $(bin_sigexec_OBJECTS) $(bin_sigexec_DEPENDENCIES) $(EXTRA_bin_sigexec_DEPENDENCIES) bin/$(am__dirstamp)
+	@rm -f bin/sigexec$(EXEEXT)
+	$(LINK) $(bin_sigexec_OBJECTS) $(bin_sigexec_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f bin/clish.$(OBJEXT)
-	-rm -f bin/konf.$(OBJEXT)
-	-rm -f bin/konfd.$(OBJEXT)
-	-rm -f clish/action/libclish_la-action.$(OBJEXT)
-	-rm -f clish/action/libclish_la-action.lo
-	-rm -f clish/action/libclish_la-action_dump.$(OBJEXT)
-	-rm -f clish/action/libclish_la-action_dump.lo
-	-rm -f clish/command/libclish_la-command.$(OBJEXT)
-	-rm -f clish/command/libclish_la-command.lo
-	-rm -f clish/command/libclish_la-command_dump.$(OBJEXT)
-	-rm -f clish/command/libclish_la-command_dump.lo
-	-rm -f clish/config/libclish_la-config.$(OBJEXT)
-	-rm -f clish/config/libclish_la-config.lo
-	-rm -f clish/config/libclish_la-config_dump.$(OBJEXT)
-	-rm -f clish/config/libclish_la-config_dump.lo
-	-rm -f clish/libclish_la-callback_access.$(OBJEXT)
-	-rm -f clish/libclish_la-callback_access.lo
-	-rm -f clish/libclish_la-callback_config.$(OBJEXT)
-	-rm -f clish/libclish_la-callback_config.lo
-	-rm -f clish/libclish_la-callback_log.$(OBJEXT)
-	-rm -f clish/libclish_la-callback_log.lo
-	-rm -f clish/libclish_la-callback_script.$(OBJEXT)
-	-rm -f clish/libclish_la-callback_script.lo
-	-rm -f clish/nspace/libclish_la-nspace.$(OBJEXT)
-	-rm -f clish/nspace/libclish_la-nspace.lo
-	-rm -f clish/nspace/libclish_la-nspace_dump.$(OBJEXT)
-	-rm -f clish/nspace/libclish_la-nspace_dump.lo
-	-rm -f clish/param/libclish_la-param.$(OBJEXT)
-	-rm -f clish/param/libclish_la-param.lo
-	-rm -f clish/param/libclish_la-param_dump.$(OBJEXT)
-	-rm -f clish/param/libclish_la-param_dump.lo
-	-rm -f clish/pargv/libclish_la-pargv.$(OBJEXT)
-	-rm -f clish/pargv/libclish_la-pargv.lo
-	-rm -f clish/pargv/libclish_la-pargv_dump.$(OBJEXT)
-	-rm -f clish/pargv/libclish_la-pargv_dump.lo
-	-rm -f clish/ptype/libclish_la-ptype.$(OBJEXT)
-	-rm -f clish/ptype/libclish_la-ptype.lo
-	-rm -f clish/ptype/libclish_la-ptype_dump.$(OBJEXT)
-	-rm -f clish/ptype/libclish_la-ptype_dump.lo
-	-rm -f clish/shell/libclish_la-shell_command.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_command.lo
-	-rm -f clish/shell/libclish_la-shell_dump.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_dump.lo
-	-rm -f clish/shell/libclish_la-shell_execute.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_execute.lo
-	-rm -f clish/shell/libclish_la-shell_file.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_file.lo
-	-rm -f clish/shell/libclish_la-shell_help.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_help.lo
-	-rm -f clish/shell/libclish_la-shell_new.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_new.lo
-	-rm -f clish/shell/libclish_la-shell_parse.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_parse.lo
-	-rm -f clish/shell/libclish_la-shell_ptype.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_ptype.lo
-	-rm -f clish/shell/libclish_la-shell_pwd.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_pwd.lo
-	-rm -f clish/shell/libclish_la-shell_spawn.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_spawn.lo
-	-rm -f clish/shell/libclish_la-shell_startup.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_startup.lo
-	-rm -f clish/shell/libclish_la-shell_tinyrl.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_tinyrl.lo
-	-rm -f clish/shell/libclish_la-shell_var.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_var.lo
-	-rm -f clish/shell/libclish_la-shell_view.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_view.lo
-	-rm -f clish/shell/libclish_la-shell_wdog.$(OBJEXT)
-	-rm -f clish/shell/libclish_la-shell_wdog.lo
-	-rm -f clish/shell/shell_tinyxml.$(OBJEXT)
-	-rm -f clish/shell/shell_tinyxml.lo
-	-rm -f clish/var/libclish_la-var.$(OBJEXT)
-	-rm -f clish/var/libclish_la-var.lo
-	-rm -f clish/var/libclish_la-var_dump.$(OBJEXT)
-	-rm -f clish/var/libclish_la-var_dump.lo
-	-rm -f clish/view/libclish_la-view.$(OBJEXT)
-	-rm -f clish/view/libclish_la-view.lo
-	-rm -f clish/view/libclish_la-view_dump.$(OBJEXT)
-	-rm -f clish/view/libclish_la-view_dump.lo
-	-rm -f konf/buf/buf.$(OBJEXT)
-	-rm -f konf/buf/buf.lo
-	-rm -f konf/net/net.$(OBJEXT)
-	-rm -f konf/net/net.lo
-	-rm -f konf/query/query.$(OBJEXT)
-	-rm -f konf/query/query.lo
-	-rm -f konf/query/query_dump.$(OBJEXT)
-	-rm -f konf/query/query_dump.lo
-	-rm -f konf/tree/tree.$(OBJEXT)
-	-rm -f konf/tree/tree.lo
-	-rm -f konf/tree/tree_dump.$(OBJEXT)
-	-rm -f konf/tree/tree_dump.lo
-	-rm -f lub/argv/argv__get_arg.$(OBJEXT)
-	-rm -f lub/argv/argv__get_arg.lo
-	-rm -f lub/argv/argv__get_argv.$(OBJEXT)
-	-rm -f lub/argv/argv__get_argv.lo
-	-rm -f lub/argv/argv__get_count.$(OBJEXT)
-	-rm -f lub/argv/argv__get_count.lo
-	-rm -f lub/argv/argv__get_offset.$(OBJEXT)
-	-rm -f lub/argv/argv__get_offset.lo
-	-rm -f lub/argv/argv__get_quoted.$(OBJEXT)
-	-rm -f lub/argv/argv__get_quoted.lo
-	-rm -f lub/argv/argv_new.$(OBJEXT)
-	-rm -f lub/argv/argv_new.lo
-	-rm -f lub/argv/argv_nextword.$(OBJEXT)
-	-rm -f lub/argv/argv_nextword.lo
-	-rm -f lub/bintree/bintree_dump.$(OBJEXT)
-	-rm -f lub/bintree/bintree_dump.lo
-	-rm -f lub/bintree/bintree_find.$(OBJEXT)
-	-rm -f lub/bintree/bintree_find.lo
-	-rm -f lub/bintree/bintree_findfirst.$(OBJEXT)
-	-rm -f lub/bintree/bintree_findfirst.lo
-	-rm -f lub/bintree/bintree_findlast.$(OBJEXT)
-	-rm -f lub/bintree/bintree_findlast.lo
-	-rm -f lub/bintree/bintree_findnext.$(OBJEXT)
-	-rm -f lub/bintree/bintree_findnext.lo
-	-rm -f lub/bintree/bintree_findprevious.$(OBJEXT)
-	-rm -f lub/bintree/bintree_findprevious.lo
-	-rm -f lub/bintree/bintree_init.$(OBJEXT)
-	-rm -f lub/bintree/bintree_init.lo
-	-rm -f lub/bintree/bintree_insert.$(OBJEXT)
-	-rm -f lub/bintree/bintree_insert.lo
-	-rm -f lub/bintree/bintree_iterator_init.$(OBJEXT)
-	-rm -f lub/bintree/bintree_iterator_init.lo
-	-rm -f lub/bintree/bintree_iterator_next.$(OBJEXT)
-	-rm -f lub/bintree/bintree_iterator_next.lo
-	-rm -f lub/bintree/bintree_iterator_previous.$(OBJEXT)
-	-rm -f lub/bintree/bintree_iterator_previous.lo
-	-rm -f lub/bintree/bintree_node_init.$(OBJEXT)
-	-rm -f lub/bintree/bintree_node_init.lo
-	-rm -f lub/bintree/bintree_remove.$(OBJEXT)
-	-rm -f lub/bintree/bintree_remove.lo
-	-rm -f lub/bintree/bintree_splay.$(OBJEXT)
-	-rm -f lub/bintree/bintree_splay.lo
-	-rm -f lub/ctype/ctype_isdigit.$(OBJEXT)
-	-rm -f lub/ctype/ctype_isdigit.lo
-	-rm -f lub/ctype/ctype_isspace.$(OBJEXT)
-	-rm -f lub/ctype/ctype_isspace.lo
-	-rm -f lub/ctype/ctype_tolower.$(OBJEXT)
-	-rm -f lub/ctype/ctype_tolower.lo
-	-rm -f lub/ctype/ctype_toupper.$(OBJEXT)
-	-rm -f lub/ctype/ctype_toupper.lo
-	-rm -f lub/db/db.$(OBJEXT)
-	-rm -f lub/db/db.lo
-	-rm -f lub/dump/dump.$(OBJEXT)
-	-rm -f lub/dump/dump.lo
-	-rm -f lub/list/list.$(OBJEXT)
-	-rm -f lub/list/list.lo
-	-rm -f lub/string/string_cat.$(OBJEXT)
-	-rm -f lub/string/string_cat.lo
-	-rm -f lub/string/string_catn.$(OBJEXT)
-	-rm -f lub/string/string_catn.lo
-	-rm -f lub/string/string_dup.$(OBJEXT)
-	-rm -f lub/string/string_dup.lo
-	-rm -f lub/string/string_escape.$(OBJEXT)
-	-rm -f lub/string/string_escape.lo
-	-rm -f lub/string/string_free.$(OBJEXT)
-	-rm -f lub/string/string_free.lo
-	-rm -f lub/string/string_nocasecmp.$(OBJEXT)
-	-rm -f lub/string/string_nocasecmp.lo
-	-rm -f lub/string/string_nocasestr.$(OBJEXT)
-	-rm -f lub/string/string_nocasestr.lo
-	-rm -f lub/string/string_suffix.$(OBJEXT)
-	-rm -f lub/string/string_suffix.lo
-	-rm -f lub/system/system_file.$(OBJEXT)
-	-rm -f lub/system/system_file.lo
-	-rm -f lub/system/system_test.$(OBJEXT)
-	-rm -f lub/system/system_test.lo
-	-rm -f lub/system/test.$(OBJEXT)
-	-rm -f lub/system/test.lo
-	-rm -f tinyrl/history/history.$(OBJEXT)
-	-rm -f tinyrl/history/history.lo
-	-rm -f tinyrl/history/history_entry.$(OBJEXT)
-	-rm -f tinyrl/history/history_entry.lo
-	-rm -f tinyrl/tinyrl.$(OBJEXT)
-	-rm -f tinyrl/tinyrl.lo
-	-rm -f tinyrl/vt100/vt100.$(OBJEXT)
-	-rm -f tinyrl/vt100/vt100.lo
-	-rm -f tinyxml/libtinyxml_la-tinystr.$(OBJEXT)
-	-rm -f tinyxml/libtinyxml_la-tinystr.lo
-	-rm -f tinyxml/libtinyxml_la-tinyxml.$(OBJEXT)
-	-rm -f tinyxml/libtinyxml_la-tinyxml.lo
-	-rm -f tinyxml/libtinyxml_la-tinyxmlerror.$(OBJEXT)
-	-rm -f tinyxml/libtinyxml_la-tinyxmlerror.lo
-	-rm -f tinyxml/libtinyxml_la-tinyxmlparser.$(OBJEXT)
-	-rm -f tinyxml/libtinyxml_la-tinyxmlparser.lo
+	-rm -f bin/*.$(OBJEXT)
+	-rm -f clish/*.$(OBJEXT)
+	-rm -f clish/*.lo
+	-rm -f clish/action/*.$(OBJEXT)
+	-rm -f clish/action/*.lo
+	-rm -f clish/command/*.$(OBJEXT)
+	-rm -f clish/command/*.lo
+	-rm -f clish/config/*.$(OBJEXT)
+	-rm -f clish/config/*.lo
+	-rm -f clish/nspace/*.$(OBJEXT)
+	-rm -f clish/nspace/*.lo
+	-rm -f clish/param/*.$(OBJEXT)
+	-rm -f clish/param/*.lo
+	-rm -f clish/pargv/*.$(OBJEXT)
+	-rm -f clish/pargv/*.lo
+	-rm -f clish/ptype/*.$(OBJEXT)
+	-rm -f clish/ptype/*.lo
+	-rm -f clish/shell/*.$(OBJEXT)
+	-rm -f clish/shell/*.lo
+	-rm -f clish/var/*.$(OBJEXT)
+	-rm -f clish/var/*.lo
+	-rm -f clish/view/*.$(OBJEXT)
+	-rm -f clish/view/*.lo
+	-rm -f konf/buf/*.$(OBJEXT)
+	-rm -f konf/buf/*.lo
+	-rm -f konf/net/*.$(OBJEXT)
+	-rm -f konf/net/*.lo
+	-rm -f konf/query/*.$(OBJEXT)
+	-rm -f konf/query/*.lo
+	-rm -f konf/tree/*.$(OBJEXT)
+	-rm -f konf/tree/*.lo
+	-rm -f lub/argv/*.$(OBJEXT)
+	-rm -f lub/argv/*.lo
+	-rm -f lub/bintree/*.$(OBJEXT)
+	-rm -f lub/bintree/*.lo
+	-rm -f lub/ctype/*.$(OBJEXT)
+	-rm -f lub/ctype/*.lo
+	-rm -f lub/db/*.$(OBJEXT)
+	-rm -f lub/db/*.lo
+	-rm -f lub/dump/*.$(OBJEXT)
+	-rm -f lub/dump/*.lo
+	-rm -f lub/list/*.$(OBJEXT)
+	-rm -f lub/list/*.lo
+	-rm -f lub/string/*.$(OBJEXT)
+	-rm -f lub/string/*.lo
+	-rm -f lub/system/*.$(OBJEXT)
+	-rm -f lub/system/*.lo
+	-rm -f tinyrl/*.$(OBJEXT)
+	-rm -f tinyrl/*.lo
+	-rm -f tinyrl/history/*.$(OBJEXT)
+	-rm -f tinyrl/history/*.lo
+	-rm -f tinyrl/vt100/*.$(OBJEXT)
+	-rm -f tinyrl/vt100/*.lo
+	-rm -f tinyxml/*.$(OBJEXT)
+	-rm -f tinyxml/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -1268,6 +1151,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/clish.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/konf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/konfd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/sigexec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clish/$(DEPDIR)/libclish_la-callback_access.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clish/$(DEPDIR)/libclish_la-callback_config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clish/$(DEPDIR)/libclish_la-callback_log.Plo@am__quote@
@@ -1924,9 +1808,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	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,^[^:\\/]:[\\/],/,'` \

+ 8 - 34
aclocal.m4

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
 
 # Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
@@ -8634,8 +8634,6 @@ m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -8645,7 +8643,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.12'
 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.12.1], [],
+m4_if([$1], [1.12.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8661,7 +8659,7 @@ 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.12.1])dnl
+[AM_AUTOMAKE_VERSION([1.12.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -8674,8 +8672,6 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
 # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
@@ -8729,8 +8725,6 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
@@ -8762,7 +8756,6 @@ fi])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 17
 
 # 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,
@@ -8954,7 +8947,6 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -9031,8 +9023,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 19
-
 # 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.
 
@@ -9107,6 +9097,11 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -9179,8 +9174,6 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -9202,8 +9195,6 @@ AC_SUBST([install_sh])])
 # 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],
@@ -9225,8 +9216,6 @@ AC_SUBST([am__leading_dot])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -9275,8 +9264,6 @@ rm -f confinc confmf
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_PROG_CC_C_O
 # --------------
 # Like AC_PROG_CC_C_O, but changed for automake.
@@ -9311,8 +9298,6 @@ m4_define([AC_PROG_CC],
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -9320,7 +9305,6 @@ 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.
@@ -9353,8 +9337,6 @@ fi
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -9386,8 +9368,6 @@ AC_DEFUN([_AM_IF_OPTION],
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
@@ -9469,8 +9449,6 @@ rm -f conftest.file
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor 'install' (even GNU) is that you can't
@@ -9499,8 +9477,6 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # 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.
@@ -9520,8 +9496,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.

+ 6 - 2
aux_scripts/config.guess

@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-06-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -200,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -1256,7 +1260,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)

+ 5 - 2
aux_scripts/config.sub

@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-04-18'
+timestamp='2012-06-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1352,7 +1352,7 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -1543,6 +1543,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;

+ 74 - 1
aux_scripts/depcomp

@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2012-07-12.20; # UTC
 
 # Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
@@ -334,6 +334,79 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'`
+  tmpdepfile="$base.d"
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir="$base.d-lock"
+  trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0 ; do
+    # mkdir is a portable test-and-set.
+    if mkdir $lockdir 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rm -rf $lockdir
+      break
+    else
+      ## the lock is being held by a different process,
+      ## wait until the winning process is done or we timeout
+      while test -d $lockdir && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
 hp2)
   # The "hp" stanza above does not work with aCC (C++) and HP's ia64
   # compilers, which have integrated preprocessors.  The correct option

+ 17 - 10
configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for klish 1.5.5.
+# Generated by GNU Autoconf 2.69 for klish 1.5.6.
 #
 # Report bugs to <serj.kalichev at gmail dot com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='klish'
 PACKAGE_TARNAME='klish'
-PACKAGE_VERSION='1.5.5'
-PACKAGE_STRING='klish 1.5.5'
+PACKAGE_VERSION='1.5.6'
+PACKAGE_STRING='klish 1.5.6'
 PACKAGE_BUGREPORT='serj.kalichev at gmail dot com'
 PACKAGE_URL=''
 
@@ -663,6 +663,7 @@ am__tar
 AMTAR
 am__leading_dot
 SET_MAKE
+mkdir_p
 MKDIR_P
 INSTALL_STRIP_PROGRAM
 install_sh
@@ -1326,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures klish 1.5.5 to adapt to many kinds of systems.
+\`configure' configures klish 1.5.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1397,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of klish 1.5.5:";;
+     short | recursive ) echo "Configuration of klish 1.5.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1503,7 +1504,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-klish configure 1.5.5
+klish configure 1.5.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2176,7 +2177,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by klish $as_me 1.5.5, which was
+It was created by klish $as_me 1.5.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -15789,7 +15790,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='klish'
- VERSION='1.5.5'
+ VERSION='1.5.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15817,6 +15818,12 @@ 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
@@ -17139,7 +17146,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by klish $as_me 1.5.5, which was
+This file was extended by klish $as_me 1.5.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17205,7 +17212,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-klish config.status 1.5.5
+klish config.status 1.5.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

+ 1 - 1
configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 m4_define([MAJOR_VERSION], 1)
 m4_define([MINOR_VERSION], 5)
-m4_define([MICRO_VERSION], 5)
+m4_define([MICRO_VERSION], 6)
 
 AC_PREREQ(2.59)
 AC_INIT([klish],