From: "plaisthos (Code Review)" Date: Fri, 1 Dec 2023 13:12:16 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="/BMRh6YWYHg="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Make it more explicit and visible when pkg-config is not found List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --/BMRh6YWYHg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/465?usp=3Demail to review the following change. Change subject: Make it more explicit and visible when pkg-config is not fo= und ...................................................................... Make it more explicit and visible when pkg-config is not found Users seem to struggle to read the full error message. This adds an indication if pkg-config is actually found to the warning/error message that use pkg-config. When found: configure: error: libnl-genl-3.0 package not found or too old. Is the d= evelopment package and pkg-config (using /usr/bin/pkg-config) installed? Mu= st be version 3.4.0 or newer for DCO not found: configure: error: libnl-genl-3.0 package not found or too old. Is the d= evelopment package and pkg-config (not found) installed? Must be version 3.= 4.0 or newer for DCO Change-Id: Iebaa35a23e217a4cd7739af229cbfc08a3d8854a Signed-off-by: Arne Schwabe --- M configure.ac 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/65/465/1 diff --git a/configure.ac b/configure.ac index 84eaad6..2e3cbee 100644 --- a/configure.ac +++ b/configure.ac @@ -382,6 +382,14 @@ AM_CONDITIONAL([CROSS_COMPILING], test "${cross_compiling}" =3D "yes") PKG_PROG_PKG_CONFIG +# Add variable to print if pkg-config is found or not. Users often miss th= at +if test "${PKG_CONFIG}" =3D ""; then + pkg_config_found=3D"(not found)" +else + pkg_config_found=3D"(using ${PKG_CONFIG})" +fi + + AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S @@ -818,7 +826,7 @@ [libnl-genl-3.0 >=3D 3.4.0], [have_libnl=3D"yes"], [ - AC_MSG_ERROR([libnl-genl-3.0 package not found or too old. Is the = development package and pkg-config installed? Must be version 3.4.0 or newe= r for DCO]) + AC_MSG_ERROR([libnl-genl-3.0 package not found or too old. Is the = development package and pkg-config ${pkg_config_found} installed? Must be v= ersion 3.4.0 or newer for DCO]) ] ) CFLAGS=3D"${CFLAGS} ${LIBNL_GENL_CFLAGS}" @@ -862,10 +870,11 @@ dnl case "$host" in *-*-linux*) + # We require pkg-config PKG_CHECK_MODULES([LIBCAPNG], [libcap-ng], [], - [AC_MSG_ERROR([libcap-ng package not found. Is the development packa= ge and pkg-config installed?])] + [AC_MSG_ERROR([libcap-ng package not found. Is the development packa= ge and pkg-config ${pkg_config_found} installed?])] ) AC_CHECK_HEADER([sys/prctl.h],,[AC_MSG_ERROR([sys/prctl.h not found!])]) @@ -886,7 +895,7 @@ [OPENSSL], [openssl >=3D 1.0.2], [have_openssl=3D"yes"], - [] # If this fails, we will do another test next + [AC_MSG_WARN([OpenSSL not found by pkg-config ${pkg_config_found}])] # = If this fails, we will do another test next ) OPENSSL_LIBS=3D${OPENSSL_LIBS:--lssl -lcrypto} fi @@ -1091,7 +1100,7 @@ [WOLFSSL], [wolfssl], [], - [AC_MSG_ERROR([Could not find wolfSSL.])] + [AC_MSG_ERROR([Could not find wolfSSL using pkg-config ${pkg_config_fou= nd}])] ) PKG_CHECK_VAR( [WOLFSSL_INCLUDEDIR], @@ -1515,7 +1524,7 @@ PKG_CHECK_MODULES( [CMOCKA], [cmocka], [have_cmocka=3D"yes"], - [AC_MSG_WARN([cmocka.pc not found on the system. Unit tests disabled])] + [AC_MSG_WARN([cmocka.pc not found on the system using pkg-config ${pkg_co= nfig_found}. Unit tests disabled])] ) AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}" =3D "yes" = -a "${have_cmocka}" =3D "yes" ]) AC_SUBST([ENABLE_UNITTESTS]) -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/465?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iebaa35a23e217a4cd7739af229cbfc08a3d8854a Gerrit-Change-Number: 465 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --/BMRh6YWYHg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos would like flichtenheld to review this change.

Vi= ew Change

Make it more explicit and visible when pkg-config is not foun=
d

