From: "plaisthos (Code Review)"
Date: Fri, 5 Jan 2024 13:49:27 +0000
In-Reply-To:
References:
Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net,
frank@...2641..., gert@...1296..., a@...2181...
Message-ID: <15c4510d1dcec6cc80c80c99890113e11d0bbce4-EmailReplacePatchSet-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="96G+UkislvA="; 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: cron2 , flichtenheld
Cc: openvpn-devel
--96G+UkislvA=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, ordex.
Hello cron2, flichtenheld, ordex,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/465?usp=3Demail
to look at the new patch set (#5).
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.
On platforms that do not require pkg-config and for optional libraries,
the existence of pkg-config is mentioned as part of the error/warning messa=
ge.
When found:
configure: error: libnl-genl-3.0 package not found or too old. Is the d=
evelopment package and pkg-config (/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 d=
evelopment package and pkg-config (not found) installed? Must be version 3.=
4.0 or newer for DCO
On platforms where pkg-config is required (only Linux at the moment),
configure will abort when not detecting pkg-config:
checking for pkg-config... no
configure: error: pkg-config is required
Change-Id: Iebaa35a23e217a4cd7739af229cbfc08a3d8854a
Signed-off-by: Arne Schwabe
---
M configure.ac
1 file changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/65/465/5
diff --git a/configure.ac b/configure.ac
index f420612..3ad9f14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,6 +323,7 @@
AM_CONDITIONAL([TARGET_LINUX], [true])
AC_DEFINE_UNQUOTED([TARGET_PREFIX], ["L"], [Target prefix])
have_sitnl=3D"yes"
+ pkg_config_required=3D"yes"
;;
*-*-solaris*)
AC_DEFINE([TARGET_SOLARIS], [1], [Are we running on Solaris?])
@@ -376,6 +377,16 @@
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
+ if test "${pkg_config_required}" =3D "yes"; then
+ AC_MSG_ERROR([pkg-config is required])
+ fi
+ pkg_config_found=3D"(not found)"
+else
+ pkg_config_found=3D"(${PKG_CONFIG})"
+fi
+
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -810,7 +821,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}"
@@ -854,10 +865,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!])])
@@ -878,7 +890,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
@@ -1083,7 +1095,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],
@@ -1508,7 +1520,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: 5
Gerrit-Owner: plaisthos
Gerrit-Reviewer: cron2
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: ordex
Gerrit-CC: openvpn-devel
Gerrit-Attention: cron2
Gerrit-Attention: flichtenheld
Gerrit-Attention: ordex
Gerrit-MessageType: newpatchset
--96G+UkislvA=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, ordex.
plaisthos uploaded patch set #5 to this change.
<=
a href=3D"http://gerrit.openvpn.net/c/openvpn/+/465?usp=3Demail">View Chang=
e
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
ind=
ication if pkg-config is actually found to the warning/error message
tha=
t use pkg-config.
On platforms that do not require pkg-config and fo=
r optional libraries,
the existence of pkg-config is mentioned as part o=
f the error/warning message.
When found:
configure: error=
: libnl-genl-3.0 package not found or too old. Is the development package a=
nd pkg-config (/usr/bin/pkg-config) installed? Must be version 3.4.0 or new=
er for DCO
not found:
configure: error: libnl-genl-3.0 pa=
ckage not found or too old. Is the development package and pkg-config (not =
found) installed? Must be version 3.4.0 or newer for DCO
On platform=
s where pkg-config is required (only Linux at the moment),
configure wil=
l abort when not detecting pkg-config:
checking for pkg-config... no=
configure: error: pkg-config is required
Change-Id: Iebaa35a23e2=
17a4cd7739af229cbfc08a3d8854a
Signed-off-by: Arne Schwabe <arne@...1711...=
27...>
---
M configure.ac
1 file changed, 17 insertions(+), 5 d=
eletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/=
changes/65/465/5
diff --git a/configure.ac b/configure.ac
index f420612..3ad9f14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,6 +323,7 @@<=
br> AM_CONDITIONAL([TARGET_LINUX], [true])
AC_DE=
FINE_UNQUOTED([TARGET_PREFIX], ["L"], [Target prefix])
=
have_sitnl=3D"yes"
+ pkg_config_required=3D"yes"
=
;;
*-*-solaris*)
AC_DEFINE([TARGET_S=
OLARIS], [1], [Are we running on Solaris?])
@@ -376,6 +377,=
16 @@
AM_CONDITIONAL([CROSS_COMPILING], test "${cross=
_compiling}" =3D "yes")
P=
KG_PROG_PKG_CONFIG
+#=
Add variable to print if pkg-config is found or not. Users often miss that=
+if test "${PKG=
_CONFIG}" =3D ""; then
+ if test "${pkg_config_required}" =3D "yes=
"; then
+ AC_MS=
G_ERROR([pkg-config is required])
+ fi
+ p=
kg_config_found=3D"(not found)"
+else
+ pkg_config_found=3D"(${PKG_CONFIG})"
+fi
+
AC_PROG_CPP
AC_PROG_IN=
STALL
AC_PROG_LN_S
@@ -810,7 +821,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 ins=
talled? Must be version 3.4.0 or newer for DCO])
+ AC_MSG_ERROR([libnl-genl-3.0 package n=
ot 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"${CFL=
AGS} ${LIBNL_GENL_CFLAGS}"
@@ -854,10 +865,11 @@
dnl
case "$host" in
=
*-*-linux*)
+ # We=
require pkg-config
PKG_CHECK_MODULES([LIBCAPNG],=
[libcap-ng],
[],
- [AC_MSG_ERROR([libcap-ng package n=
ot found. Is the development package and pkg-config installed?])]
+ [AC_MSG_ERROR([libcap-n=
g package not found. Is the development package and pkg-config ${pkg_config=
_found} installed?])]
)
AC_CHECK_HEAD=
ER([sys/prctl.h],,[AC_MSG_ERROR([sys/prctl.h not found!])])
@@ -878,7 +890,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-co=
nfig ${pkg_config_found}])] # If this fails, we will do another test next=
span>
)
OPENSSL_LIBS=3D${OPENSSL_LIBS:--lssl=
-lcrypto}
fi
@@ -1083,7 +1095,7 @@
[WOLFSSL],
[wolfssl],
=
[],
- [AC_MSG_ERROR=
([Could not find wolfSSL.])]
+ [AC_MSG_ERROR([Could not find wolfSSL using pkg-config ${pkg_co=
nfig_found}])]
)
PKG_CHECK_VAR(
[WOLFSSL_INCLUDEDIR],
@@ -1508,7 +1520,7 @@<=
/span>
PKG_CHECK_MODULES(
[CMOCKA], [cmocka],=
span>
[have_cmocka=3D"yes"],
- [AC_MSG_WARN([cmocka.pc not found on the syste=
m. Unit tests disabled])]
+ [AC_MSG_WARN([cmocka.pc not found on the system using pkg-config ${=
pkg_config_found}. Unit tests disabled])]
)
AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}&quo=
t; =3D "yes" -a "${have_cmocka}" =3D "yes" ])=
AC_SUBST([ENABLE_UNITTESTS])
<=
/pre>To view, visit change 465. To unsubscribe, or for help writing mail filt=
ers, visit settings.
=
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iebaa35a23e217a4cd7739af229c=
bfc08a3d8854a
Gerrit-Change-Number: 465
Gerrit-PatchSet: 5
Gerrit-Owner: plaisthos <arne-openvpn@...1711...=
27...>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...=
1...>
Gerrit-Reviewer: ordex <a@...2181...> =
div>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: cron2 <gert@...1296...>=
;
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-Attention: ordex <a@...2181...> <=
/div>
Gerrit-MessageType: newpatchset
--96G+UkislvA=--