[SCM] GNU gsasl branch, master, updated. gsasl-1-5-0-9-gb533ec8

[Simon Josefsson]

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 gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=b533ec88841dc916943a9676bdccf7b95869c0e9

The branch, master has been updated
       via  b533ec88841dc916943a9676bdccf7b95869c0e9 (commit)
      from  d4709ca7b85ee3e17aff230decbe5ffbce6e1eef (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 b533ec88841dc916943a9676bdccf7b95869c0e9
Author: Simon Josefsson <address@hidden>
Date:   Wed Apr 21 10:15:17 2010 +0200

    Update gnulib files.

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

Summary of changes:
 gl/m4/gnulib-comp.m4                  |   31 +-------------------------
 gl/m4/ioctl.m4                        |   38 +++++++++++++++++++++++++++++++++
 gl/m4/visibility.m4                   |   32 +++++++++++++++++++++------
 gl/override/m4/visibility.m4.diff     |   15 -------------
 gltests/test-lseek.sh                 |    3 +-
 gltests/test-select-in.sh             |    3 +-
 lib/gl/m4/visibility.m4               |   32 +++++++++++++++++++++------
 lib/gl/override/m4/visibility.m4.diff |   15 -------------
 8 files changed, 94 insertions(+), 75 deletions(-)
 create mode 100644 gl/m4/ioctl.m4
 delete mode 100644 gl/override/m4/visibility.m4.diff
 delete mode 100644 lib/gl/override/m4/visibility.m4.diff

diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 3bd232f..ab97ce7 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -551,35 +551,7 @@ changequote([, ])dnl
   gl_FUNC_INET_PTON
   gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
   AC_C_BIGENDIAN
-  AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])
-  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    dnl Even if the 'socket' module is not used here, another part of the
-    dnl application may use it and pass file descriptors that refer to
-    dnl sockets to the ioctl() function. So enable the support for sockets.
-    AC_LIBOBJ([ioctl])
-    gl_REPLACE_SYS_IOCTL_H
-  else
-    AC_CHECK_FUNCS([ioctl])
-    dnl On glibc systems, the second parameter is 'unsigned long int request',
-    dnl not 'int request'. We cannot simply cast the function pointer, but
-    dnl instead need a wrapper.
-    AC_CACHE_CHECK([for ioctl with POSIX signature],
-      [gl_cv_func_ioctl_posix_signature],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#include <sys/ioctl.h>]],
-            [[extern int ioctl (int, int, ...);]])
-         ],
-         [gl_cv_func_ioctl_posix_signature=yes],
-         [gl_cv_func_ioctl_posix_signature=no])
-      ])
-    if test $gl_cv_func_ioctl_posix_signature != yes; then
-      REPLACE_IOCTL=1
-      AC_LIBOBJ([ioctl])
-      gl_REPLACE_SYS_IOCTL_H
-    fi
-  fi
+  gl_FUNC_IOCTL
   gl_SYS_IOCTL_MODULE_INDICATOR([ioctl])
   AC_REQUIRE([gl_HEADER_SYS_SOCKET])
   if test "$ac_cv_header_winsock2_h" = yes; then
@@ -889,6 +861,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/intmax_t.m4
   m4/inttypes-pri.m4
   m4/inttypes_h.m4
+  m4/ioctl.m4
   m4/lcmessage.m4
   m4/lib-ld.m4
   m4/lib-link.m4
