From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 5 May 2008 11:27:09 +0000 (+0200)
Subject: Update gnulib files.
X-Git-Tag: gnutls_2_3_9~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d0bb4dbeafc433744625296abae15408c7ec25e;p=thirdparty%2Fgnutls.git

Update gnulib files.
---

diff --git a/gl/m4/inet_ntop.m4 b/gl/m4/inet_ntop.m4
index 342cd28a47..25a3ee9b68 100644
--- a/gl/m4/inet_ntop.m4
+++ b/gl/m4/inet_ntop.m4
@@ -1,4 +1,4 @@
-# inet_ntop.m4 serial 5
+# inet_ntop.m4 serial 6
 dnl Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,6 +19,9 @@ AC_DEFUN([gl_INET_NTOP],
 # Prerequisites of lib/inet_ntop.c.
 AC_DEFUN([gl_PREREQ_INET_NTOP], [
   AC_CHECK_DECLS([inet_ntop],,,[#include <arpa/inet.h>])
+  if test $ac_cv_have_decl_inet_ntop = no; then
+    HAVE_DECL_INET_NTOP=0
+  fi
   AC_REQUIRE([gl_SOCKET_FAMILIES])
   AC_REQUIRE([AC_C_RESTRICT])
 ])
diff --git a/gl/m4/inet_pton.m4 b/gl/m4/inet_pton.m4
index 7d7f993a00..a57e4c6cba 100644
--- a/gl/m4/inet_pton.m4
+++ b/gl/m4/inet_pton.m4
@@ -1,4 +1,4 @@
-# inet_pton.m4 serial 4
+# inet_pton.m4 serial 5
 dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,6 +19,9 @@ AC_DEFUN([gl_INET_PTON],
 # Prerequisites of lib/inet_pton.c.
 AC_DEFUN([gl_PREREQ_INET_PTON], [
   AC_CHECK_DECLS([inet_pton],,,[#include <arpa/inet.h>])
+  if test $ac_cv_have_decl_inet_pton = no; then
+    HAVE_DECL_INET_PTON=0
+  fi
   AC_REQUIRE([gl_SOCKET_FAMILIES])
   AC_REQUIRE([AC_C_RESTRICT])
 ])
diff --git a/lgl/override/lib/gc-libgcrypt.c.diff b/lgl/override/lib/gc-libgcrypt.c.diff
index d1bedb882f..a92198c8cc 100644
--- a/lgl/override/lib/gc-libgcrypt.c.diff
+++ b/lgl/override/lib/gc-libgcrypt.c.diff
@@ -1,5 +1,14 @@
---- lgl/gc-libgcrypt.c.orig	2008-04-13 14:51:05.000000000 +0200
-+++ lgl/gc-libgcrypt.c	2008-04-13 14:52:04.000000000 +0200
+--- lgl/gc-libgcrypt.c.orig	2008-05-05 13:26:28.000000000 +0200
++++ lgl/gc-libgcrypt.c	2008-05-05 13:26:43.000000000 +0200
+@@ -145,7 +145,7 @@
+       gcryalg = GCRY_CIPHER_RFC2268_40;
+       break;
+ 
+-#ifdef HAVE_CAMELLIA
++#ifdef ENABLE_CAMELLIA
+     case GC_CAMELLIA128:
+       gcryalg = GCRY_CIPHER_CAMELLIA128;
+       break;
 @@ -294,9 +294,11 @@
        gcryalg = GCRY_MD_SHA512;
        break;