Users seem to struggle to read the full error message. This adds a= n
indication if pkg-config is actually found to the warning/error messag= e
that use pkg-config.

When found:

configure: error: l= ibnl-genl-3.0 package not found or too old. Is the development package and = pkg-config (using /usr/bin/pkg-config) installed? Must be version 3.4.0 or = newer for DCO

not found:

configure: error: libnl-genl-3.0= package not found or too old. Is the development package and pkg-config (n= ot found) installed? Must be version 3.4.0 or newer for DCO

Change-I= d: Iebaa35a23e217a4cd7739af229cbfc08a3d8854a
Signed-off-by: Arne Schwabe= <arne@...1227...>
---
M configure.ac
1 file changed, 14 ins= ertions(+), 5 deletions(-)

git pull ssh://gerrit.openvpn.net:2941=
8/openvpn refs/changes/65/465/1
diff --git a/configure.ac b/configu=
re.ac
index 84eaad6..2e3cbee 100644
--- a/c= onfigure.ac
+++ b/configure.ac
@@ -382,6 +3= 82,14 @@
AM_CONDITIONAL([CROSS_COMPILING], test "${cr= oss_compiling}" =3D "yes")

PKG_PROG_PKG_CONFIG
+# Add variable to print if pkg-config is found or not. Users often miss t= hat
+if test "${= PKG_CONFIG}" =3D ""; then
+ pkg_config_found=3D"(not found)"
= +else
+ pkg_config_found=3D"(using ${PKG_CON= FIG})"
+fi

+
+
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -818,7 = +826,7 @@
[libnl-genl-3.0 >=3D 3.4.0], [have_libnl=3D"yes"],
[
- AC_MSG_ERROR([li= bnl-genl-3.0 package not found or too old. Is the development package and p= kg-config installed? Must be version 3.4.0 or newer for DCO])
+ AC_MSG_ERROR([libnl-genl-= 3.0 package not found or too old. Is the development package and pkg-config= ${pkg_config_found} installed? Must be version 3.4.0 or newer for DCO])
]
)
CFLAGS= =3D"${CFLAGS} ${LIBNL_GENL_CFLAGS}"
@@ -862,10 +8= 70,11 @@
dnl
case "$host" in
*-*-linux*)
+ # We require pkg-config
PKG_CHECK_MODULES([= LIBCAPNG],
[libcap-ng],
[],
- [AC_MSG_ERROR([li= bcap-ng package not found. Is the development package and pkg-config instal= led?])]
+ [AC_MS= G_ERROR([libcap-ng package not found. Is the development package and pkg-co= nfig ${pkg_config_found} installed?])]
)
AC_CHECK_HEADER([sys/prctl.h],,[AC_MSG_ERROR([sys/prctl.h not found!])]= )


@@ -886,7 +895,7 @@
= [OPENSSL],
[openssl >=3D 1.0.2],
= [have_openssl=3D"yes"],
- [] # If this fails, we will do another test next+ [AC_MSG_WARN([OpenSSL not = found by pkg-config ${pkg_config_found}])] # If this fails, we will do anot= her test next
)
OPENSSL_LIBS=3D${OPEN= SSL_LIBS:--lssl -lcrypto}
fi
@@ -1091,7 += 1100,7 @@
[WOLFSSL],
[wolfssl],

[],
- = [AC_MSG_ERROR([Could not find wolfSSL.])]
+ [AC_MSG_ERROR([Could not find wolfSSL using pkg-= config ${pkg_config_found}])]
)
PKG_C= HECK_VAR(
[WOLFSSL_INCLUDEDIR],
@@ -151= 5,7 +1524,7 @@
PKG_CHECK_MODULES(
[CMOCK= A], [cmocka],
[have_cmocka=3D"yes"],
= - [AC_MSG_WARN([cmocka.pc not fou= nd on the system. Unit tests disabled])]
+ [AC_MSG_WARN([cmocka.pc not found on the system usin= g pkg-config ${pkg_config_found}. Unit tests disabled])]
= )
AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_= unit_tests}" =3D "yes" -a "${have_cmocka}" =3D &qu= ot;yes" ])
AC_SUBST([ENABLE_UNITTESTS])

To view, visit change 465. To unsubscribe, or for help wr= iting mail filters, visit se= ttings.

<= div itemscope itemprop=3D"action" itemtype=3D"http://schema.org/ViewAction"= >
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iebaa35a23e217a4cd7739af229c= bfc08a3d8854a
Gerrit-Change-Number: 465
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--/BMRh6YWYHg=--