colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/autotools: avoid checking twice for libcurl

Browse Source 
We check once conditionally for enable_concheck, and once for
with_nm_cloud_setup. Don't do it twice.
This commit is contained in:
Thomas Haller
2023-05-11 14:17:25 +02:00
parent 701171d99a
commit e7aa33ebfd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -1049,6 +1049,7 @@ else
fi fi
AM_CONDITIONAL(WITH_LIBPSL, test "$with_libpsl" != "no") AM_CONDITIONAL(WITH_LIBPSL, test "$with_libpsl" != "no")
have_libcurl=''
AC_ARG_ENABLE(concheck, AC_ARG_ENABLE(concheck,
AS_HELP_STRING([--enable-concheck], [enable connectivity checking support]), AS_HELP_STRING([--enable-concheck], [enable connectivity checking support]),
@@ -1087,7 +1088,9 @@ AM_CONDITIONAL(BUILD_NMCLI, test "$build_nmcli" = yes)
AC_ARG_WITH(nm-cloud-setup, AC_ARG_WITH(nm-cloud-setup,
AS_HELP_STRING([--with-nm-cloud-setup=yes|no], [Build nm-cloud-setup, a tool for automatically configuring networking in cloud])) AS_HELP_STRING([--with-nm-cloud-setup=yes|no], [Build nm-cloud-setup, a tool for automatically configuring networking in cloud]))
if test "$with_nm_cloud_setup" != no; then if test "$with_nm_cloud_setup" != no; then
if test "$have_libcurl" = ""; then
PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no]) PKG_CHECK_MODULES(LIBCURL, [libcurl >= 7.24.0], [have_libcurl=yes], [have_libcurl=no])
fi
if test "$have_libcurl" != "yes"; then if test "$have_libcurl" != "yes"; then
AC_MSG_ERROR(--with-nm-cloud-setup requires libcurl library.) AC_MSG_ERROR(--with-nm-cloud-setup requires libcurl library.)
fi fi