From 40e73b9edaeba2d7bf47434fd97af7a10bfbbe34 Mon Sep 17 00:00:00 2001
From: bwarken <bwarken>
Date: Tue, 16 Apr 2013 19:00:42 +0000
Subject: INSTALL.gen: Replace this file by the daily `git' version of
 `automake' `INSTALL' file.

INSTALL.autotools: Remove file.
INSTALL.CVS: New file, moved from `INSTALL.autotools'.

m4/ax_prog_perl_version.m4: New file, taken from package
`autoconf-archive-2013.04.06'.

m4/groff.m4: Remove unnecessary blank line.

Makefile.in: Add `$(PERLVERSION)'.

aclocal.m4: Run `autoreconf -I m4' (this includes
`aclocal -I m4').  This creates a suitable `aclocal.m4'.  Remove
generated subdirectory `autom4te.cache'.

src/roff/grog/Makefile.sub: Correct `sed' command.  Use `tabs'
that are needed by `GNU make'.
---
 m4/ax_prog_perl_version.m4 | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 m4/groff.m4                |  1 -
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 m4/ax_prog_perl_version.m4

(limited to 'm4')

diff --git a/m4/ax_prog_perl_version.m4 b/m4/ax_prog_perl_version.m4
new file mode 100644
index 00000000..18d9f745
--- /dev/null
+++ b/m4/ax_prog_perl_version.m4
@@ -0,0 +1,66 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+#   Makes sure that perl supports the version indicated. If true the shell
+#   commands in ACTION-IF-TRUE are executed. If not the shell commands in
+#   ACTION-IF-FALSE are run. Note if $PERL is not set (for example by
+#   running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail.
+#
+#   Example:
+#
+#     AC_PATH_PROG([PERL],[perl])
+#     AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ])
+#
+#   This will check to make sure that the perl you have supports at least
+#   version 5.8.0.
+#
+#   NOTE: This macro uses the $PERL variable to perform the check.
+#   AX_WITH_PERL can be used to set that variable prior to running this
+#   macro. The $PERL_VERSION variable will be valorized with the detected
+#   version.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 11
+
+AC_DEFUN([AX_PROG_PERL_VERSION],[
+    AC_REQUIRE([AC_PROG_SED])
+    AC_REQUIRE([AC_PROG_GREP])
+
+    AS_IF([test -n "$PERL"],[
+        ax_perl_version="$1"
+
+        AC_MSG_CHECKING([for perl version])
+        changequote(<<,>>)
+        perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e 's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'`
+        changequote([,])
+        AC_MSG_RESULT($perl_version)
+
+	AC_SUBST([PERL_VERSION],[$perl_version])
+
+        AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[
+	    :
+            $2
+        ],[
+	    :
+            $3
+        ])
+    ],[
+        AC_MSG_WARN([could not find the perl interpreter])
+        $3
+    ])
+])
diff --git a/m4/groff.m4 b/m4/groff.m4
index 69175370..d93fe51e 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -148,7 +148,6 @@ AC_DEFUN([GROFF_HTML_PROGRAMS],
      AC_MSG_WARN([missing program$plural:
 
   The program$plural
-
      $missing
   cannot be found in the PATH.
   Consequently, groff's HTML backend (grohtml) will not work properly;
-- 
cgit v1.2.1