Require autoconf 1.11

[gpgme.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 4b870edb2372e723249249a336c431fce94aa9b2..96766561cc76ff5677cb4aaf3f1c60860e105f86 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,27 +1,86 @@
-dnl Macros to configure gpgme
-
+dnl Macros to configure GPGME
+dnl Copyright (C) 2004 g10 Code GmbH
+dnl
+dnl This file is part of GPGME.
+dnl
+dnl GPGME is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU Lesser General Public License as
+dnl published by the Free Software Foundation; either version 2.1 of the
+dnl License, or (at your option) any later version.
+dnl 
+dnl GPGME is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+dnl or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+dnl Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 dnl GNUPG_FIX_HDR_VERSION(FILE, NAME)
-dnl (wk 2000-11-17)
-AC_DEFUN(GNUPG_FIX_HDR_VERSION,
-  [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > $srcdir/$1.tmp
-    if cmp -s $srcdir/$1 $srcdir/$1.tmp 2>/dev/null; then
-        rm -f $srcdir/$1.tmp
+dnl   Make the version number stored in NAME in the header file FILE the
+dnl   same as the one here.  This is easier than to have a .in file just
+dnl   for one substitution.
+dnl   We must use a temp file in the current directory because make
+dnl   distcheck installs all sourcefiles RO.
+dnl   (wk 2001-12-18)
+AC_DEFUN([GNUPG_FIX_HDR_VERSION],
+  [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > fixhdr.tmp
+    if cmp -s $srcdir/$1 fixhdr.tmp 2>/dev/null; then
+        rm -f fixhdr.tmp
     else
         rm -f $srcdir/$1
-        if mv $srcdir/$1.tmp $srcdir/$1 ; then
+        if mv fixhdr.tmp $srcdir/$1 ; then
             :
         else
             AC_MSG_ERROR([[
+***
 *** Failed to fix the version string macro $2 in $1.
-*** The old file has been saved as $1.tmp
-                         ]])
+*** The old file has been saved as fixhdr.tmp
+***]])
         fi
         AC_MSG_WARN([fixed the $2 macro in $1])
     fi
   ])
 
-
-
-
-
+dnl GNUPG_CHECK_VA_COPY()
+dnl   Do some check on how to implement va_copy.
+dnl   May define MUST_COPY_VA_BY_VAL.
+dnl   Actual test code taken from glib-1.1.
+AC_DEFUN([GNUPG_CHECK_VA_COPY],
+[ AC_MSG_CHECKING(whether va_lists must be copied by value)
+  AC_CACHE_VAL(gnupg_cv_must_copy_va_byval,[
+    if test "$cross_compiling" = yes; then
+      gnupg_cv_must_copy_va_byval=no
+    else
+      gnupg_cv_must_copy_va_byval=no
+      AC_TRY_RUN([
+       #include <stdarg.h>
+       void f (int i, ...)
+       {
+          va_list args1, args2;
+          va_start (args1, i);
+          args2 = args1;
+          if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+            exit (1);
+          va_end (args1);
+          va_end (args2);
+       }
+      
+       int main()
+       {
+          f (0, 42);
+            return 0;
+       }
+      ],gnupg_cv_must_copy_va_byval=yes)
+    fi
+  ])
+  if test "$gnupg_cv_must_copy_va_byval" = yes; then
+     AC_DEFINE(MUST_COPY_VA_BYVAL,1,[used to implement the va_copy macro])
+  fi
+  if test "$cross_compiling" = yes; then
+    AC_MSG_RESULT(assuming $gnupg_cv_must_copy_va_byval)
+  else
+    AC_MSG_RESULT($gnupg_cv_must_copy_va_byval)
+  fi
+])