diff --git a/gl/m4/ioctl.m4 b/gl/m4/ioctl.m4
new file mode 100644
index 0000000..4a0a99f
--- /dev/null
+++ b/gl/m4/ioctl.m4
@@ -0,0 +1,38 @@
+# ioctl.m4 serial 1
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_IOCTL],
+[
+  AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])
+  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    dnl Even if the 'socket' module is not used here, another part of the
+    dnl application may use it and pass file descriptors that refer to
+    dnl sockets to the ioctl() function. So enable the support for sockets.
+    AC_LIBOBJ([ioctl])
+    gl_REPLACE_SYS_IOCTL_H
+  else
+    AC_CHECK_FUNCS([ioctl])
+    dnl On glibc systems, the second parameter is 'unsigned long int request',
+    dnl not 'int request'. We cannot simply cast the function pointer, but
+    dnl instead need a wrapper.
+    AC_CACHE_CHECK([for ioctl with POSIX signature],
+      [gl_cv_func_ioctl_posix_signature],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <sys/ioctl.h>]],
+            [[extern int ioctl (int, int, ...);]])
+         ],
+         [gl_cv_func_ioctl_posix_signature=yes],
+         [gl_cv_func_ioctl_posix_signature=no])
+      ])
+    if test $gl_cv_func_ioctl_posix_signature != yes; then
+      REPLACE_IOCTL=1
+      AC_LIBOBJ([ioctl])
+      gl_REPLACE_SYS_IOCTL_H
+    fi
+  fi
+])
diff --git a/gl/m4/visibility.m4 b/gl/m4/visibility.m4
index 1c3f34e..077c476 100644
--- a/gl/m4/visibility.m4
+++ b/gl/m4/visibility.m4
@@ -1,4 +1,4 @@
-# visibility.m4 serial 2 (gettext-0.18)
+# visibility.m4 serial 3 (gettext-0.18)
 dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,19 +26,37 @@ AC_DEFUN([gl_VISIBILITY],
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
+    dnl First, check whether -Werror can be added to the command line, or
+    dnl whether it leads to an error because of some other option that the
+    dnl user has put into $CC $CFLAGS $CPPFLAGS.
+    AC_MSG_CHECKING([whether the -Werror option is usable])
+    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -Werror"
+      AC_TRY_COMPILE([], [],
+        [gl_cv_cc_vis_werror=yes],
+        [gl_cv_cc_vis_werror=no])
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
+    dnl Now check whether visibility declarations are supported.
     AC_MSG_CHECKING([for simple visibility declarations])
     AC_CACHE_VAL([gl_cv_cc_visibility], [
       gl_save_CFLAGS="$CFLAGS"
-      # We use -Werror here because Cygwin/MinGW gives a warning
-      # 'visibility attribute not supported in this configuration'
-      # instead of doing what we want.  Using -Werror makes gcc fail
-      # instead, so we detect the problem.
-      CFLAGS="$CFLAGS -fvisibility=hidden -Werror"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      dnl We use the option -Werror and a function dummyfunc, because on some
+      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+      dnl "visibility attribute not supported in this configuration; ignored"
+      dnl at the first function definition in every compilation unit, and we
+      dnl don't want to use the option in this case.
+      if test $gl_cv_cc_vis_werror = yes; then
+        CFLAGS="$CFLAGS -Werror"
+      fi
       AC_TRY_COMPILE(
         [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
          extern __attribute__((__visibility__("hidden"))) int hiddenfunc 
(void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc 
(void);],
+         extern __attribute__((__visibility__("default"))) int exportedfunc 
(void);
+         void dummyfunc (void) {}],
         [],
         [gl_cv_cc_visibility=yes],
         [gl_cv_cc_visibility=no])
diff --git a/gl/override/m4/visibility.m4.diff 
b/gl/override/m4/visibility.m4.diff
deleted file mode 100644
index 3e8767b..0000000
--- a/gl/override/m4/visibility.m4.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- gl/m4/visibility.m4.orig   2010-01-12 17:09:05.000000000 +0100
-+++ gl/m4/visibility.m4        2010-01-12 17:09:24.000000000 +0100
-@@ -29,7 +29,11 @@
-     AC_MSG_CHECKING([for simple visibility declarations])
-     AC_CACHE_VAL([gl_cv_cc_visibility], [
-       gl_save_CFLAGS="$CFLAGS"
--      CFLAGS="$CFLAGS -fvisibility=hidden"
-+      # We use -Werror here because Cygwin/MinGW gives a warning
-+      # 'visibility attribute not supported in this configuration'
-+      # instead of doing what we want.  Using -Werror makes gcc fail
-+      # instead, so we detect the problem.
-+      CFLAGS="$CFLAGS -fvisibility=hidden -Werror"
-       AC_TRY_COMPILE(
-         [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-          extern __attribute__((__visibility__("default"))) int exportedvar;
diff --git a/gltests/test-lseek.sh b/gltests/test-lseek.sh
index e84c2bb..576008c 100755
--- a/gltests/test-lseek.sh
+++ b/gltests/test-lseek.sh
@@ -8,7 +8,8 @@ tmpfiles=t-lseek.tmp
 ./test-lseek${EXEEXT} 0 < "$srcdir/test-lseek.sh" > t-lseek.tmp || exit 1
 
 # pipes
-echo hi | ./test-lseek${EXEEXT} 1 | cat || exit 1
+: | { ./test-lseek${EXEEXT} 1; echo $? > t-lseek.tmp; } | :
+test "x`cat t-lseek.tmp`" = x0 || exit 1
 
 # closed descriptors
 ./test-lseek${EXEEXT} 2 <&- >&- || exit 1
diff --git a/gltests/test-select-in.sh b/gltests/test-select-in.sh
index fdeb01c..2a8b742 100755
--- a/gltests/test-select-in.sh
+++ b/gltests/test-select-in.sh
@@ -18,7 +18,8 @@ test `cat t-select-in.tmp` = "1" || exit 1
 # Pipes.
 
 rm -f t-select-in.tmp
-{ sleep 1; echo abc; } | ./test-select-fd${EXEEXT} r 0 t-select-in.tmp
+{ sleep 1; echo abc; } | \
+  { ./test-select-fd${EXEEXT} r 0 t-select-in.tmp; cat > /dev/null; }
 test `cat t-select-in.tmp` = "0" || exit 1
 
 rm -f t-select-in.tmp
diff --git a/lib/gl/m4/visibility.m4 b/lib/gl/m4/visibility.m4
index 1c3f34e..077c476 100644
--- a/lib/gl/m4/visibility.m4
+++ b/lib/gl/m4/visibility.m4
@@ -1,4 +1,4 @@
-# visibility.m4 serial 2 (gettext-0.18)
+# visibility.m4 serial 3 (gettext-0.18)
 dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,19 +26,37 @@ AC_DEFUN([gl_VISIBILITY],
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
   if test -n "$GCC"; then
+    dnl First, check whether -Werror can be added to the command line, or
+    dnl whether it leads to an error because of some other option that the
+    dnl user has put into $CC $CFLAGS $CPPFLAGS.
+    AC_MSG_CHECKING([whether the -Werror option is usable])
+    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -Werror"
+      AC_TRY_COMPILE([], [],
+        [gl_cv_cc_vis_werror=yes],
+        [gl_cv_cc_vis_werror=no])
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
+    dnl Now check whether visibility declarations are supported.
     AC_MSG_CHECKING([for simple visibility declarations])
     AC_CACHE_VAL([gl_cv_cc_visibility], [
       gl_save_CFLAGS="$CFLAGS"
-      # We use -Werror here because Cygwin/MinGW gives a warning
-      # 'visibility attribute not supported in this configuration'
-      # instead of doing what we want.  Using -Werror makes gcc fail
-      # instead, so we detect the problem.
-      CFLAGS="$CFLAGS -fvisibility=hidden -Werror"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      dnl We use the option -Werror and a function dummyfunc, because on some
+      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+      dnl "visibility attribute not supported in this configuration; ignored"
+      dnl at the first function definition in every compilation unit, and we
+      dnl don't want to use the option in this case.
+      if test $gl_cv_cc_vis_werror = yes; then
+        CFLAGS="$CFLAGS -Werror"
+      fi
       AC_TRY_COMPILE(
         [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
          extern __attribute__((__visibility__("hidden"))) int hiddenfunc 
(void);
-         extern __attribute__((__visibility__("default"))) int exportedfunc 
(void);],
+         extern __attribute__((__visibility__("default"))) int exportedfunc 
(void);
+         void dummyfunc (void) {}],
         [],
         [gl_cv_cc_visibility=yes],
         [gl_cv_cc_visibility=no])
diff --git a/lib/gl/override/m4/visibility.m4.diff 
b/lib/gl/override/m4/visibility.m4.diff
deleted file mode 100644
index f62c003..0000000
--- a/lib/gl/override/m4/visibility.m4.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- gl/m4/visibility.m4.orig   2010-01-12 17:10:03.000000000 +0100
-+++ gl/m4/visibility.m4        2010-01-12 17:10:00.000000000 +0100
-@@ -29,7 +29,11 @@
-     AC_MSG_CHECKING([for simple visibility declarations])
-     AC_CACHE_VAL([gl_cv_cc_visibility], [
-       gl_save_CFLAGS="$CFLAGS"
--      CFLAGS="$CFLAGS -fvisibility=hidden"
-+      # We use -Werror here because Cygwin/MinGW gives a warning
-+      # 'visibility attribute not supported in this configuration'
-+      # instead of doing what we want.  Using -Werror makes gcc fail
-+      # instead, so we detect the problem.
-+      CFLAGS="$CFLAGS -fvisibility=hidden -Werror"
-       AC_TRY_COMPILE(
-         [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-          extern __attribute__((__visibility__("default"))) int exportedvar;


hooks/post-receive
-- 
GNU gsasl