Merge branch '1.2'

# Conflicts:
#	include/tclap/ZshCompletionOutput.h
#	tests/Makefile.am
#	tests/runtests.sh
#	tests/test79.sh

ChangeLog

@@ -1,3 +1,13 @@
+2017-12-26 14:30 macbishop
+	* Bugfix release for 1.2 branch (v1.2.2):
+	    - Fixed a few typos
+	    - Fixed ZshCompletionOutput
+	    - Fixed brief output with TCLAP_NAMESTRING defined
+	    - Initialize theDelimiter (supress warning) in DocBookOutput
+	    - Fixed an issue with config.h and compiling on systems
+	      without sstream.h
+	    - Fixed } outside of include guards in ArgTraits.h
+
 2011-04-10 17:08  mes5k
 
 	* include/tclap/Arg.h: patch that allows arg start strings to be

NEWS

@@ -93,3 +93,5 @@ at test11.cpp and test12.cpp for examples on using ArgTraits for extending
 tclap for different types.
 
 4/16/11 - Another long break!  Several minor bug and memory leak fixes.
+
+12/26/17 - v1.2 bug fix release

configure.in

@@ -2,7 +2,7 @@ AC_INIT(Makefile.am)
 #AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config/config.h)
-AM_INIT_AUTOMAKE(tclap,1.2.1)
+AM_INIT_AUTOMAKE(tclap,1.2.2)
 AC_PROG_CXX
 AC_CXX_HAVE_SSTREAM
 AC_CXX_HAVE_STRSTREAM

docs/Makefile.am

@@ -19,7 +19,7 @@ install-data-local :
 	cp -R $(abs_srcdir)/html $(DESTDIR)$(docdir)
 
 uninstall-local :
-	chmod -R +w $(DESTDIR)$(docdir)
+	chmod -R o+w $(DESTDIR)$(docdir)
 	rm -rf $(DESTDIR)$(docdir)
 
 dist-hook :
@@ -27,5 +27,6 @@ dist-hook :
 	cp -R $(abs_srcdir)/html $(distdir)
 
 clean-local:
-	$(RM) -rf $(abs_srcdir)/html/*
+	$(RM) -rf $(abs_builddir)/html/*
+	$(RM) -rf $(abs_builddir)/doxygen_sqlite3.db
 

include/tclap/Makefile.am

@@ -24,5 +24,5 @@ libtclapinclude_HEADERS = \
 			 Constraint.h \
 			 ValuesConstraint.h \
 			 ArgTraits.h \
-			 StandardTraits.h
-
+			 StandardTraits.h \
+			 sstream.h

include/tclap/ZshCompletionOutput.h

@@ -239,6 +239,7 @@ inline void ZshCompletionOutput::printOption(Arg* a, std::string mutex)
 		std::string arg = a->shortID();
         // Example arg: "[-A <integer>] ..."
         size_t pos = arg.rfind(" ...");
+
         if (pos != std::string::npos) {
             arg.erase(pos);
         }

tests/test79.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# success
+
 ../examples/test21 > tmp.out 2>&1
 
 if cmp -s tmp.out $srcdir/test79.out; then