[W32] Avoid extra console window when importing or exporting.
[gnupg.git] / autogen.sh
index 8a20b1a..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.
@@ -86,8 +91,9 @@ 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
@@ -158,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`
@@ -198,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 --sysconfdir=/etc --enable-maintainer-mode && make\"."