CVS gsasl/lib/gl/m4

[gsasl-commit]

Update of /home/cvs/gsasl/lib/gl/m4
In directory dopio:/tmp/cvs-serv18728/gl/m4

Modified Files:
        gc-hmac-md5.m4 gc-md5.m4 gc.m4 gnulib-comp.m4 stdbool.m4 
Log Message:
Update.

--- /home/cvs/gsasl/lib/gl/m4/gc-hmac-md5.m4    2005/10/12 01:24:26     1.1
+++ /home/cvs/gsasl/lib/gl/m4/gc-hmac-md5.m4    2005/10/23 12:18:21     1.2
@@ -8,7 +8,7 @@
 [
   AC_REQUIRE([gl_GC])
   AC_DEFINE(GC_USE_HMAC_MD5, 1,
-    [Define to if you want to support HMAC-MD5 through GC.])
+    [Define if you want to support HMAC-MD5 through GC.])
   if test "$ac_cv_libgcrypt" != yes; then
     gl_MD5
     gl_HMAC_MD5
--- /home/cvs/gsasl/lib/gl/m4/gc-md5.m4 2005/10/12 01:24:26     1.1
+++ /home/cvs/gsasl/lib/gl/m4/gc-md5.m4 2005/10/23 12:18:21     1.2
@@ -7,7 +7,7 @@
 AC_DEFUN([gl_GC_MD5],
 [
   AC_REQUIRE([gl_GC])
-  AC_DEFINE(GC_USE_MD5, 1, [Define to if you want to support MD5 through GC.])
+  AC_DEFINE(GC_USE_MD5, 1, [Define if you want to support MD5 through GC.])
   if test "$ac_cv_libgcrypt" != yes; then
     gl_MD5
   fi
--- /home/cvs/gsasl/lib/gl/m4/gc.m4     2005/10/12 01:24:26     1.3
+++ /home/cvs/gsasl/lib/gl/m4/gc.m4     2005/10/23 12:18:21     1.4
@@ -11,10 +11,9 @@
     AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
     libgcrypt=$withval, libgcrypt=no)
   if test "$libgcrypt" != no; then
-    AC_LIB_HAVE_LINKFLAGS([gcrypt])
+    AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
   fi
   if test "$ac_cv_libgcrypt" = yes; then
-    AC_CHECK_HEADER(gcrypt.h)
     AC_LIBOBJ([gc-libgcrypt])
   else
     AC_LIBOBJ([gc-gnulib])
@@ -52,33 +51,30 @@
     AC_ARG_ENABLE(random-device,
        AC_HELP_STRING([--enable-random-device],
                [device with (strong) randomness (for Nettle)]),
-       NAME_OF_RANDOM_DEVICE=$enableval)
+       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)]),
-       NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
+       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)]),
-       NAME_OF_NONCE_DEVICE=$enableval)
+       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
-      ]]))
+      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
--- /home/cvs/gsasl/lib/gl/m4/gnulib-comp.m4    2005/10/12 01:24:26     1.6
+++ /home/cvs/gsasl/lib/gl/m4/gnulib-comp.m4    2005/10/23 12:18:21     1.7
@@ -25,6 +25,7 @@
 # "Check for header files, types and library functions".
 AC_DEFUN([gl_INIT],
 [
+AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
   gl_FUNC_ALLOCA
   gl_FUNC_BASE64
   gl_GC
--- /home/cvs/gsasl/lib/gl/m4/stdbool.m4        2005/10/17 10:54:05     1.4
+++ /home/cvs/gsasl/lib/gl/m4/stdbool.m4        2005/10/23 12:18:21     1.5
@@ -76,7 +76,8 @@
          char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
        ],
        [
-         return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + !l
+         /* Refer to every declared value, to avoid compiler optimizations.  */
+         return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
                  + !m + !n + !o + !p);
        ],
        [ac_cv_header_stdbool_h=yes],