[svn] gpgme - r1365 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2009-05-05 19:03:33 +0200 (Tue, 05 May 2009)
New Revision: 1365

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/gpgme.h.in
Log:
2009-05-05  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Add infrastructure for compile time check of
	_FILE_OFFSET_BITS.

src/
2009-05-05  Marcus Brinkmann  <marcus at g10code.de>

	* gpgme.h.in: Add compile time check for _FILE_OFFSET_BITS.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-19 18:03:49 UTC (rev 1364)
+++ trunk/ChangeLog	2009-05-05 17:03:33 UTC (rev 1365)
@@ -1,3 +1,8 @@
+2009-05-05  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Add infrastructure for compile time check of
+	_FILE_OFFSET_BITS.
+
 2009-04-19  Moritz  <moritz at gnu.org>
 
 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-04-19 18:03:49 UTC (rev 1364)
+++ trunk/src/ChangeLog	2009-05-05 17:03:33 UTC (rev 1365)
@@ -1,3 +1,7 @@
+2009-05-05  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpgme.h.in: Add compile time check for _FILE_OFFSET_BITS.
+
 2009-04-15  Marcus Brinkmann  <marcus at g10code.de>
 
 	* posix-io.c (_gpgme_io_socket, _gpgme_io_connect): New functions.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-04-19 18:03:49 UTC (rev 1364)
+++ trunk/configure.ac	2009-05-05 17:03:33 UTC (rev 1365)
@@ -198,6 +198,18 @@
 AC_SYS_LARGEFILE
 AC_TYPE_OFF_T
 
+# A simple compile time check in gpgme.h for GNU/Linux systems that
+# prevents a file offset bits mismatch between gpgme and the application.
+NEED__FILE_OFFSET_BITS=0
+case $ac_cv_sys_file_offset_bits in
+  no | unknown) ;;
+  *)
+  NEED__FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits
+  ;;
+esac
+AC_SUBST(NEED__FILE_OFFSET_BITS)
+
+
 # Checks for compiler features.
 if test "$GCC" = yes; then
     CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"

Modified: trunk/src/gpgme.h.in
===================================================================
--- trunk/src/gpgme.h.in	2009-04-19 18:03:49 UTC (rev 1364)
+++ trunk/src/gpgme.h.in	2009-05-05 17:03:33 UTC (rev 1365)
@@ -74,7 +74,18 @@
    library.  */
 #define GPGME_VERSION "@PACKAGE_VERSION@"
 
+/* Check for a matching _FILE_OFFSET_BITS definition.  */
+#if @NEED__FILE_OFFSET_BITS@
+#ifndef _FILE_OFFSET_BITS
+#error GPGME was compiled with _FILE_OFFSET_BITS = @NEED__FILE_OFFSET_BITS@, please see the section "Largefile support (LFS)" in the GPGME manual.
+#else
+#if (_FILE_OFFSET_BITS) != (@NEED__FILE_OFFSET_BITS@)
+#error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely @NEED__FILE_OFFSET_BITS@, please see the section "Largefile support (LFS)" in the GPGME manual.
+#endif
+#endif
+#endif
 
+
 
 /* Some opaque data types used by GPGME.  */