From e86f9181adc947c235d270d2d3fcc3265c1f29cc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 9 Mar 2005 16:03:05 +0000 Subject: * acinclude.m4 (GNUPG_CHECK_VA_COPY): Assume no when cross-compiling. * Makefile.am (EXTRA_DIST): Include autogen.sh * autogen.sh: Added the usual code to build for W32 (--build-w32). * configure.ac: Fixed the mingw32 host string, removed OS/2 stuff. (HAVE_DRIVE_LETTERS): Removed. (HAVE_W32_SYSTEM): Added. (AC_GNU_SOURCE): New to replace the identical AH_VERBATIM. (AH_BOTTOM): Added. * w32-util.c (_gpgme_get_gpg_path, _gpgme_get_gpgsm_path): Do not cast away type checks. * io.h [W32]: Do not include stdio.h. If it is needed do it at the right place. * data.h [W32]: Removed kludge for EOPNOTSUP. * data.c, data-compat.c [W32]: Explicitly test for it here. --- acinclude.m4 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index c62e596d..96766561 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -50,8 +50,11 @@ 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,[ - gnupg_cv_must_copy_va_byval=no - AC_TRY_RUN([ + 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 void f (int i, ...) { @@ -69,10 +72,15 @@ AC_DEFUN([GNUPG_CHECK_VA_COPY], f (0, 42); return 0; } - ],gnupg_cv_must_copy_va_byval=yes) + ],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 - AC_MSG_RESULT($gnupg_cv_must_copy_va_byval) + 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 ]) -- cgit v1.2.3