included help output from programs in documentation

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@627 96b47cad-a561-4643-ad3b-153ac7d7599c

npa/configure.ac

@@ -8,13 +8,23 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 
+dnl Add libtool support.
+ifdef(
+	[LT_INIT],
+	[
+		LT_INIT([win32-dll])
+	],
+	[
+		AC_LIBTOOL_WIN32_DLL
+		AC_PROG_LIBTOOL
+	]
+)
+
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_LIBTOOL
-LT_INIT
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
 

npa/doc/Makefile.am

@@ -13,6 +13,7 @@ do_subst = sed \
 	   -e 's,[@]includedir[@],$(includedir),g' \
 	   -e 's,[@]VERSION[@],$(VERSION),g' \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
+	   -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
 EXTRA_DIST = README.rst.in README.rst Doxyfile.in example.c autotools.rst autotools.rst.in questions.rst questions.rst.in

npa/doc/README.rst

@@ -109,6 +109,8 @@ To pass a secret to npa-tool, the command line parameters or the environment
 variables PIN/CAN/MRZ/PUK/NEWPIN can be used. If none of these options is used,
 npa-tool will show a password prompt.
 
+.. program-output:: sh -c 'cd /home/fm/work/vsmartcard/npa/src && ./npa-tool --help'
+
 ----------------------
 Linking against libnpa
 ----------------------

npa/doc/README.rst.in

@@ -109,6 +109,8 @@ To pass a secret to npa-tool, the command line parameters or the environment
 variables PIN/CAN/MRZ/PUK/NEWPIN can be used. If none of these options is used,
 npa-tool will show a password prompt.
 
+.. program-output:: sh -c 'cd @abs_top_srcdir@/src && ./npa-tool --help'
+
 ----------------------
 Linking against libnpa
 ----------------------