nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-23 20:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

configure: Give a more useful message when pkg-config fails

Browse Source 
When pkg-config is not installed, or a library that depends on
pkg-config is not found, tell the user what to do to fix the
problem.

Fixes bug 31922; bugfix on 0.3.1.1-alpha.
This commit is contained in:
teor 2019-10-03 16:31:20 +10:00
parent bca30bcb90
commit f0993d3831
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug31922 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (configuration):
- When pkg-config is not installed, or a library that depends on
pkg-config is not found, tell the user what to do to fix the
problem. Fixes bug 31922; bugfix on 0.3.1.1-alpha.

19
configure.ac
View File

@ -29,6 +29,13 @@ AC_USE_SYSTEM_EXTENSIONS
AC_CANONICAL_HOST AC_CANONICAL_HOST
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
if test "x$PKG_CONFIG" = "x" ; then
pkg_config_user_action="install pkg-config, and check the PKG_CONFIG_PATH environment variable."
AC_MSG_NOTICE([Some libraries need pkg-config, including systemd, nss, lzma, zstd, and custom mallocs.])
AC_MSG_NOTICE([To use those libraries, $pkg_config_user_action])
else
pkg_config_user_action="check the PKG_CONFIG_PATH environment variable."
fi
AC_ARG_ENABLE(openbsd-malloc, AC_ARG_ENABLE(openbsd-malloc,
AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc])) AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc]))
@ -166,7 +173,7 @@ AC_SUBST(TOR_SYSTEMD_CFLAGS)
AC_SUBST(TOR_SYSTEMD_LIBS) AC_SUBST(TOR_SYSTEMD_LIBS)
if test "x$enable_systemd" = "xyes" -a "x$have_systemd" != "xyes" ; then if test "x$enable_systemd" = "xyes" -a "x$have_systemd" != "xyes" ; then
AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found]) AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found, $pkg_config_user_action])
fi fi
case "$host" in case "$host" in
@ -870,7 +877,7 @@ if test "x$enable_nss" = "xyes"; then
PKG_CHECK_MODULES(NSS, PKG_CHECK_MODULES(NSS,
[nss], [nss],
[have_nss=yes], [have_nss=yes],
[have_nss=no; AC_MSG_ERROR([You asked for NSS but I can't find it.])]) [have_nss=no; AC_MSG_ERROR([You asked for NSS but I can't find it, $pkg_config_user_action])])
AC_SUBST(NSS_CFLAGS) AC_SUBST(NSS_CFLAGS)
AC_SUBST(NSS_LIBS) AC_SUBST(NSS_LIBS)
fi fi
@ -1076,7 +1083,7 @@ else
have_lzma=no) have_lzma=no)
if test "x$have_lzma" = "xno" ; then if test "x$have_lzma" = "xno" ; then
AC_MSG_WARN([Unable to find liblzma.]) AC_MSG_WARN([Unable to find liblzma, $pkg_config_user_action])
fi fi
fi fi
@ -1108,7 +1115,7 @@ else
have_zstd=no) have_zstd=no)
if test "x$have_zstd" = "xno" ; then if test "x$have_zstd" = "xno" ; then
AC_MSG_WARN([Unable to find libzstd.]) AC_MSG_WARN([Unable to find libzstd, $pkg_config_user_action])
fi fi
fi fi
@ -1915,7 +1922,7 @@ AS_CASE([$malloc],
have_tcmalloc=no) have_tcmalloc=no)
if test "x$have_tcmalloc" = "xno" ; then if test "x$have_tcmalloc" = "xno" ; then
AC_MSG_ERROR([Unable to find tcmalloc requested by --with-malloc.]) AC_MSG_ERROR([Unable to find tcmalloc requested by --with-malloc, $pkg_config_user_action])
fi fi
CFLAGS="$CFLAGS $TCMALLOC_CFLAGS" CFLAGS="$CFLAGS $TCMALLOC_CFLAGS"
@ -1929,7 +1936,7 @@ AS_CASE([$malloc],
have_jemalloc=no) have_jemalloc=no)
if test "x$have_tcmalloc" = "xno" ; then if test "x$have_tcmalloc" = "xno" ; then
AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc.]) AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc, $pkg_config_user_action])
fi fi
CFLAGS="$CFLAGS $JEMALLOC_CFLAGS" CFLAGS="$CFLAGS $JEMALLOC_CFLAGS"