diff options
| author | Werner Koch <[email protected]> | 2010-04-14 14:39:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-04-14 14:39:16 +0000 |
| commit | 53c636c4c666ab27440fb4a866bf0ae32f0aa517 (patch) | |
| tree | ac6d1e065b3f65bec63484d636c1ed0b19dbf8d1 /tools | |
| parent | Whole lot of changes to support CE. (diff) | |
| download | gnupg-53c636c4c666ab27440fb4a866bf0ae32f0aa517.tar.gz gnupg-53c636c4c666ab27440fb4a866bf0ae32f0aa517.zip | |
./autogen.sh --build-w32ce does now succeed.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/Makefile.am | 11 | ||||
| -rw-r--r-- | tools/gpg-connect-agent.c | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 52a16a238..aeb2313ac 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2010-04-14 Werner Koch <[email protected]> + + * Makefile.am (bin_PROGRAMS) [W32CE]: Exclude gpgkey2ssh. + (noinst_PROGRAMS) [W32CE]: Don't build them. + 2010-03-25 Werner Koch <[email protected]> * Makefile.am (opt_libassuan_libs) [W32CE]: New. diff --git a/tools/Makefile.am b/tools/Makefile.am index a610e6282..4bdeacb88 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -42,16 +42,22 @@ else symcryptrun = endif -bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} +# Fixme: We should remove the gpgkey2ssh tool. +bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail endif +if !HAVE_W32CE_SYSTEM +bin_PROGRAMS += gpgkey2ssh +endif if !DISABLE_REGEX libexec_PROGRAMS = gpg-check-pattern endif +if !HAVE_W32CE_SYSTEM noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit +endif common_libs = $(libcommon) ../gl/libgnu.a pwquery_libs = ../common/libsimple-pwquery.a @@ -88,13 +94,14 @@ gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \ $(LIBASSUAN_LIBS) $(PTH_LIBS) $(GPG_ERROR_LIBS) \ $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) +if !HAVE_W32CE_SYSTEM gpgkey2ssh_SOURCES = gpgkey2ssh.c gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) # common via use of BUG() in an inline function, which # some compilers do not eliminate. gpgkey2ssh_LDADD = $(common_libs) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) - +endif if !DISABLE_REGEX gpg_check_pattern_SOURCES = gpg-check-pattern.c diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index 8506d6feb..80bb4e785 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -1203,11 +1203,7 @@ main (int argc, char **argv) if (log_get_errorcount (0)) exit (2); -#ifdef HAVE_W32CE_SYSTEM - use_tty = 0; -#else - use_tty = (isatty ( fileno (stdin)) && isatty (fileno (stdout))); -#endif + use_tty = (gnupg_isatty (fileno (stdin)) && gnupg_isatty (fileno (stdout))); if (opt.exec) { |