From e3b1e3857e00c6e8216e953b0b38f4dcda00cd53 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 31 Aug 2022 14:18:24 +0900 Subject: Drop WindowsCE support. * contrib/*: Remove. * Makefile.am (EXTRA_DIST): Don't include contrib/. * configure.ac (HAVE_W32CE_SYSTEM): Remove. * src/gpgcedev.c: Remove. * src/gpgcedev.def: Remove. * src/gpgcemgr.c: Remove. * src/system-w32ce.c: Remove. * src/w32ce-add.h: Remove. * src/w32ce-fd-t.inc.h: Remove. * src/Makefile.am (EXTRA_DIST, parts_of_assuan_h, common_sources): Fix. * src/assuan-buffer.c [HAVE_W32CE_SYSTEM]: No conditionalize. * src/setenv.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-defs.h [HAVE_W32CE_SYSTEM]: Remove dependent part. * src/assuan-error.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-handler.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-socket.c [HAVE_W32CE_SYSTEM]: Likewise. * src/system.c [HAVE_W32CE_SYSTEM]: Likewise. * src/sysutils.c [HAVE_W32CE_SYSTEM]: Likewise. * tests/Makefile.am (EXTRA_DIST): Fix. (w32cetools): Remove. * tests/common.h [HAVE_W32CE_SYSTEM]: Remove dependent part. * tests/pipeconnect.c [HAVE_W32CE_SYSTEM]: Likewise. * tests/ce-createpipe.c: Remove. * tests/ce-server.c: Remove. -- GnuPG-bug-id: 6170 Signed-off-by: NIIBE Yutaka --- configure.ac | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 29c66dd..b5c2cc7 100644 --- a/configure.ac +++ b/configure.ac @@ -156,9 +156,6 @@ AH_TOP([ #ifndef _ASSUAN_CONFIG_H_INCLUDED #define _ASSUAN_CONFIG_H_INCLUDED -/* Enable gpg-error's strerror macro under W32CE. */ -#define GPG_ERR_ENABLE_ERRNO_MACROS 1 - /* Provide the es_ macro for estream. */ #define GPGRT_ENABLE_ES_MACROS 1 @@ -213,7 +210,6 @@ fi have_dosish_system=no have_w32_system=no have_w64_system=no -have_w32ce_system=no case "${host}" in *-linux*) if test "$GCC" = yes; then @@ -225,11 +221,6 @@ case "${host}" in have_w32_system=yes have_w64_system=yes ;; - *-mingw32ce*) - have_dosish_system=yes - have_w32_system=yes - have_w32ce_system=yes - ;; *-mingw32*) have_dosish_system=yes have_w32_system=yes @@ -254,13 +245,9 @@ if test "$have_w32_system" = yes; then AC_DEFINE(HAVE_W64_SYSTEM,1, [Defined if we run on a 64 bit W32 API based system]) fi - if test "$have_w32ce_system" = yes; then - AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE]) - fi AC_CHECK_HEADERS([winsock2.h]) fi AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) -AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes) AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes) @@ -302,12 +289,8 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, AC_SUBST(NETLIBS) if test "$have_w32_system" = yes; then - if test "$have_w32ce_system" = yes; then - NETLIBS="-lws2 $NETLIBS" - else - # FIXME: Check why we need to use ws2_32 and document that. - NETLIBS="-lws2_32 $NETLIBS" - fi + # FIXME: Check why we need to use ws2_32 and document that. + NETLIBS="-lws2_32 $NETLIBS" fi # -- cgit v1.2.1