diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2006-10-10 18:27:28 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2006-10-10 18:27:28 +0000 |
| commit | 361c90ef18390d630c57a9acd8136c8d301d9db0 (patch) | |
| tree | 947fb7f79c22e03ab73145b4c67954830c2aef5d /configure.ac | |
| parent | 74f7c8dd7320783f0d294e32b526186f366e0c01 (diff) | |
| download | libgcrypt-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 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bcbea2e5..bc6c876b 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ NEED_GPG_ERROR_VERSION=1.0 PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION -AC_CONFIG_SRCDIR([src/gcrypt.h]) +AC_CONFIG_SRCDIR([src/libgcrypt.vers]) AC_CANONICAL_TARGET() AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_CONFIG_HEADER(config.h) @@ -851,12 +851,25 @@ AC_SUBST(LIBGCRYPT_CIPHERS, $enabled_ciphers) AC_SUBST(LIBGCRYPT_PUBKEY_CIPHERS, $enabled_pubkey_ciphers) AC_SUBST(LIBGCRYPT_DIGESTS, $enabled_digests) +dnl # Fallback definitions for gcrypt.h: +dnl # +dnl # check for network/socket size type +AC_CHECK_SOCKLENTYPE([ +FALLBACK_SOCKLEN_T="typedef ${ac_type} socklen_t;" +if test ".$ac_type" = ".socklen_t"; then + FALLBACK_SOCKLEN_T="/* $FALLBACK_SOCKLEN_T */" +fi +AC_SUBST(FALLBACK_SOCKLEN_T) +]) + + AC_CONFIG_FILES([ Makefile mpi/Makefile cipher/Makefile doc/Makefile src/Makefile +src/gcrypt.h src/libgcrypt-config tests/Makefile w32-dll/Makefile |