[Pkg-gnupg-commit] [libassuan] 360/437: Prepare for building for a W64 host.

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit a0e05baf1b11fa30e1dd949350b2066a902deab8
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Apr 6 17:09:13 2011 +0200

    Prepare for building for a W64 host.
---
 ChangeLog    |  3 +++
 autogen.sh   | 11 ++++++++++-
 configure.ac | 10 ++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d460fce..821ab7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-06  Werner Koch  <wk at g10code.com>
 
+	* autogen.sh: Check the git setup.  Add option --build-w64.
+	* configure.ac (HAVE_W64_SYSTEM): Define.
+
 	* m4/gpg-error.m4: Update from current libgpg-error repo.
 
 2011-03-28  Werner Koch  <wk at g10code.com>
diff --git a/autogen.sh b/autogen.sh
index fa8005c..30a247a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -65,6 +65,10 @@ case "$1" in
         myhost="w32"
         myhostsub="ce"
         ;;
+    --build-w64)
+        myhost="w32"
+        myhostsub="64"
+        ;;
     --build-amd64)
         myhost="amd64"
         ;;
@@ -95,6 +99,11 @@ if [ "$myhost" = "w32" ]; then
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
           toolprefixes="arm-mingw32ce"
           ;;
+        64)
+          w32root="$w64root"
+          [ -z "$w32root" ] && w32root="$HOME/w64root"
+          toolprefixes="amd64-mingw32msvc"
+          ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
           toolprefixes="i586-mingw32msvc i386-mingw32msvc"
@@ -112,7 +121,7 @@ if [ "$myhost" = "w32" ]; then
     done
     if [ -z "$crossbindir" ]; then
         echo "Cross compiler kit not installed" >&2
-        if [ -z "$sub" ]; then
+        if [ -z "$myhostsub" ]; then
           echo "Under Debian GNU/Linux, you may install it using" >&2
           echo "  apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
         fi
diff --git a/configure.ac b/configure.ac
index d29c82e..582c01e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,7 @@ fi
 #
 have_dosish_system=no
 have_w32_system=no
+have_w64_system=no
 have_w32ce_system=no
 case "${host}" in
     *-linux*)
@@ -176,6 +177,10 @@ case "${host}" in
           CFLAGS="$CFLAGS -fPIC -DPIC"
         fi
         ;;
+    x86_64-*mingw32*)
+        have_w32_system=yes
+        have_w64_system=yes
+        ;;
     *-mingw32ce*)
         have_dosish_system=yes
         have_w32_system=yes
@@ -202,6 +207,10 @@ dnl AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
 
 if test "$have_w32_system" = yes; then
     AC_DEFINE(HAVE_W32_SYSTEM,1,[Defined if we run on a W32 API based system])
+    if test "$have_w64_system" = yes; then
+      AC_DEFINE(HAVE_W64_SYSTEM,1,
+                [Defined if we run on a 64 bit W32 API based system])
+    fi
     if test "$have_w32ce_system" = yes; then
        AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
     fi
@@ -222,6 +231,7 @@ AC_SUBST(BUILD_TIMESTAMP)
 AC_SUBST(BUILD_FILEVERSION)
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
+AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes)
 
 
 # Check for network libraries.  They are needed for tests.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git