Fix cross-compilation guesses on Solaris.

* m4/fopen.m4 (gl_FUNC_FOPEN): Correct shell pattern so that it does
not match "solaris2.10".
* m4/open.m4 (gl_FUNC_OPEN): Likewise.
* m4/printf.m4 (gl_SNPRINTF_TRUNCATION_C99, gl_SNPRINTF_DIRECTIVE_N,
gl_VSNPRINTF_ZEROSIZE_C99): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0e6d4fa57c1bd0d6f61db90ae83984150ee2646f..cd6dfc00054b7d992ea66e153bcd5353c16dc9cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-21  Bruno Haible  <bruno@clisp.org>
+
+       Fix cross-compilation guesses on Solaris.
+       * m4/fopen.m4 (gl_FUNC_FOPEN): Correct shell pattern so that it does
+       not match "solaris2.10".
+       * m4/open.m4 (gl_FUNC_OPEN): Likewise.
+       * m4/printf.m4 (gl_SNPRINTF_TRUNCATION_C99, gl_SNPRINTF_DIRECTIVE_N,
+       gl_VSNPRINTF_ZEROSIZE_C99): Likewise.
+
 2010-12-21  Paul Eggert  <eggert@cs.ucla.edu>
 
        snprintf: port snprintf (NULL, 0, ...) to Solaris 8 and 9

diff --git a/m4/fopen.m4 b/m4/fopen.m4
index 11e0f9a9463e8e550a2ec4e1d7400c74a339836d..fc45c97c5991300b69cad9b5d9167fd47329941f 100644 (file)
--- a/m4/fopen.m4
+++ b/m4/fopen.m4
@@ -1,4 +1,4 @@
-# fopen.m4 serial 6
+# fopen.m4 serial 7
 dnl Copyright (C) 2007-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,
@@ -34,7 +34,7 @@ int main ()
             [
 changequote(,)dnl
              case "$host_os" in
-               aix* | hpux* | solaris2.[0-9]*)
+               aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
                  gl_cv_func_fopen_slash="guessing no" ;;
                *)
                  gl_cv_func_fopen_slash="guessing yes" ;;

diff --git a/m4/open.m4 b/m4/open.m4
index 6e79614e540e748a294dd9c711aa033188d13a72..9b22e9d3a96398f617eeb28fa959ee6a2d793327 100644 (file)
--- a/m4/open.m4
+++ b/m4/open.m4
@@ -1,4 +1,4 @@
-# open.m4 serial 10
+# open.m4 serial 11
 dnl Copyright (C) 2007-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,
@@ -44,7 +44,7 @@ int main ()
             [
 changequote(,)dnl
              case "$host_os" in
-               freebsd* | aix* | hpux* | solaris2.[0-9]*)
+               freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*)
                  gl_cv_func_open_slash="guessing no" ;;
                *)
                  gl_cv_func_open_slash="guessing yes" ;;

diff --git a/m4/printf.m4 b/m4/printf.m4
index f54b8a9a64131f9249fa0efc5ee810c3efcdd79e..8cffa6ad255d7f4883be7b02ef960b7d312cc6e7 100644 (file)
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 40
+# printf.m4 serial 41
 dnl Copyright (C) 2003, 2007-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,
@@ -1102,7 +1102,8 @@ changequote(,)dnl
                                  gl_cv_func_snprintf_truncation_c99="guessing no";;
            openbsd*)             gl_cv_func_snprintf_truncation_c99="guessing yes";;
                                  # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5]*)      gl_cv_func_snprintf_truncation_c99="guessing no";;
+           solaris2.[0-5] | solaris2.[0-5].*)
+                                 gl_cv_func_snprintf_truncation_c99="guessing no";;
            solaris*)             gl_cv_func_snprintf_truncation_c99="guessing yes";;
                                  # Guess yes on AIX >= 4.
            aix[1-3]*)            gl_cv_func_snprintf_truncation_c99="guessing no";;
@@ -1247,7 +1248,8 @@ changequote(,)dnl
            darwin[1-6].*)        gl_cv_func_snprintf_directive_n="guessing no";;
            darwin*)              gl_cv_func_snprintf_directive_n="guessing yes";;
                                  # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5]*)      gl_cv_func_snprintf_directive_n="guessing no";;
+           solaris2.[0-5] | solaris2.[0-5].*)
+                                 gl_cv_func_snprintf_directive_n="guessing no";;
            solaris*)             gl_cv_func_snprintf_directive_n="guessing yes";;
                                  # Guess yes on AIX >= 4.
            aix[1-3]*)            gl_cv_func_snprintf_directive_n="guessing no";;
@@ -1375,7 +1377,8 @@ changequote(,)dnl
                                  # Guess yes on Cygwin.
            cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
                                  # Guess yes on Solaris >= 2.6.
-           solaris2.[0-5]*)      gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           solaris2.[0-5] | solaris2.[0-5].*)
+                                 gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
            solaris*)             gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
                                  # Guess yes on AIX >= 4.
            aix[1-3]*)            gl_cv_func_vsnprintf_zerosize_c99="guessing no";;