Added Patches by Robin Lee <robinlee.sysu@gmail.com> to make xstow work

with gcc 4.8. Changed some stuff in configure.ac to make ist work with 
uptodate automake versions. Static compilation has to be enabled now.
Won't be build by default.

Author: majorkingleo

ChangeLog

@@ -1,3 +1,16 @@
+2014-01-02 Martin Oberzalkek <kingleo@gmx.at>
+
+	* ref.h added patch by 	Robin Lee <robinlee.sysu@gmail.com> fixed compilation bug with gcc 4.8
+
+	* doku added patch by  Robin Lee <robinlee.sysu@gmail.com> fixed pod2man bug 
+
+	* configure.ac: let it work with automake 1.13.4
+
+	* configure.ac: disable static compilation by default
+
+	* configure.ac: detect if libtinfo is required (seems to be outsourced fom curses)
+
+
 2012-06-10 Martin Oberzalek  <kingleo@gmx.at>
 
         * configure.ac: fixed bug when trying to detect curses library

configure.ac

@@ -1,9 +1,9 @@
-AC_INIT
+AC_INIT(xstow, 1.0.1)
 AC_CONFIG_SRCDIR([src/main.cpp])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(xstow, 1.0.1)
+AM_INIT_AUTOMAKE
 
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CXX
 AC_LANG(C++)
 AC_PROG_INSTALL
@@ -120,25 +120,33 @@ AC_ARG_WITH(curses,
 				  if test $support_curses -eq 1; then
 
 				     AC_MSG_CHECKING([for ominous macros in curses])
-				     AC_TRY_COMPILE([
+				     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 					#include <curses.h>
 					#include <list>
 					struct Foo { Foo() { std::list<int> il; il.erase(il.begin()); } };
-					],
-					[ Foo foo ],
-					[
+					]], [[ Foo foo ]])],[
 						AC_MSG_RESULT(no)
 						support_curses=1
-					],
-					[
+					],[
 						AC_MSG_RESULT(yes => curses support disabled)
 						support_curses=0
 					]) 
 
 				  fi
 
 				  if test $support_curses -eq 1; then
-				  	AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib")
+
+				     AC_CHECK_LIB([tinfo],[COLS],
+						[
+						  need_tinfo=1
+						  tinfolib="-ltinfo"
+						],
+						[ need_tinfo=0 ])
+
+				  fi
+
+				  if test $support_curses -eq 1; then
+				  	AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
 				        AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
 				  fi
 
@@ -179,25 +187,22 @@ AC_ARG_ENABLE(ini,
         ] )
 
 AC_MSG_CHECKING([for GNU like STL containers])
-AC_TRY_COMPILE([ 
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ 
 #include <list> 
 struct Foo { typedef std::list<Foo>::iterator it; }; 
-],
-		[ Foo foo ],
-		[
+]], [[ Foo foo ]])],[
 			AC_MSG_RESULT(yes)
 
 			if test $no_ini -eq 0; then
 			   AC_DEFINE(CAN_USE_INI, 1, [the ini class should compile clean])
 			   support_ini=1
 			fi
-		],
-		[
+		],[
 			AC_MSG_RESULT(no)
 			AC_MSG_WARN([cannot compile with configuration file support])
 			support_ini=0
-		]
-	)
+		
+	])
 
 AC_MSG_CHECKING([for debugging support])
 AC_ARG_ENABLE(debug,
@@ -219,19 +224,16 @@ AC_ARG_ENABLE(debug,
 	] )
 
 AC_MSG_CHECKING([for new std::ios_base])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <fstream>
-],
-	[ std::ifstream in( "foo", std::ios_base::in ); ],
-	[
+]], [[ std::ifstream in( "foo", std::ios_base::in ); ]])],[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_IOS_BASE, 1, [ios_base can be used])
-	],
-	[
+	],[
 		AC_MSG_RESULT(no)
 		AC_DEFINE(ios_base, ios, [use old ios instead of ios_base])
-	]
-)
+	
+])
 
 CXXFLAGS="$CXXFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
 
