[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.1-133-gd1f2417

[Ludovic Courtès]

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=d1f241710207e35bad2cc01ffe185e956208a04b

The branch, stable-2.0 has been updated
       via  d1f241710207e35bad2cc01ffe185e956208a04b (commit)
       via  10c29ebde574b5bc45df70f313835b0c2e1f3a35 (commit)
      from  c245d16a5b18afdb68356f8343e6af7b3c32935b (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 d1f241710207e35bad2cc01ffe185e956208a04b
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 19 16:39:22 2011 +0200

    Comment on the Gnulib `clock-gettime' workaround.
    
    * acinclude.m4: Remove `clock_time.m4' serial.
    
    * configure.ac: Add URL of the discussion about `clock-gettime'.

commit 10c29ebde574b5bc45df70f313835b0c2e1f3a35
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 19 16:30:56 2011 +0200

    configure: Factorize code checking for `iconveh_' constants; use the cache.
    
    * configure.ac: Remove code that determines the values of the `iconveh_'
      constants.  Use `GUILE_UNISTRING_ICONVEH_VALUES'. instead.
    
    * acinclude.m4 (GUILE_UNISTRING_CONSTANT,
      GUILE_UNISTRING_ICONVEH_VALUES): New macros.

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

Summary of changes:
 acinclude.m4 |   32 +++++++++++++++++++++++++++++-
 configure.ac |   60 +++------------------------------------------------------
 2 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 5bd1ced..c930444 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -499,11 +499,41 @@ AC_DEFUN([GUILE_LIBUNISTRING_WITH_ICONV_SUPPORT], [
    ])
 ])
 
+dnl GUILE_UNISTRING_CONSTANT NAME
+dnl
+dnl Determine the compile-time value of NAME and define/substitute
+dnl `SCM_I_GSC_NAME'.
+AC_DEFUN([GUILE_UNISTRING_CONSTANT], [
+  m4_pushdef([UPPER_CASE_NAME],
+    [m4_translit([$1],[abcdefghijklmnopqrstuvwxyz],
+                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ])])
+
+  AC_CACHE_CHECK([the value of `$1'], [ac_cv_]$1, [
+    AC_COMPUTE_INT([ac_cv_]$1, [$1],
+      [AC_INCLUDES_DEFAULT
+#include <uniconv.h>
+],
+      [AC_MSG_ERROR([failed to determine the value of `$1'])])
+  ])
+
+  [SCM_I_GSC_]UPPER_CASE_NAME="$ac_cv_[]$1"
+  AC_SUBST([SCM_I_GSC_]UPPER_CASE_NAME)
+  m4_popdef([UPPER_CASE_NAME])])
+
+dnl GUILE_UNISTRING_ICONVEH_VALUES
+dnl
+dnl Determine the values of the `iconveh_' libunistring constants.
+AC_DEFUN([GUILE_UNISTRING_ICONVEH_VALUES], [
+  GUILE_UNISTRING_CONSTANT([iconveh_error])
+  GUILE_UNISTRING_CONSTANT([iconveh_question_mark])
+  GUILE_UNISTRING_CONSTANT([iconveh_escape_sequence])
+])
+
 dnl Declare file $1 to be a script that needs configuring,
 dnl and arrange to make it executable in the process.
 AC_DEFUN([GUILE_CONFIG_SCRIPT],[AC_CONFIG_FILES([$1],[chmod +x $1])])
 
-# clock_time.m4 serial 10
+
 dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/configure.ac b/configure.ac
index e19a6d0..a531faa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,9 @@ dnl Gnulib.
 gl_INIT
 dnl FIXME: remove me and the acinclude.m4 code when clock-gettime is
 dnl fixed for clock_getcpuclockid and can be imported normally from
-dnl gnulib.
+dnl gnulib.  See
+dnl <http://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00227.html>
+dnl for details.
 gl_CLOCK_TIME
 
 AC_PROG_CC_C89
@@ -1203,61 +1205,7 @@ GUILE_STRUCT_UTIMBUF
 # the error handlers, which are just ints.  So we weaken our
 # dependency by looking up those values at configure-time.
 #--------------------------------------------------------------------
-SCM_I_GSC_ICONVEH_ERROR=0
-SCM_I_GSC_ICONVEH_QUESTION_MARK=1
-SCM_I_GSC_ICONVEH_ESCAPE_SEQUENCE=2
-AC_MSG_CHECKING([for iconveh_error])
-AC_RUN_IFELSE([AC_LANG_SOURCE(
-[AC_INCLUDES_DEFAULT
-#include <uniconv.h>
-int
-main (int argc, char *argv[])
-{
-  if (argc > 1)
-    printf ("%d\n", (int)iconveh_error);
-  return 0;
-}])],
-              [SCM_I_GSC_ICONVEH_ERROR=`./conftest$EXEEXT pretty-please`
-                AC_MSG_RESULT([$SCM_I_GSC_ICONVEH_ERROR])],
-              [AC_MSG_FAILURE([failed to get iconveh_error])],
-              [AC_MSG_WARN([assuming $SCM_I_GSC_ICONVEH_ERROR for 
cross-compilation])])
-
-AC_MSG_CHECKING([for iconveh_question_mark])
-AC_RUN_IFELSE([AC_LANG_SOURCE(
-[AC_INCLUDES_DEFAULT
-#include <uniconv.h>
-int
-main (int argc, char *argv[])
-{
-  if (argc > 1)
-    printf ("%d\n", (int)iconveh_question_mark);
-  return 0;
-}])],
-              [SCM_I_GSC_ICONVEH_QUESTION_MARK=`./conftest$EXEEXT 
pretty-please`
-                AC_MSG_RESULT([$SCM_I_GSC_ICONVEH_QUESTION_MARK])],
-              [AC_MSG_FAILURE([failed to get iconveh_question_mark])],
-              [AC_MSG_WARN([assuming $SCM_I_GSC_ICONVEH_QUESTION_MARK for 
cross-compilation])])
-
-AC_MSG_CHECKING([for iconveh_escape_sequence])
-AC_RUN_IFELSE([AC_LANG_SOURCE(
-[AC_INCLUDES_DEFAULT
-#include <uniconv.h>
-int
-main (int argc, char *argv[])
-{
-  if (argc > 1)
-    printf ("%d\n", (int)iconveh_escape_sequence);
-  return 0;
-}])],
-              [SCM_I_GSC_ICONVEH_ESCAPE_SEQUENCE=`./conftest$EXEEXT 
pretty-please`
-                AC_MSG_RESULT([$SCM_I_GSC_ICONVEH_ESCAPE_SEQUENCE])],
-              [AC_MSG_FAILURE([failed to get iconveh_escape_sequence])],
-              [AC_MSG_WARN([assuming $SCM_I_GSC_ICONVEH_ESCAPE_SEQUENCE for 
cross-compilation])])
-
-AC_SUBST([SCM_I_GSC_ICONVEH_ERROR])
-AC_SUBST([SCM_I_GSC_ICONVEH_QUESTION_MARK])
-AC_SUBST([SCM_I_GSC_ICONVEH_ESCAPE_SEQUENCE])
-
+GUILE_UNISTRING_ICONVEH_VALUES
 
 #--------------------------------------------------------------------
 #


hooks/post-receive
-- 
GNU Guile