aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/assuan-socket.c2
-rw-r--r--src/libassuan.m44
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index f3a3aac..61e1958 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,7 @@ CLEANFILES = mkheader assuan.h
BUILT_SOURCES = assuan.h
parts_of_assuan_h = \
- posix-includes.inc.h \
+ posix-includes.inc.h w32-includes.inc.h \
posix-types.inc.h w32-types.inc.h \
posix-fd-t.inc.h w32-fd-t.inc.h \
posix-sock-nonce.inc.h w32-sock-nonce.inc.h
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index 39e1a0c..c53468b 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -363,7 +363,7 @@ read_port_and_nonce (const char *fname, unsigned short *port, char *nonce,
*
* "!<socket >%u %c %08x-%08x-%08x-%08x\x00"
*
- * %d for port number, %c for kind of socket (s for STREAM), and
+ * %u for port number, %c for kind of socket (s for STREAM), and
* we have 16-byte random bytes for nonce. We only support
* stream mode.
*/
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index df50484..79391bb 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -9,7 +9,7 @@ dnl This file is distributed in the hope that it will be useful, but
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
dnl SPDX-License-Identifier: FSFULLR
-# Last-changed: 2020-11-17
+# Last-changed: 2022-11-01
dnl
dnl Common code used for libassuan detection [internal]
@@ -28,7 +28,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
fi
use_gpgrt_config=""
- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if $GPGRT_CONFIG libassuan --exists; then
LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])