From e141e63f50afe4469993b9a402efb0edb85a4613 Mon Sep 17 00:00:00 2001
From: Luis Kornblueh <luis.kornblueh@zmaw.de>
Date: Tue, 11 Feb 2014 10:51:30 +0100
Subject: [PATCH] Hopefully better conditional for ragel requirement.
---
Makefile.in | 5 +++--
aclocal.m4 | 6 +++---
configure | 6 +++---
doc/Makefile.in | 2 +-
m4/ax_prog_ragel.m4 | 2 +-
src/Makefile.in | 2 +-
test/Makefile.in | 2 +-
7 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 9854218e..dbbe8ebf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -663,9 +663,10 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
diff --git a/aclocal.m4 b/aclocal.m4
index 4dd21fda..eba841f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/configure b/configure
index bd63b79c..35c729b7 100755
--- a/configure
+++ b/configure
@@ -15316,10 +15316,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need ragel to regenerate sources" >&5
$as_echo_n "checking whether we need ragel to regenerate sources... " >&6; }
- if test src/mtime_iso8601.c -nt src/mtime_iso8601.rl; then :
- ragel_needed=no
-else
+ if test src/mtime_iso8601.c -ot src/mtime_iso8601.rl; then :
ragel_needed=yes
+else
+ ragel_needed=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ragel_needed" >&5
$as_echo "$ragel_needed" >&6; }
diff --git a/doc/Makefile.in b/doc/Makefile.in
index eeae8fa3..eeccf8e6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/m4/ax_prog_ragel.m4 b/m4/ax_prog_ragel.m4
index 58a7d4ea..58898950 100644
--- a/m4/ax_prog_ragel.m4
+++ b/m4/ax_prog_ragel.m4
@@ -13,7 +13,7 @@ AC_DEFUN([AX_PROG_RAGEL], [
AS_IF([test x"$RAGEL" = x"false"], [
AC_MSG_CHECKING([whether we need ragel to regenerate sources])
- AS_IF([test $1 -nt $2], [ragel_needed=no], [ragel_needed=yes])
+ AS_IF([test $1 -ot $2], [ragel_needed=yes], [ragel_needed=no])
AC_MSG_RESULT([$ragel_needed])
AS_IF([test x"$ragel_needed" = x"yes"],
diff --git a/src/Makefile.in b/src/Makefile.in
index 1b32241c..3992653c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/test/Makefile.in b/test/Makefile.in
index abbc63d0..5a3952c4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
--
GitLab