summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2006-10-10 18:27:28 +0000
committerMarcus Brinkmann <mb@g10code.com>2006-10-10 18:27:28 +0000
commit361c90ef18390d630c57a9acd8136c8d301d9db0 (patch)
tree947fb7f79c22e03ab73145b4c67954830c2aef5d /src
parent74f7c8dd7320783f0d294e32b526186f366e0c01 (diff)
downloadlibgcrypt-361c90ef18390d630c57a9acd8136c8d301d9db0.tar.gz
2006-10-10 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Invoke AC_CHECK_SOCKLEN_TYPE. (AC_CONFIG_FILES): Add src/gcrypt.h. (AC_CONFIG_SRCDIR): Change to src/libgcrypt.vers. m4/ 2006-10-10 Marcus Brinkmann <marcus@g10code.de> * fallback.m4: New file from Pth. src/ 2006-10-10 Marcus Brinkmann <marcus@g10code.de> * gcrypt.h: Add fallback type for socklen_t. Move to ... * gcrypt.h.in: ... this file. * Makefile.am (EXTRA_DIST): Add gcrypt.h.in.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.am3
-rw-r--r--src/gcrypt.h.in (renamed from src/gcrypt.h)2
3 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f36744d0..c6f4df44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-10 Marcus Brinkmann <marcus@g10code.de>
+
+ * gcrypt.h: Add fallback type for socklen_t. Move to ...
+ * gcrypt.h.in: ... this file.
+ * Makefile.am (EXTRA_DIST): Add gcrypt.h.in.
+
2006-08-29 Werner Koch <wk@g10code.com>
* gcrypt.h (GCRY_CIPHER_SEED): New.
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ca2f3ed..a5f3e4f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,8 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = Manifest libgcrypt-config.in libgcrypt.m4 libgcrypt.vers
+EXTRA_DIST = Manifest libgcrypt-config.in libgcrypt.m4 libgcrypt.vers \
+ gcrypt.h.in
bin_SCRIPTS = libgcrypt-config
m4datadir = $(datadir)/aclocal
m4data_DATA = libgcrypt.m4
diff --git a/src/gcrypt.h b/src/gcrypt.h.in
index fe4af3f7..e9debf8b 100644
--- a/src/gcrypt.h
+++ b/src/gcrypt.h.in
@@ -29,6 +29,8 @@
#include <sys/types.h>
+@FALLBACK_SOCKLEN_T@
+
#if defined _WIN32 || defined __WIN32__
# include <winsock2.h>
# include <ws2tcpip.h>