mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* configure.ac (AH_BOTTOM): Define EXEEXT_S.
* autogen.sh: Updated --build-w32 feature. * gpg-agent.c (main): Remove special Pth initialize. * w32-pth.c (pth_init): Reverse return values. Use TRUE and FALSE constants. (pth_kill, pth_mutex_acquire, pth_attr_set, pth_join, pth_cancel): Ditto. * scdaemon.c (main) [W32]: Remove special Pth initialize..
This commit is contained in:
parent
3666a2859b
commit
694037f2a5
11 changed files with 147 additions and 105 deletions
12
configure.ac
12
configure.ac
|
@ -255,11 +255,13 @@ AH_BOTTOM([
|
|||
#define EXTSEP_C '.'
|
||||
#define DIRSEP_S "\\"
|
||||
#define EXTSEP_S "."
|
||||
#define EXEEXT_S ".exe"
|
||||
#else
|
||||
#define DIRSEP_C '/'
|
||||
#define EXTSEP_C '.'
|
||||
#define DIRSEP_S "/"
|
||||
#define EXTSEP_S "."
|
||||
#define EXEEXT_S ""
|
||||
#endif
|
||||
|
||||
/* This is the same as VERSION, but should be overridden if the
|
||||
|
@ -283,20 +285,20 @@ AH_BOTTOM([
|
|||
|
||||
/* Setup the hardwired names of modules. */
|
||||
#ifndef GNUPG_DEFAULT_AGENT
|
||||
#define GNUPG_DEFAULT_AGENT ( GNUPG_BINDIR DIRSEP_S "gpg-agent" )
|
||||
#define GNUPG_DEFAULT_AGENT ( GNUPG_BINDIR DIRSEP_S "gpg-agent" EXEEXT_S )
|
||||
#endif
|
||||
#ifndef GNUPG_DEFAULT_PINENTRY
|
||||
#define GNUPG_DEFAULT_PINENTRY ( GNUPG_BINDIR DIRSEP_S "pinentry" )
|
||||
#define GNUPG_DEFAULT_PINENTRY ( GNUPG_BINDIR DIRSEP_S "pinentry" EXEEXT_S )
|
||||
#endif
|
||||
#ifndef GNUPG_DEFAULT_SCDAEMON
|
||||
#define GNUPG_DEFAULT_SCDAEMON ( GNUPG_BINDIR DIRSEP_S "scdaemon" )
|
||||
#define GNUPG_DEFAULT_SCDAEMON ( GNUPG_BINDIR DIRSEP_S "scdaemon" EXEEXT_S )
|
||||
#endif
|
||||
#ifndef GNUPG_DEFAULT_DIRMNGR
|
||||
#define GNUPG_DEFAULT_DIRMNGR ( GNUPG_BINDIR DIRSEP_S "dirmngr" )
|
||||
#define GNUPG_DEFAULT_DIRMNGR ( GNUPG_BINDIR DIRSEP_S "dirmngr" EXEEXT_S )
|
||||
#endif
|
||||
#ifndef GNUPG_DEFAULT_PROTECT_TOOL
|
||||
#define GNUPG_DEFAULT_PROTECT_TOOL \
|
||||
( GNUPG_LIBEXECDIR DIRSEP_S "gpg-protect-tool" )
|
||||
( GNUPG_LIBEXECDIR DIRSEP_S "gpg-protect-tool" EXEEXT_S )
|
||||
#endif
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue