Message ID | 20230301091848.80760-1-kprovost@netgate.com |
---|---|
State | Accepted |
Headers | show |
Series | [Openvpn-devel,1/2] configure: improve FreeBSD DCO check | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> Thanks for spotting & fixing this, and apologies for still not having a FreeBSD 14 buildslave. Indeed, the existing configure.ac hard breaks my FreeBSD 14 setup (which I didn't look at for a while, "because it works")... checking for nvlist_create in -lnv... no configure: WARNING: Name/Value pair library not found. configure: error: DCO support can't be enabled (because "./configure --enable-dco" -> succeed or error out). With "enable DCO on auto", the existing code does checking for nvlist_create in -lnv... no configure: WARNING: Name/Value pair library not found. configure: WARNING: DCO support disabled and proceeds to build a binary with no DCO! With this patch applied, "no arguments" or "--enable-dco" both succeed... checking for net/if_ovpn.h... yes configure: Enabled ovpn-dco support for FreeBSD on earlier FreeBSD versions (7.4), it just disables DCO, and proceeds happily - as it should be. configure: WARNING: DCO header not found. configure: WARNING: DCO support disabled Your patch has been applied to the master and release/2.6 branch. commit 6f261673dee26ae8cfdf58f77038098d4f81d84a (master) commit 86fb085b6d2582916ef59b4bd8bd5e4a072964a3 (release/2.6) Author: Kristof Provost Date: Wed Mar 1 10:18:48 2023 +0100 configure: improve FreeBSD DCO check Signed-off-by: Kristof Provost <kprovost@netgate.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20230301091848.80760-1-kprovost@netgate.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26314.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/configure.ac b/configure.ac index 4c271464..67f680b2 100644 --- a/configure.ac +++ b/configure.ac @@ -832,9 +832,7 @@ if test "$enable_dco" != "no"; then fi ;; *-*-freebsd*) - AC_CHECK_LIB( - [nv], - [nvlist_create], + AC_CHECK_HEADERS([net/if_ovpn.h], [ LIBS="${LIBS} -lnv" AC_DEFINE(ENABLE_DCO, 1, [Enable data channel offload for FreeBSD]) @@ -842,7 +840,7 @@ if test "$enable_dco" != "no"; then ], [ enable_dco="no" - AC_MSG_WARN([Name/Value pair library not found.]) + AC_MSG_WARN([DCO header not found.]) ] ) if test "$enable_dco" = "no"; then