From: Selva Nair <[email protected]> This was missed in commit 05a8ba8
Note: the check for PATHCCH_ENSURE_TRAILING_SLASH in configure.ac may be omitted if we build only using latest mingw32-w64 toolchain. Ubuntu 24.04 is not new enough. Github: closes OpenVPN/openvpn#885 Change-Id: Ifea896e722635a471cc01f930bc1e5d0f2c165be Signed-off-by: Selva Nair <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1334 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1334 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <[email protected]> diff --git a/configure.ac b/configure.ac index 8f3c01d..3117e13 100644 --- a/configure.ac +++ b/configure.ac @@ -1383,6 +1383,17 @@ fi fi +if test "${WIN32}" == "yes"; then + AC_CHECK_DECLS( + [PATHCCH_ENSURE_TRAILING_SLASH], + [AC_DEFINE([HAVE_PATHCCH_ENSURE_TRAILING_SLASH], [1], [PATHCCH_ENSURE_TRAILING_SLASH is defined])], + , + [[ + #include <pathcch.h> + ]] + ) +fi + # When testing a compiler option, we add -Werror to force # an error when the option is unsupported. This is not # required for gcc, but some compilers such as clang need it. diff --git a/src/openvpnserv/Makefile.am b/src/openvpnserv/Makefile.am index a27fbbf..f45d770 100644 --- a/src/openvpnserv/Makefile.am +++ b/src/openvpnserv/Makefile.am @@ -27,7 +27,7 @@ -D_WIN32_WINNT=_WIN32_WINNT_VISTA openvpnserv_LDADD = \ -ladvapi32 -luserenv -liphlpapi -lfwpuclnt -lrpcrt4 \ - -lshlwapi -lnetapi32 -lws2_32 -lntdll -lole32 + -lshlwapi -lnetapi32 -lws2_32 -lntdll -lole32 -lpathcch noinst_DATA = \ MSG00409.bin eventmsg.h eventmsg.rc openvpnservmsg.dll BUILT_SOURCES = \ _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