@@ -249,7 +251,7 @@ AC_ARG_ENABLE(static,
 	],
 	[
 	   AC_MSG_RESULT(enabled)
-	   support_static=1
+	   support_static=0
 	] )
 
 AC_MSG_CHECKING([create merge-info?])

depcomp

@@ -1 +1 @@
-/usr/share/automake-1.11/depcomp
+/usr/share/automake-1.13/depcomp

doc/merge-info.1

@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
+.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
@@ -46,27 +38,36 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
+.    ds C`
+.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
 .\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
 ..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
 .\}
+.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -132,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "MERGE-INFO 1"
-.TH MERGE-INFO 1 "2010-07-22" "XStow 1.0.0" "XStow Reference Guide"
+.TH MERGE-INFO 1 "2014-01-02" "XStow 1.0.1" "XStow Reference Guide"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -141,7 +142,7 @@
 merge\-info, merge and unmerge GNU Info index files
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-merge-info        [\s-1OPTION\s0 ...] \s-1FILE\s0 \s-1FILE\s0
+merge-info        [\s-1OPTION ...\s0] \s-1FILE FILE\s0
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 merge-info can merge and unmerge the \s-1GNU\s0 Info index files named
@@ -166,7 +167,7 @@ This is the common case if you are using a tool like
 files and creates a new 'dir' file.
 .SH "USAGE"
 .IX Header "USAGE"
-merge-info [\s-1OPTION\s0 ...] \s-1FILE\s0 \s-1FILE\s0
+merge-info [\s-1OPTION ...\s0] \s-1FILE FILE\s0
 .PP
 Merge two files:
 .PP
@@ -192,6 +193,9 @@ Shows a help screen.
 .IX Item "-V -Version"
 Displays the verion number of the XStow package. \fBmerge-info\fR is
 shipped with \fBxstow\fR(1).
+.IP "\fB\-C \-no\-curses\fR" 4
+.IX Item "-C -no-curses"
+Do not detect the terminal width by using curses.
 .IP "\fB\-u \-unmerge\fR" 4
 .IX Item "-u -unmerge"
 Unmerge instead of merge. Note: It is not possible splitting up one
@@ -216,6 +220,27 @@ more than one section. If you do not wan't this, use this option.
 .IP "\fB\s-1XSTOW_DEBUG_LEVEL\s0\fR" 4
 .IX Item "XSTOW_DEBUG_LEVEL"
 Same as the \fB\-debug\-level\fR option.
+.IP "\fB\s-1XSTOW_USE_CURSES\s0\fR" 4
+.IX Item "XSTOW_USE_CURSES"
+Same as the \fB\-no\-curses\fR option.
+.Sp
+In previous versions xstow tried detecting the terminal width and height,
+by default at the startup routine. Even if this value is only used by
+the help screen. The result was:
+.Sp
+.Vb 2
+\&    $ TERM="" xstow 
+\&    Error opening terminal: unknown.
+.Ve
+.Sp
+The error message is reported by the ncurses lib. This can cause problems
+if you wan't start xstow as a cron job.
+Now xstow tries detecting the terminal width not in it's startup, but
+when the help screen is printed out. As an extra option you can set
+the environment variable \fB\s-1XSTOW_USE_CURSES\s0\fR=\*(L"0\*(R" this will tell xstow
+not using curses anyway.
+.Sp
+merge-info has the same behaviour.
 .SH "AUTHORS"
 .IX Header "AUTHORS"
 merge-info was written by Martin Oberzalek <kingleo@gmx.at>.
@@ -231,22 +256,13 @@ the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 .PP
 This program is distributed in the hope that it will be useful,
-but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of
-\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0.  See the
+but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
+\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the
 \&\s-1GNU\s0 General Public License for more details.
 .PP
 You should have received a copy of the \s-1GNU\s0 General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0.
+Foundation, Inc., 675 Mass Ave, Cambridge, \s-1MA 02139, USA.\s0
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIinfo\fR\|(1) \fIinstall\-info\fR\|(1) \fIxstow\fR\|(1)
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 42:" 4
-.IX Item "Around line 42:"
-Can't have a 0 in =over 0
-.IP "Around line 83:" 4
-.IX Item "Around line 83:"
-Can't have a 0 in =over 0