From 04b939c3a71636c23df6709ebc57ecd920bfbaf9 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Sun, 11 Sep 2016 16:13:11 -0700
Subject: [PATCH] dfa: port to Solaris 9

Problems reported by Tom G. Christensen in:
http://lists.gnu.org/archive/html/bug-gnulib/2016-09/msg00031.html
* modules/dfa (Depends-on): Add isblank.
* modules/dfa-tests (dfa_match_aux_LDADD):
Rename from test_stat_LDADD, to fix typo.
* tests/dfa-match.sh: Don't require 'timeout'; use it if available.
---
 ChangeLog          | 10 ++++++++++
 modules/dfa        |  1 +
 modules/dfa-tests  |  2 +-
 tests/dfa-match.sh |  8 ++++++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d37fdae..adcbe8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-09-11  Paul Eggert  <address@hidden>
+
+	dfa: port to Solaris 9
+	Problems reported by Tom G. Christensen in:
+	http://lists.gnu.org/archive/html/bug-gnulib/2016-09/msg00031.html
+	* modules/dfa (Depends-on): Add isblank.
+	* modules/dfa-tests (dfa_match_aux_LDADD):
+	Rename from test_stat_LDADD, to fix typo.
+	* tests/dfa-match.sh: Don't require 'timeout'; use it if available.
+
 2016-09-10  Jim Meyering  <address@hidden>
 
 	strverscmp: avoid link failure on OS X
diff --git a/modules/dfa b/modules/dfa
index 5708ed1..e95035a 100644
--- a/modules/dfa
+++ b/modules/dfa
@@ -10,6 +10,7 @@ lib/localeinfo.h
 Depends-on:
 assert
 ctype
+isblank
 locale
 regex
 stdbool
diff --git a/modules/dfa-tests b/modules/dfa-tests
index 6a64ff9..9f00d81 100644
--- a/modules/dfa-tests
+++ b/modules/dfa-tests
@@ -18,4 +18,4 @@ TESTS +=			\
   dfa-match.sh
 
 check_PROGRAMS += dfa-match-aux
-test_stat_LDADD = $(LDADD) $(LIBINTL)
+dfa_match_aux_LDADD = $(LDADD) @LIBINTL@
diff --git a/tests/dfa-match.sh b/tests/dfa-match.sh
index e9efd47..5da1985 100755
--- a/tests/dfa-match.sh
+++ b/tests/dfa-match.sh
@@ -21,7 +21,11 @@
 # Add "." to PATH for the use of dfa-match-aux.
 path_prepend_ .
 
-require_timeout_
+if (type timeout) >/dev/null 2>&1; then
+  timeout_10='timeout 10'
+else
+  timeout_10=
+fi
 
 fail=0
 
@@ -29,7 +33,7 @@ dfa-match-aux a ba 0 > out || fail=1
 compare /dev/null out || fail=1
 
 in=$(printf "bb\nbb")
-timeout 10 dfa-match-aux a "$in" 1 > out || fail=1
+$timeout_10 dfa-match-aux a "$in" 1 > out || fail=1
 compare /dev/null out || fail=1
 
 Exit $fail
-- 
2.7.4