From 317f6a237089a421d8cb57f398eedf6afc600832 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 3 Jul 2014 19:20:00 +0300
Subject: Unconditionally build and test the ice-9/popen module.

* module/Makefile.am (ICE_9_SOURCES): Add ice-9/popen.scm.
  (ICE_9_SOURCES) [BUILD_ICE_9_POPEN]: Remove conditional addition
  of ice-9/popen.scm.
  (SCRIPTS_SOURCES): Add scripts/autofrisk.scm and
  scripts/scan-api.scm unconditionally.
  (SCRIPTS_SOURCES) [BUILD_ICE_9_POPEN]: Remove conditional addition
  of scripts/autofrisk.scm and scripts/scan-api.scm.

* configure.ac: Remove the BUILD_ICE_9_POPEN condition.

* test-suite/tests/popen.test (if-supported): Don't test for 'fork
 feature being supported.
---
 configure.ac                |  3 ---
 module/Makefile.am          | 17 ++++-------------
 test-suite/tests/popen.test |  3 +--
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9f87809b5..552a91b64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -770,9 +770,6 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 ctermid		\
   strcoll strcoll_l newlocale utimensat sched_getaffinity		\
   sched_setaffinity sendfile])
 
-AM_CONDITIONAL([BUILD_ICE_9_POPEN],
-  [test "x$enable_posix" = "xyes" && test "x$ac_cv_func_fork" = "xyes"])
-
 # Reasons for testing:
 #   netdb.h - not in mingw
 #   sys/param.h - not in mingw
diff --git a/module/Makefile.am b/module/Makefile.am
index 521318b50..b25711653 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -178,7 +178,9 @@ SCRIPTS_SOURCES =				\
   scripts/summarize-guile-TODO.scm		\
   scripts/api-diff.scm				\
   scripts/read-rfc822.scm			\
-  scripts/snarf-guile-m4-docs.scm
+  scripts/snarf-guile-m4-docs.scm		\
+  scripts/autofrisk.scm				\
+  scripts/scan-api.scm
 
 SYSTEM_BASE_SOURCES =				\
   system/base/pmatch.scm			\
@@ -223,6 +225,7 @@ ICE_9_SOURCES = \
   ice-9/optargs.scm \
   ice-9/poe.scm \
   ice-9/poll.scm \
+  ice-9/popen.scm \
   ice-9/posix.scm \
   ice-9/q.scm \
   ice-9/rdelim.scm \
@@ -254,18 +257,6 @@ ICE_9_SOURCES = \
   ice-9/serialize.scm \
   ice-9/local-eval.scm
 
-if BUILD_ICE_9_POPEN
-
-# This functionality is missing on systems without `fork'---i.e., Windows.
-ICE_9_SOURCES += ice-9/popen.scm
-
-# These modules rely on (ice-9 popen).
-SCRIPTS_SOURCES +=				\
-  scripts/autofrisk.scm				\
-  scripts/scan-api.scm
-
-endif BUILD_ICE_9_POPEN
-
 srfi/srfi-64.go: srfi/srfi-64.scm srfi/srfi-64/testing.scm
 
 SRFI_SOURCES = \
diff --git a/test-suite/tests/popen.test b/test-suite/tests/popen.test
index 27e15dcad..2c0877484 100644
--- a/test-suite/tests/popen.test
+++ b/test-suite/tests/popen.test
@@ -36,8 +36,7 @@
       restore-signals))
 
 (define-syntax-rule (if-supported body ...)
-  (if (provided? 'fork)
-      (begin body ...)))
+  (begin body ...))
 
 (if-supported
  (use-modules (ice-9 popen))
-- 
cgit v1.2.1