shishi-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS shishi/gl/m4


From: shishi-commit
Subject: CVS shishi/gl/m4
Date: Mon, 13 Mar 2006 14:42:24 +0100

Update of /home/jas/self/public-cvs/shishi/gl/m4
In directory latte:/home/jas/self/src/shishi/gl/m4

Modified Files:
        clock_time.m4 extensions.m4 gc.m4 getaddrinfo.m4 
        gnulib-comp.m4 timespec.m4 
Added Files:
        unistd_h.m4 
Log Message:
Update.

--- /home/jas/self/public-cvs/shishi/gl/m4/clock_time.m4        2005/05/26 
15:07:56     1.3
+++ /home/jas/self/public-cvs/shishi/gl/m4/clock_time.m4        2006/03/13 
13:42:16     1.4
@@ -1,5 +1,5 @@
-# clock_time.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# clock_time.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 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.
@@ -7,8 +7,8 @@
 # Check for clock_gettime and clock_settime, and sets LIB_CLOCK_GETTIME.
 AC_DEFUN([gl_CLOCK_TIME],
 [
-  # dnl Persuade glibc <time.h> to declare these functions.
-  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl Persuade glibc and Solaris <time.h> to declare these functions.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
   # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
--- /home/jas/self/public-cvs/shishi/gl/m4/extensions.m4        2006/02/07 
11:20:21     1.6
+++ /home/jas/self/public-cvs/shishi/gl/m4/extensions.m4        2006/03/13 
13:42:16     1.7
@@ -33,7 +33,7 @@
          AC_INCLUDES_DEFAULT])],
        [ac_cv_safe_to_define___extensions__=yes],
        [ac_cv_safe_to_define___extensions__=no])])
-  test $ac_cv_safe_to_define___extensions__ == yes &&
+  test $ac_cv_safe_to_define___extensions__ = yes &&
     AC_DEFINE([__EXTENSIONS__])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
 ])
--- /home/jas/self/public-cvs/shishi/gl/m4/gc.m4        2005/10/22 15:54:49     
1.2
+++ /home/jas/self/public-cvs/shishi/gl/m4/gc.m4        2006/03/13 13:42:16     
1.3
@@ -1,5 +1,5 @@
-# gc.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# gc.m4 serial 2
+dnl Copyright (C) 2005, 2006 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.
@@ -17,77 +17,6 @@
     AC_LIBOBJ([gc-libgcrypt])
   else
     AC_LIBOBJ([gc-gnulib])
