CVS gsasl/lib/gl/m4

[gsasl-commit]

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

Modified Files:
        gc.m4 gnulib-cache.m4 gnulib-comp.m4 
Added Files:
        gc-hmac-md5.m4 gc-md5.m4 stdint.m4 
Log Message:
Update.

--- /home/cvs/gsasl/lib/gl/m4/gc.m4     2005/10/05 14:52:30     1.2
+++ /home/cvs/gsasl/lib/gl/m4/gc.m4     2005/10/12 01:24:26     1.3
@@ -18,9 +18,6 @@
     AC_LIBOBJ([gc-libgcrypt])
   else
     AC_LIBOBJ([gc-gnulib])
-    gl_MD5
-    gl_MEMXOR
-    gl_HMAC_MD5
 
     # Devices with randomness.
     # FIXME: Are these the best defaults?
--- /home/cvs/gsasl/lib/gl/m4/gnulib-cache.m4   2005/10/05 14:30:09     1.3
+++ /home/cvs/gsasl/lib/gl/m4/gnulib-cache.m4   2005/10/12 01:24:26     1.4
@@ -14,10 +14,10 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgl --source-base=gl --m4-base=gl/m4 
--aux-dir=. --lgpl --libtool --macro-prefix=gl base64 gc getline gettext strdup 
strverscmp vasprintf
+#   gnulib-tool --import --dir=. --lib=libgl --source-base=gl --m4-base=gl/m4 
--aux-dir=. --lgpl --libtool --macro-prefix=gl base64 gc gc-hmac-md5 gc-md5 
getline gettext strdup strverscmp vasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_MODULES([base64 gc getline gettext strdup strverscmp vasprintf])
+gl_MODULES([base64 gc gc-hmac-md5 gc-md5 getline gettext strdup strverscmp 
vasprintf])
 gl_AVOID([])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
--- /home/cvs/gsasl/lib/gl/m4/gnulib-comp.m4    2005/10/05 14:52:30     1.5
+++ /home/cvs/gsasl/lib/gl/m4/gnulib-comp.m4    2005/10/12 01:24:26     1.6
@@ -28,12 +28,15 @@
   gl_FUNC_ALLOCA
   gl_FUNC_BASE64
   gl_GC
+  gl_GC_HMAC_MD5
+  gl_GC_MD5
   gl_FUNC_GETDELIM
   gl_FUNC_GETLINE
   dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
   gl_C_RESTRICT
   gl_SIZE_MAX
   AM_STDBOOL_H
+  gl_STDINT_H
   gl_FUNC_STRDUP
   gl_FUNC_STRVERSCMP
   gl_FUNC_VASNPRINTF
@@ -70,6 +73,7 @@
   lib/printf-parse.h
   lib/size_max.h
   lib/stdbool_.h
+  lib/stdint_.h
   lib/strdup.c
   lib/strdup.h
   lib/strverscmp.c
@@ -83,6 +87,8 @@
   m4/base64.m4
   m4/codeset.m4
   m4/eoverflow.m4
+  m4/gc-hmac-md5.m4
+  m4/gc-md5.m4
   m4/gc.m4
   m4/getdelim.m4
   m4/getline.m4
@@ -115,10 +121,10 @@
   m4/signed.m4
   m4/size_max.m4
   m4/stdbool.m4
+  m4/stdint.m4
   m4/stdint_h.m4
   m4/strdup.m4
   m4/strverscmp.m4
-  m4/uint32_t.m4
   m4/uintmax_t.m4
   m4/ulonglong.m4
   m4/vasnprintf.m4

--- /home/cvs/gsasl/lib/gl/m4/gc-hmac-md5.m4    2005/10/12 01:24:26     NONE
+++ /home/cvs/gsasl/lib/gl/m4/gc-hmac-md5.m4    2005/10/12 01:24:26     1.1
# gc-hmac-md5.m4 serial 1
dnl Copyright (C) 2005 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_GC_HMAC_MD5],
[
  AC_REQUIRE([gl_GC])
  AC_DEFINE(GC_USE_HMAC_MD5, 1,
    [Define to if you want to support HMAC-MD5 through GC.])
  if test "$ac_cv_libgcrypt" != yes; then
    gl_MD5
    gl_HMAC_MD5
    gl_MEMXOR
  fi
])
--- /home/cvs/gsasl/lib/gl/m4/gc-md5.m4 2005/10/12 01:24:26     NONE
+++ /home/cvs/gsasl/lib/gl/m4/gc-md5.m4 2005/10/12 01:24:26     1.1
# gc-md5.m4 serial 1
dnl Copyright (C) 2005 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_GC_MD5],
[
  AC_REQUIRE([gl_GC])
  AC_DEFINE(GC_USE_MD5, 1, [Define to if you want to support MD5 through GC.])
  if test "$ac_cv_libgcrypt" != yes; then
    gl_MD5
  fi
])
--- /home/cvs/gsasl/lib/gl/m4/stdint.m4 2005/10/12 01:24:26     NONE
+++ /home/cvs/gsasl/lib/gl/m4/stdint.m4 2005/10/12 01:24:26     1.1
# stdint.m4 serial 4
dnl Copyright (C) 2001-2002, 2004-2005 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 From Bruno Haible.
dnl Test whether <stdint.h> is supported or must be substituted.

AC_DEFUN([gl_STDINT_H],
[dnl Check for <inttypes.h>.
AC_REQUIRE([gt_HEADER_INTTYPES_H])
dnl Check for <sys/inttypes.h>.
AC_CHECK_HEADERS([sys/inttypes.h])

AC_MSG_CHECKING([for stdint.h])
AC_CACHE_VAL(gl_cv_header_stdint_h, [
  AC_TRY_COMPILE([#include <stdint.h>], [],
    gl_cv_header_stdint_h=yes, gl_cv_header_stdint_h=no)])
AC_MSG_RESULT([$gl_cv_header_stdint_h])
if test $gl_cv_header_stdint_h = yes; then
  AC_DEFINE(HAVE_STDINT_H, 1,
            [Define if you have a working <stdint.h> header file.])
  STDINT_H=''
else
  STDINT_H='stdint.h'

  dnl Is long == int64_t ?
  AC_CACHE_CHECK([whether 'long' is 64 bit wide], gl_cv_long_bitsize_64, [
    AC_TRY_COMPILE([
#define POW63  ((((((long) 1 << 15) << 15) << 15) << 15) << 3)
#define POW64  ((((((long) 1 << 15) << 15) << 15) << 15) << 4)
typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1];
], , gl_cv_long_bitsize_64=yes, gl_cv_long_bitsize_64=no)])
  if test $gl_cv_long_bitsize_64 = yes; then
    HAVE_LONG_64BIT=1
  else
    HAVE_LONG_64BIT=0
  fi
  AC_SUBST(HAVE_LONG_64BIT)

  dnl Is long long == int64_t ?
  AC_CACHE_CHECK([whether 'long long' is 64 bit wide], 
gl_cv_longlong_bitsize_64, [
    AC_TRY_COMPILE([
#define POW63  ((((((long long) 1 << 15) << 15) << 15) << 15) << 3)
#define POW64  ((((((long long) 1 << 15) << 15) << 15) << 15) << 4)
typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1];
], , gl_cv_longlong_bitsize_64=yes, gl_cv_longlong_bitsize_64=no)])
  if test $gl_cv_longlong_bitsize_64 = yes; then
    HAVE_LONG_LONG_64BIT=1
  else
    HAVE_LONG_LONG_64BIT=0
  fi
  AC_SUBST(HAVE_LONG_LONG_64BIT)

fi
AC_SUBST(STDINT_H)
])