[svn] gcry - r1212 - trunk

[svn author wk]

Author: wk
Date: 2007-02-20 12:28:12 +0100 (Tue, 20 Feb 2007)
New Revision: 1212

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/THANKS
   trunk/TODO
   trunk/configure.ac
Log:
New configure option --disable-endian-check.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-02-12 14:05:42 UTC (rev 1211)
+++ trunk/ChangeLog	2007-02-20 11:28:12 UTC (rev 1212)
@@ -1,3 +1,11 @@
+2007-02-20  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: New option --disable-endian-check. 
+	
+2007-02-02  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (FALLBACK_SOCKLEN_T): Special case for mingw32.
+
 2006-11-15  Werner Koch  <wk at g10code.com>
 
 	* autogen.sh: Add convenience option --build-amd64.

Modified: trunk/README
===================================================================
--- trunk/README	2007-02-12 14:05:42 UTC (rev 1211)
+++ trunk/README	2007-02-20 11:28:12 UTC (rev 1212)
@@ -114,6 +114,12 @@
                      to select exactly those algorithm modules, which
 		     should be built.
 
+     --disable-endian-check
+                     Don't let configure test for the endianness but
+                     try to use the OS provided macros at compile
+                     time.  This is helpful to create OS X fat binaries.
+
+
     Contact
     -------
 

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2007-02-12 14:05:42 UTC (rev 1211)
+++ trunk/THANKS	2007-02-20 11:28:12 UTC (rev 1212)
@@ -4,6 +4,7 @@
 
 Allan Clark		   allanc at sco.com
 Anand Kumria		   wildfire at progsoc.uts.edu.au
+Andreas Metzler            ametzler at downhill.at.eu.org
 Ariel T Glenn		   ariel at columbia.edu
 Bodo Moeller		   Bodo_Moeller at public.uni-hamburg.de
 Brenno de Winter	   brenno at dewinter.com

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2007-02-12 14:05:42 UTC (rev 1211)
+++ trunk/TODO	2007-02-20 11:28:12 UTC (rev 1212)
@@ -77,5 +77,7 @@
 * gcryptrnd.c
   Requires test for pth and other stuff.
 
+* secmem.c
+  Check whether the memory block is valid before releasing it and
+  print a diagnosic, like glibc does.
 
-

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-02-12 14:05:42 UTC (rev 1211)
+++ trunk/configure.ac	2007-02-20 11:28:12 UTC (rev 1212)
@@ -60,6 +60,19 @@
 
 AH_BOTTOM([
 #define _GCRYPT_IN_LIBGCRYPT 1
+
+/* If the configure check for endianness has been disabled, get it from
+   OS macros.  This is intended for making fat binary builds on OS X.  */
+#ifdef DISABLED_ENDIAN_CHECK
+# if defined(__BIG_ENDIAN__)
+#  define WORDS_BIGENDIAN 1
+# elif defined(__LITTLE_ENDIAN__)
+#  undef WORDS_BIGENDIAN
+# else
+#  error "No endianness found"
+# endif
+#endif /*DISABLED_ENDIAN_CHECK*/
+
 ])
 
 AH_VERBATIM([_REENTRANT],
@@ -247,8 +260,17 @@
 esac
 
 
-AC_C_BIGENDIAN
+AC_ARG_ENABLE(endian-check,
+              AC_HELP_STRING([--disable-endian-check],
+	      [disable the endian check and trust the OS provided macros]),
+	      endiancheck=$enableval,endiancheck=yes)
+if test x"$endiancheck" = xyes ; then
+  AC_C_BIGENDIAN
+else
+  AC_DEFINE(DISABLED_ENDIAN_CHECK,1,[configure did not test for endianess])
+fi
 
+
 AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)
@@ -521,14 +543,23 @@
 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 gcry_socklen_t;"
-else
-  FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} gcry_socklen_t;"
-fi
+case "${host}" in
+  *-*-mingw32*)
+    # socklen_t may or may not be defined depending on what headers
+    # are included.  To be safe we use int as this is the actual type.
+    FALLBACK_SOCKLEN_T="typedef int gcry_socklen_t;"
+    ;;
+  *)
+    if test ".$gl_cv_socklen_t_equiv" = "."; then
+      FALLBACK_SOCKLEN_T="typedef socklen_t gcry_socklen_t;"
+    else
+      FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} gcry_socklen_t;"
+    fi
+esac
 AC_SUBST(FALLBACK_SOCKLEN_T)
 
 
+
 #######################################
 #### Checks for library functions. ####
 #######################################