[svn] gcry - r1182 - in trunk: . m4

[svn author marcus]

Author: marcus
Date: 2006-10-11 14:25:50 +0200 (Wed, 11 Oct 2006)
New Revision: 1182

Removed:
   trunk/m4/fallback.m4
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/m4/ChangeLog
Log:
2006-10-11  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac (FALLBACK_SOCKLEN_T): Rewrite in terms of
	socklen.m4.

m4/
2006-10-11  Marcus Brinkmann  <marcus at g10code.de>

	* fallback.m4: Removed again.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-11 12:01:17 UTC (rev 1181)
+++ trunk/ChangeLog	2006-10-11 12:25:50 UTC (rev 1182)
@@ -1,5 +1,10 @@
 2006-10-11  Marcus Brinkmann  <marcus at g10code.de>
 
+	* configure.ac (FALLBACK_SOCKLEN_T): Rewrite in terms of
+	socklen.m4.
+
+2006-10-11  Marcus Brinkmann  <marcus at g10code.de>
+
 	* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Removed.
 	* configure.ac: Do not call GNUPG_FIX_HDR_VERSION.
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-11 12:01:17 UTC (rev 1181)
+++ trunk/configure.ac	2006-10-11 12:25:50 UTC (rev 1182)
@@ -521,7 +521,14 @@
 GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
 
 gl_TYPE_SOCKLEN_T
+if test ".$gl_cv_socklen_t_equiv" = "."; then
+  FALLBACK_SOCKLEN_T="/* typedef socklen_t socklen_t; */"
+else
+  FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} socklen_t;"
+fi
+AC_SUBST(FALLBACK_SOCKLEN_T)
 
+
 #######################################
 #### Checks for library functions. ####
 #######################################
@@ -845,18 +852,7 @@
 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

Modified: trunk/m4/ChangeLog
===================================================================
--- trunk/m4/ChangeLog	2006-10-11 12:01:17 UTC (rev 1181)
+++ trunk/m4/ChangeLog	2006-10-11 12:25:50 UTC (rev 1182)
@@ -1,3 +1,7 @@
+2006-10-11  Marcus Brinkmann  <marcus at g10code.de>
+
+	* fallback.m4: Removed again.
+
 2006-10-10  Marcus Brinkmann  <marcus at g10code.de>
 
 	* fallback.m4: New file from Pth.

Deleted: trunk/m4/fallback.m4