diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | autogen.sh | 11 | ||||
| -rw-r--r-- | configure.ac | 9 |
3 files changed, 23 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2011-04-06 Werner Koch <wk@g10code.com> + * autogen.sh: Support option --build-w64. + * configure.ac (HAVE_W64_SYSTEM): New. + * src/gpg-error.m4: Test whether gpg-error-config exists. 2011-02-23 Werner Koch <wk@g10code.com> @@ -1179,7 +1182,7 @@ * Initial check-in. - Copyright 2003, 2004, 2005, 2006, 2007, 2010 g10 Code GmbH + Copyright 2003, 2004, 2005, 2006, 2007, 2010, 2011 g10 Code GmbH This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without @@ -64,6 +64,10 @@ case "$1" in myhost="w32" myhostsub="ce" ;; + --build-w64) + myhost="w32" + myhostsub="64" + ;; --build*) echo "**Error**: invalid build option $1" >&2 exit 1 @@ -92,6 +96,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" @@ -110,7 +119,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 5ae5b16..a2ad1dd 100644 --- a/configure.ac +++ b/configure.ac @@ -88,8 +88,13 @@ AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) # Set some internal variables depending on the platform for later use. have_w32_system=no +have_w64_system=no have_w32ce_system=no case "${host}" in + x86_64-*mingw32*) + have_w32_system=yes + have_w64_system=yes + ;; *-mingw32ce*) have_w32_system=yes have_w32ce_system=yes @@ -151,6 +156,9 @@ AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) # Special defines for certain platforms 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 64 bit W32 API system]) + fi if test "$have_w32ce_system" = yes; then AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE]) GPG_ERROR_CONFIG_ISUBDIRAFTER="gpg-extra" @@ -170,6 +178,7 @@ fi AC_SUBST(BUILD_TIMESTAMP) AC_SUBST(BUILD_FILEVERSION) AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) +AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes) AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes) |