[W32] Avoid extra console window when importing or exporting.
[gnupg.git] / autogen.sh
index 29e19ea..5aa6b89 100755 (executable)
@@ -39,6 +39,11 @@ GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
 MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 
 DIE=no
+FORCE=
+if test x"$1" = x"--force"; then
+  FORCE=" --force"
+  shift
+fi
 
 # ***** W32 build script *******
 # Used to cross-compile for Windows.
@@ -57,7 +62,7 @@ if test "$1" = "--build-w32"; then
     
     # Locate the cross compiler
     crossbindir=
-    for host in i586-mingw32msvc i386-mingw32msvc; do
+    for host in i586-mingw32msvc i386-mingw32msvc mingw32; do
         if ${host}-gcc --version >/dev/null 2>&1 ; then
             crossbindir=/usr/${host}/bin
             conf_CC="CC=${host}-gcc"
@@ -86,14 +91,63 @@ if test "$1" = "--build-w32"; then
             --with-libgcrypt-prefix=${w32root} \
             --with-libassuan-prefix=${w32root} \
             --with-zlib=${w32root} \
+            --with-regex=${w32root} \
              --with-pth-prefix=${w32root} \
-             --disable-gpg
+             --without-included-gettext "$@"
     rc=$?
     exit $rc
 fi
 # ***** end W32 build script *******
 
+# ***** AMD64 cross build script *******
+# Used to cross-compile for AMD64 (for testing)
+if test "$1" = "--build-amd64"; then
+    tmp=`dirname $0`
+    tsdir=`cd "$tmp"; pwd`
+    shift
+    if [ ! -f $tsdir/scripts/config.guess ]; then
+        echo "$tsdir/scripts/config.guess not found" >&2
+        exit 1
+    fi
+    build=`$tsdir/scripts/config.guess`
+
+    [ -z "$amd64root" ] && amd64root="$HOME/amd64root"
+    echo "Using $amd64root as standard install directory" >&2
+    
+    # Locate the cross compiler
+    crossbindir=
+    for host in x86_64-linux-gnu amd64-linux-gnu; do
+        if ${host}-gcc --version >/dev/null 2>&1 ; then
+            crossbindir=/usr/${host}/bin
+            conf_CC="CC=${host}-gcc"
+            break;
+        fi
+    done
+    if [ -z "$crossbindir" ]; then
+        echo "Cross compiler kit not installed" >&2
+        echo "Stop." >&2
+        exit 1
+    fi
+   
+    if [ -f "$tsdir/config.log" ]; then
+        if ! head $tsdir/config.log | grep "$host" >/dev/null; then
+            echo "Please run a 'make distclean' first" >&2
+            exit 1
+        fi
+    fi
 
+    $tsdir/configure --enable-maintainer-mode --prefix=${amd64root}  \
+             --host=${host} --build=${build} \
+             --with-gpg-error-prefix=${amd64root} \
+            --with-ksba-prefix=${amd64root} \
+            --with-libgcrypt-prefix=${amd64root} \
+            --with-libassuan-prefix=${amd64root} \
+            --with-zlib=/usr/x86_64-linux-gnu/usr \
+             --with-pth-prefix=/usr/x86_64-linux-gnu/usr
+    rc=$?
+    exit $rc
+fi
+# ***** end AMD64 cross build script *******
 
 
 # Grep the required versions from configure.ac
@@ -110,7 +164,7 @@ q
 automake_vers_num=`echo "$automake_vers" | cvtver`
 
 gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { 
-s/^.*(\(.*\))/\1/p
+s/^.*\[\(.*\)])/\1/p
 q
 }' ${configure_ac}`
 gettext_vers_num=`echo "$gettext_vers" | cvtver`
@@ -150,7 +204,7 @@ echo "Running autoheader..."
 $AUTOHEADER
 echo "Running automake --gnu ..."
 $AUTOMAKE --gnu;
-echo "Running autoconf..."
-$AUTOCONF
+echo "Running autoconf${FORCE} ..."
+$AUTOCONF${FORCE}
 
-echo "You may now run \"./configure --enable-maintainer-mode && make\"."
+echo "You may now run \"./configure --sysconfdir=/etc --enable-maintainer-mode && make\"."