From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 26 Oct 2006 14:18:44 +0000 (+0000)
Subject: Update.
X-Git-Tag: gnutls_1_5_3~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b8ddcbcc4d43d3163cdfa3a86b1ac89eea8d015;p=thirdparty%2Fgnutls.git

Update.
---

diff --git a/lgl/Makefile.am b/lgl/Makefile.am
index 7661924109..af201a8796 100644
--- a/lgl/Makefile.am
+++ b/lgl/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lgl --m4-base=lgl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=lgl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem snprintf socklen stdint
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lgl --m4-base=lgl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=lgl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gettext memmem memmove minmax read-file snprintf socklen stdint
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -163,12 +163,26 @@ EXTRA_DIST += memmem.c memmem.h
 
 ## end   gnulib module memmem
 
+## begin gnulib module memmove
+
+
+EXTRA_DIST += memmove.c
+
+## end   gnulib module memmove
+
 ## begin gnulib module minmax
 
 libgnu_la_SOURCES += minmax.h
 
 ## end   gnulib module minmax
 
+## begin gnulib module read-file
+
+
+EXTRA_DIST += read-file.c read-file.h
+
+## end   gnulib module read-file
+
 ## begin gnulib module size_max
 
 libgnu_la_SOURCES += size_max.h
@@ -262,9 +276,8 @@ libgnu_la_SOURCES += dummy.c
 
 
 mostlyclean-local: mostlyclean-generic
-	@test -z "$(MOSTLYCLEANDIRS)" || \
-	  for dir in $(MOSTLYCLEANDIRS); do \
-	    if test -d $$dir; then \
-	      echo "rmdir $$dir"; rmdir $$dir; \
-	    fi; \
-	  done
+	@for dir in '' $(MOSTLYCLEANDIRS); do \
+	  if test -n "$$dir" && test -d $$dir; then \
+	    echo "rmdir $$dir"; rmdir $$dir; \
+	  fi; \
+	done
diff --git a/lgl/stdint_.h b/lgl/stdint_.h
index 7866bf7f6d..e1ad7839fe 100644
--- a/lgl/stdint_.h
+++ b/lgl/stdint_.h
@@ -48,10 +48,11 @@
 
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
    IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
+   AIX 5.2 <sys/types.h> isn't needed and causes troubles.
    MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
    relies on the system <stdint.h> definitions, so include
    <sys/types.h> after @ABSOLUTE_STDINT_H@.  */
-#if @HAVE_SYS_TYPES_H@
+#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
 # include <sys/types.h>
 #endif