From eb8797c9a28f3f4e238bad89b56d331492df7828 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Sat, 8 Oct 2011 01:21:59 +0300
Subject: Use Imprimatur for docs processing.

* .gitmodules: Add imprimatur.
* Makefile.am (ACLOCAL_AMFLAGS,SUBDIRS): Add imprimatur.
* configure.ac: Require gettext 0.18. Call IMPRIMATUR_INIT.
Define ATTRIBUTE_NORETURN, if not defined already.
* doc/Makefile.am: Use imprimatur. Drop files that are
no longer necessary.
* doc/check-docs.sh: Delete.
* doc/fix-sentence-spacing.sed: Delete.
* doc/mastermenu.el: Delete.
* doc/rendition.texi: Delete.
* doc/untabify.el: Delete.

* doc/pies.texi: Use @: where appropriate.

* src/pies.c (main): Use _() instead of N_().
---
 configure.ac | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 0d2881c..a8848dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ MF_PROCTITLE
 # Gettext.
 AM_ICONV
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18])
 
 AC_ARG_ENABLE([inetd],
               AC_HELP_STRING([--enable-inetd],
@@ -75,22 +75,13 @@ AC_ARG_ENABLE([inetd],
 	       no)  ;;
 	       esac])
 
-# Doc hints.
-# Select a rendition level:
-#  DISTRIB for stable releases (at most one dot in the version number)
-#  and maintenance releases (two dots, patchlevel < 50)
-#  PROOF for alpha releases.
-#  PUBLISH can only be required manually when running make in doc/
-AC_SUBST(RENDITION)
-case `echo $VERSION|sed  's/[[^.]]//g'` in
-""|".")  RENDITION=DISTRIB;;
-"..")  if test `echo $VERSION | sed  's/.*\.//'` -lt 50; then
-	 RENDITION=DISTRIB
-       else
-         RENDITION=PROOF
-       fi;;
-*)     RENDITION=PROOF;;
-esac
+AH_BOTTOM([
+# ifndef ATTRIBUTE_NORETURN
+#  define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# endif
+])
+
+IMPRIMATUR_INIT
 
 AC_CONFIG_FILES([Makefile
                  gnu/Makefile
-- 
cgit v1.2.1