-
-    # Devices with randomness.
-    # FIXME: Are these the best defaults?
-
-    case "${target}" in
-      *-openbsd*)
-       NAME_OF_RANDOM_DEVICE="/dev/srandom"
-       NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/prandom"
-       NAME_OF_NONCE_DEVICE="/dev/urandom"
-          ;;
-  
-      *-netbsd*)
-       NAME_OF_RANDOM_DEVICE="/dev/srandom"
-       NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/urandom"
-       NAME_OF_NONCE_DEVICE="/dev/urandom"
-          ;;
-  
-      *-solaris* | *-irix* | *-dec-osf* )
-       NAME_OF_RANDOM_DEVICE="/dev/random"
-       NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/random"
-       NAME_OF_NONCE_DEVICE="/dev/random"
-          ;;
-  
-      *)
-       NAME_OF_RANDOM_DEVICE="/dev/random"
-       NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/urandom"
-       NAME_OF_NONCE_DEVICE="/dev/urandom"
-          ;;
-    esac
-  
-    AC_MSG_CHECKING([device with (strong) random data...])
-    AC_ARG_ENABLE(random-device,
-       AC_HELP_STRING([--enable-random-device],
-               [device with (strong) randomness (for Nettle)]),
-       test "$enableval" != "no" && NAME_OF_RANDOM_DEVICE=$enableval)
-    AC_MSG_RESULT($NAME_OF_RANDOM_DEVICE)
-  
-    AC_MSG_CHECKING([device with pseudo random data...])
-    AC_ARG_ENABLE(pseudo-random-device,
-       AC_HELP_STRING([--enable-pseudo-random-device],
-               [device with pseudo randomness (for Nettle)]),
-       test "$enableval" != "no" && NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
-    AC_MSG_RESULT($NAME_OF_PSEUDO_RANDOM_DEVICE)
-  
-    AC_MSG_CHECKING([device with unpredictable data for nonces...])
-    AC_ARG_ENABLE(nonce-device,
-       AC_HELP_STRING([--enable-nonce-device],
-               [device with unpredictable nonces (for Nettle)]),
-       test "$enableval" != "no" && NAME_OF_NONCE_DEVICE=$enableval)
-    AC_MSG_RESULT($NAME_OF_NONCE_DEVICE)
-  
-    if test "$cross_compiling" != yes; then
-      AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,,
-        AC_MSG_ERROR([[device for (strong) random data 
`$NAME_OF_RANDOM_DEVICE' does not exist]]))
-      AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,,
-        AC_MSG_ERROR([[device for pseudo-random data 
`$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist]]))
-      AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,,
-        AC_MSG_ERROR([[device for unpredictable nonces `$NAME_OF_NONCE_DEVICE' 
does not exist]]))
-    else
-      AC_MSG_NOTICE([[Cross compiling, assuming random devices exists...]])  
-    fi
-  
-    # FIXME: Open+read 42 bytes+close twice and compare data.  Should differ.
-  
-    AC_DEFINE_UNQUOTED(NAME_OF_RANDOM_DEVICE, "$NAME_OF_RANDOM_DEVICE",
-                     [defined to the name of the (strong) random device])
-    AC_DEFINE_UNQUOTED(NAME_OF_PSEUDO_RANDOM_DEVICE,
-                        "$NAME_OF_PSEUDO_RANDOM_DEVICE",
-                     [defined to the name of the pseudo random device])
-    AC_DEFINE_UNQUOTED(NAME_OF_NONCE_DEVICE, "$NAME_OF_NONCE_DEVICE",
-                     [defined to the name of the unpredictable nonce device])
   fi
 ])
 
--- /home/jas/self/public-cvs/shishi/gl/m4/getaddrinfo.m4       2006/02/16 
09:57:13     1.11
+++ /home/jas/self/public-cvs/shishi/gl/m4/getaddrinfo.m4       2006/03/13 
13:42:16     1.12
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 8
+# getaddrinfo.m4 serial 9
 dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -21,13 +21,13 @@
 #include <ws2tcpip.h>
 #endif
 ], [getaddrinfo(0, 0, 0, 0);], gl_cv_w32_getaddrinfo=yes)
-      LIBS="$am_save_LIBS"
-      if test "$gl_cv_w32_getaddrinfo" = "yes"; then
-       LIBS="$LIBS -lws2_32"
-      else
-       AC_LIBOBJ(getaddrinfo)
-      fi
-    ])])
+    LIBS="$am_save_LIBS"])
+    if test "$gl_cv_w32_getaddrinfo" = "yes"; then
+      LIBS="$LIBS -lws2_32"
+    else
+      AC_LIBOBJ(getaddrinfo)
+    fi
+    ])
 
   AC_REPLACE_FUNCS(gai_strerror)
   gl_PREREQ_GETADDRINFO
--- /home/jas/self/public-cvs/shishi/gl/m4/gnulib-comp.m4       2006/02/14 
13:09:20     1.11
+++ /home/jas/self/public-cvs/shishi/gl/m4/gnulib-comp.m4       2006/03/13 
13:42:16     1.12
@@ -76,6 +76,7 @@
   gl_TIME_R
   gl_FUNC_TIMEGM
   gl_TIMESPEC
+  gl_HEADER_UNISTD
   gl_FUNC_VASNPRINTF
   gl_FUNC_VASPRINTF
   gl_XALLOC
@@ -277,6 +278,7 @@
   m4/timegm.m4
   m4/timespec.m4
   m4/tm_gmtoff.m4
+  m4/unistd_h.m4
   m4/vasnprintf.m4
   m4/vasprintf.m4
   m4/wchar_t.m4
--- /home/jas/self/public-cvs/shishi/gl/m4/timespec.m4  2005/09/19 16:04:42     
1.5
+++ /home/jas/self/public-cvs/shishi/gl/m4/timespec.m4  2006/03/13 13:42:16     
1.6
@@ -1,6 +1,8 @@
-#serial 11
+#serial 12
+
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 
-# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +19,8 @@
   AC_CHECK_HEADERS_ONCE(sys/time.h)
   gl_CHECK_TYPE_STRUCT_TIMESPEC
 
-  dnl Persuade glibc <time.h> to declare nanosleep().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_DECLS(nanosleep, , , [#include <time.h>])
 ])

--- /home/jas/self/public-cvs/shishi/gl/m4/unistd_h.m4  2006/03/13 13:42:16     
NONE
+++ /home/jas/self/public-cvs/shishi/gl/m4/unistd_h.m4  2006/03/13 13:42:16     
1.1
# unistd_h.m4 serial 2
dnl Copyright (C) 2006 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.

dnl Written by Simon Josefsson

AC_DEFUN([gl_HEADER_UNISTD],
[
  dnl Prerequisites of lib/unistd.h.
  AC_CHECK_HEADERS([unistd.h], [
    UNISTD_H=''
  ], [
    UNISTD_H='unistd.h'
  ])
  AC_SUBST(UNISTD_H)
])




reply via email to

[Prev in Thread] Current Thread [Next in Thread]