summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-04-21 09:18:10 +0200
committerWerner Koch <wk@gnupg.org>2016-04-21 09:18:29 +0200
commitd81de224ecd542922dda649a492dd9550509d7bc (patch)
treed967d84eff64bd9db326dbc96bccf6d61472537e
parentw32: Replace libiconv DLL by iconv feature of libgpg-error. (diff)
downloadgnupg2-d81de224ecd542922dda649a492dd9550509d7bc.tar.xz
gnupg2-d81de224ecd542922dda649a492dd9550509d7bc.zip
w32: Use --enable-gpg2-is-gpg by default.
* autogen.rc: Add option also for plain Windows. Signed-off-by: Werner Koch <wk@gnupg.org>
-rw-r--r--autogen.rc2
-rw-r--r--g10/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/autogen.rc b/autogen.rc
index 832d6c4da..8cb7eedcb 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -8,7 +8,7 @@ case "$myhost:$myhostsub" in
extraoptions="$extraoptions --disable-zip --enable-gpg2-is-gpg"
;;
w32:)
- extraoptions="--enable-gpgtar"
+ extraoptions="--enable-gpgtar --enable-gpg2-is-gpg"
;;
esac
diff --git a/g10/Makefile.am b/g10/Makefile.am
index cd1d15701..18a1b69b8 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -33,7 +33,7 @@ AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
needed_libs = ../kbx/libkeybox.a $(libcommon)
# Because there are no program specific transform macros we need to
-# work around that to allow installaing gpg as gpg2.
+# work around that to allow installing gpg as gpg2.
gpg2_hack_list = gpg gpgv
if USE_GPG2_HACK
gpg2_hack_uninst = gpg2 gpgv2