From 5131315a8153c70c7acc92a02323a47f6c563dfd Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Fri, 13 Jun 2014 09:06:41 +0300
Subject: Bugfixes.

* configure.ac: Use subdir-objects Automake option.
* doc/Config: Put search form into the menu.
* doc/Makefile.am (check-sub-config): Fix sed expression.
---
 configure.ac    |  2 +-
 doc/Config      | 13 +++++++++++++
 doc/Makefile.am |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ef8f62e..908f20f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_CONFIG_SRCDIR([src/wydawca.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR(m4)
-AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz std-options silent-rules])
+AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz std-options silent-rules subdir-objects])
 
 # Enable silent rules by default:
 AM_SILENT_RULES([yes])
diff --git a/doc/Config b/doc/Config
index 382fdc5..52454f1 100644
--- a/doc/Config
+++ b/doc/Config
@@ -42,6 +42,19 @@ $AFTER_BODY_OPEN=qq{
   <li><a href="${top_html_dir}/wydawca.html">Main</a></li>
   <li><a href="${top_html_dir}/download.html">Downloads</a></li>
   <li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li>
+  <li>
+     <form method="post" action="/searchdoc"
+           enctype="application/x-www-form-urlencoded">
+       <div>
+         <input id="searchinput" type="text" size="30" maxlength="255" name="q" valu
+e="" />
+         <input type="submit" name="search" value="Search" tabindex="12" />
+         <input type="hidden" id="searchproject" name="p" value="wydawca" />
+         <input type="hidden" name="t" value="searchdoc.in" />
+       </div>
+     </form>
+  </li>
+
 </ul>};
 
 $PRE_BODY_CLOSE="Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.";
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2bb3e81..88ba67f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -66,7 +66,7 @@ check-config:
 		$(info_TEXINFOS) 
 
 check-sub-config:
-	@sed -n '/wydawca_kw\[\] *= *{/,/^}/{p}' ../src/config.c ../src/tcpwrap.c|tr  '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \
+	@sed -n '/wydawca_kw\[\] *= *{/,/^}/{p}' ../src/config.c ../src/tcpwrap.c|tr  '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \
         while read ident kw; do \
 	   $(CHECK_DOCS) "$$ident configuration statements" \
 	   "/$$kw"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
-- 
cgit v1.2.1