[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.11-44-g317f6a2

[Eli Zaretskii]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=317f6a237089a421d8cb57f398eedf6afc600832

The branch, stable-2.0 has been updated
       via  317f6a237089a421d8cb57f398eedf6afc600832 (commit)
      from  bc945fadd2e94c5ddf1a5b42e7eef5726b5b1068 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 317f6a237089a421d8cb57f398eedf6afc600832
Author: Eli Zaretskii <address@hidden>
Date:   Thu Jul 3 19:20:00 2014 +0300

    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.

-----------------------------------------------------------------------

Summary of changes:
 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 9f87809..552a91b 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 521318b..b257116 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 27e15dc..2c08774 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))


hooks/post-receive
-- 
GNU Guile