mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools: Drop libsystemd as a dependency
There are no more users, and we want to disuade people from introducing new
users just for sd_notify() and friends. Drop the dependency.
We still want the overall --with{,out}-systemd to gate the generation of the
service/unit/mount/etc files.
Rerun autogen.sh, and mark the dependency as removed in the build containers.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Christian Lindig <christian.lindig@cloud.com>
tools: (Actually) drop libsystemd as a dependency
When reinstating some of systemd.m4 between v1 and v2, I reintroduced a little
too much. While {c,o}xenstored are indeed no longer linked against
libsystemd, ./configure still looks for it.
Drop this too.
Fixes: ae26101f6b ("tools: Drop libsystemd as a dependency")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
master commit: ae26101f6b
master date: 2024-05-23 15:04:40 +0100
master commit: 6ef4fa1e7f
master date: 2024-05-30 12:15:25 +0100
This commit is contained in:
Andrew Cooper authored and Jan Beulich committed
1 parent
77cf215157
commit
7967bd358e
4 files changed
+7
-504
No files matched your search
+6
-1
@@ -4,7 +4,12 @@ Notable changes to Xen will be documented in this file.
|
|||||||
|
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
||||||
|
|
||||||
## [4.18.2](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.2)
|
## [4.18.3](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.3)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- When building with Systemd support (./configure --enable-systemd), remove
|
||||||
|
libsystemd as a build dependency. Systemd Notify support is retained, now
|
||||||
|
using a standalone library implementation.
|
||||||
|
|
||||||
## [4.18.1](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.1)
|
## [4.18.1](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.18.1)
|
||||||
|
|
||||||
|
|||||||
@@ -52,8 +52,6 @@ CONFIG_PYGRUB := @pygrub@
|
|||||||
CONFIG_LIBFSIMAGE := @libfsimage@
|
CONFIG_LIBFSIMAGE := @libfsimage@
|
||||||
|
|
||||||
CONFIG_SYSTEMD := @systemd@
|
CONFIG_SYSTEMD := @systemd@
|
||||||
SYSTEMD_CFLAGS := @SYSTEMD_CFLAGS@
|
|
||||||
SYSTEMD_LIBS := @SYSTEMD_LIBS@
|
|
||||||
XEN_SYSTEMD_DIR := @SYSTEMD_DIR@
|
XEN_SYSTEMD_DIR := @SYSTEMD_DIR@
|
||||||
XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@
|
XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@
|
||||||
CONFIG_9PFS := @ninepfs@
|
CONFIG_9PFS := @ninepfs@
|
||||||
|
|||||||
@@ -41,15 +41,6 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [
|
|||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [
|
AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [
|
||||||
PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon],,
|
|
||||||
[PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209])]
|
|
||||||
)
|
|
||||||
dnl pkg-config older than 0.24 does not set these for
|
|
||||||
dnl PKG_CHECK_MODULES() worth also noting is that as of version 208
|
|
||||||
dnl of systemd pkg-config --cflags currently yields no extra flags yet.
|
|
||||||
AC_SUBST([SYSTEMD_CFLAGS])
|
|
||||||
AC_SUBST([SYSTEMD_LIBS])
|
|
||||||
|
|
||||||
AS_IF([test "x$SYSTEMD_DIR" = x], [
|
AS_IF([test "x$SYSTEMD_DIR" = x], [
|
||||||
dnl In order to use the line below we need to fix upstream systemd
|
dnl In order to use the line below we need to fix upstream systemd
|
||||||
dnl to properly ${prefix} for child variables in
|
dnl to properly ${prefix} for child variables in
|
||||||
@@ -95,13 +86,6 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [
|
|||||||
],[systemd=n])
|
],[systemd=n])
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [
|
|
||||||
PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"],[
|
|
||||||
PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209],
|
|
||||||
[systemd="y"],[systemd="n"])
|
|
||||||
])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Enables systemd by default and requires a --disable-systemd option flag
|
dnl Enables systemd by default and requires a --disable-systemd option flag
|
||||||
dnl to configure if you want to disable.
|
dnl to configure if you want to disable.
|
||||||
AC_DEFUN([AX_ENABLE_SYSTEMD], [
|
AC_DEFUN([AX_ENABLE_SYSTEMD], [
|
||||||
@@ -121,6 +105,5 @@ dnl to have systemd build libraries it will be enabled. You can always force
|
|||||||
dnl disable with --disable-systemd
|
dnl disable with --disable-systemd
|
||||||
AC_DEFUN([AX_AVAILABLE_SYSTEMD], [
|
AC_DEFUN([AX_AVAILABLE_SYSTEMD], [
|
||||||
AX_ALLOW_SYSTEMD_OPTS()
|
AX_ALLOW_SYSTEMD_OPTS()
|
||||||
AX_CHECK_SYSTEMD_ENABLE_AVAILABLE()
|
|
||||||
AX_CHECK_SYSTEMD()
|
AX_CHECK_SYSTEMD()
|
||||||
])
|
])
|
||||||
Vendored
+1
-484
@@ -626,8 +626,6 @@ ac_subst_vars='LTLIBOBJS
|
|||||||
LIBOBJS
|
LIBOBJS
|
||||||
pvshim
|
pvshim
|
||||||
ninepfs
|
ninepfs
|
||||||
SYSTEMD_LIBS
|
|
||||||
SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_MODULES_LOAD
|
SYSTEMD_MODULES_LOAD
|
||||||
SYSTEMD_DIR
|
SYSTEMD_DIR
|
||||||
systemd
|
systemd
|
||||||
@@ -864,9 +862,7 @@ pixman_LIBS
|
|||||||
libzstd_CFLAGS
|
libzstd_CFLAGS
|
||||||
libzstd_LIBS
|
libzstd_LIBS
|
||||||
LIBNL3_CFLAGS
|
LIBNL3_CFLAGS
|
||||||
LIBNL3_LIBS
|
LIBNL3_LIBS'
|
||||||
SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_LIBS'
|
|
||||||
|
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
@@ -1621,10 +1617,6 @@ Some influential environment variables:
|
|||||||
LIBNL3_CFLAGS
|
LIBNL3_CFLAGS
|
||||||
C compiler flags for LIBNL3, overriding pkg-config
|
C compiler flags for LIBNL3, overriding pkg-config
|
||||||
LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config
|
LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config
|
||||||
SYSTEMD_CFLAGS
|
|
||||||
C compiler flags for SYSTEMD, overriding pkg-config
|
|
||||||
SYSTEMD_LIBS
|
|
||||||
linker flags for SYSTEMD, overriding pkg-config
|
|
||||||
|
|
||||||
Use these variables to override the choices made by `configure' or to help
|
Use these variables to override the choices made by `configure' or to help
|
||||||
it to find libraries and programs with nonstandard names/locations.
|
it to find libraries and programs with nonstandard names/locations.
|
||||||
@@ -3889,8 +3881,6 @@ esac
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -9540,223 +9530,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
pkg_failed=no
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
||||||
$as_echo_n "checking for SYSTEMD... " >&6; }
|
|
||||||
|
|
||||||
if test -n "$SYSTEMD_CFLAGS"; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
if test -n "$SYSTEMD_LIBS"; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test $pkg_failed = yes; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
_pkg_short_errors_supported=yes
|
|
||||||
else
|
|
||||||
_pkg_short_errors_supported=no
|
|
||||||
fi
|
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
|
|
||||||
else
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
|
|
||||||
fi
|
|
||||||
# Put the nasty error message in config.log where it belongs
|
|
||||||
echo "$SYSTEMD_PKG_ERRORS" >&5
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
pkg_failed=no
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
||||||
$as_echo_n "checking for SYSTEMD... " >&6; }
|
|
||||||
|
|
||||||
if test -n "$SYSTEMD_CFLAGS"; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
if test -n "$SYSTEMD_LIBS"; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test $pkg_failed = yes; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
_pkg_short_errors_supported=yes
|
|
||||||
else
|
|
||||||
_pkg_short_errors_supported=no
|
|
||||||
fi
|
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
else
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
fi
|
|
||||||
# Put the nasty error message in config.log where it belongs
|
|
||||||
echo "$SYSTEMD_PKG_ERRORS" >&5
|
|
||||||
|
|
||||||
systemd="n"
|
|
||||||
elif test $pkg_failed = untried; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
systemd="n"
|
|
||||||
else
|
|
||||||
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
||||||
$as_echo "yes" >&6; }
|
|
||||||
systemd="y"
|
|
||||||
fi
|
|
||||||
|
|
||||||
elif test $pkg_failed = untried; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
pkg_failed=no
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
||||||
$as_echo_n "checking for SYSTEMD... " >&6; }
|
|
||||||
|
|
||||||
if test -n "$SYSTEMD_CFLAGS"; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
if test -n "$SYSTEMD_LIBS"; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test $pkg_failed = yes; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
_pkg_short_errors_supported=yes
|
|
||||||
else
|
|
||||||
_pkg_short_errors_supported=no
|
|
||||||
fi
|
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
else
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
fi
|
|
||||||
# Put the nasty error message in config.log where it belongs
|
|
||||||
echo "$SYSTEMD_PKG_ERRORS" >&5
|
|
||||||
|
|
||||||
systemd="n"
|
|
||||||
elif test $pkg_failed = untried; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
systemd="n"
|
|
||||||
else
|
|
||||||
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
||||||
$as_echo "yes" >&6; }
|
|
||||||
systemd="y"
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
||||||
$as_echo "yes" >&6; }
|
|
||||||
systemd="y"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$enable_systemd" != "xno"; then :
|
if test "x$enable_systemd" != "xno"; then :
|
||||||
|
|
||||||
if test "x$systemd" = "xy" ; then :
|
if test "x$systemd" = "xy" ; then :
|
||||||
@@ -9766,262 +9539,6 @@ $as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
|
|||||||
|
|
||||||
systemd=y
|
systemd=y
|
||||||
|
|
||||||
|
|
||||||
pkg_failed=no
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
||||||
$as_echo_n "checking for SYSTEMD... " >&6; }
|
|
||||||
|
|
||||||
if test -n "$SYSTEMD_CFLAGS"; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
if test -n "$SYSTEMD_LIBS"; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test $pkg_failed = yes; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
_pkg_short_errors_supported=yes
|
|
||||||
else
|
|
||||||
_pkg_short_errors_supported=no
|
|
||||||
fi
|
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
|
|
||||||
else
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
|
|
||||||
fi
|
|
||||||
# Put the nasty error message in config.log where it belongs
|
|
||||||
echo "$SYSTEMD_PKG_ERRORS" >&5
|
|
||||||
|
|
||||||
|
|
||||||
pkg_failed=no
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
||||||
$as_echo_n "checking for SYSTEMD... " >&6; }
|
|
||||||
|
|
||||||
if test -n "$SYSTEMD_CFLAGS"; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
if test -n "$SYSTEMD_LIBS"; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test $pkg_failed = yes; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
_pkg_short_errors_supported=yes
|
|
||||||
else
|
|
||||||
_pkg_short_errors_supported=no
|
|
||||||
fi
|
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
else
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
fi
|
|
||||||
# Put the nasty error message in config.log where it belongs
|
|
||||||
echo "$SYSTEMD_PKG_ERRORS" >&5
|
|
||||||
|
|
||||||
as_fn_error $? "Package requirements (libsystemd >= 209) were not met:
|
|
||||||
|
|
||||||
$SYSTEMD_PKG_ERRORS
|
|
||||||
|
|
||||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
||||||
installed software in a non-standard prefix.
|
|
||||||
|
|
||||||
Alternatively, you may set the environment variables SYSTEMD_CFLAGS
|
|
||||||
and SYSTEMD_LIBS to avoid the need to call pkg-config.
|
|
||||||
See the pkg-config man page for more details." "$LINENO" 5
|
|
||||||
elif test $pkg_failed = untried; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
||||||
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
|
|
||||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
|
||||||
path to pkg-config.
|
|
||||||
|
|
||||||
Alternatively, you may set the environment variables SYSTEMD_CFLAGS
|
|
||||||
and SYSTEMD_LIBS to avoid the need to call pkg-config.
|
|
||||||
See the pkg-config man page for more details.
|
|
||||||
|
|
||||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
|
||||||
See \`config.log' for more details" "$LINENO" 5; }
|
|
||||||
else
|
|
||||||
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
||||||
$as_echo "yes" >&6; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
elif test $pkg_failed = untried; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
pkg_failed=no
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
||||||
$as_echo_n "checking for SYSTEMD... " >&6; }
|
|
||||||
|
|
||||||
if test -n "$SYSTEMD_CFLAGS"; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
if test -n "$SYSTEMD_LIBS"; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
|
|
||||||
elif test -n "$PKG_CONFIG"; then
|
|
||||||
if test -n "$PKG_CONFIG" && \
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
|
|
||||||
($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
||||||
test $ac_status = 0; }; then
|
|
||||||
pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null`
|
|
||||||
test "x$?" != "x0" && pkg_failed=yes
|
|
||||||
else
|
|
||||||
pkg_failed=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
pkg_failed=untried
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test $pkg_failed = yes; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
_pkg_short_errors_supported=yes
|
|
||||||
else
|
|
||||||
_pkg_short_errors_supported=no
|
|
||||||
fi
|
|
||||||
if test $_pkg_short_errors_supported = yes; then
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
else
|
|
||||||
SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd >= 209" 2>&1`
|
|
||||||
fi
|
|
||||||
# Put the nasty error message in config.log where it belongs
|
|
||||||
echo "$SYSTEMD_PKG_ERRORS" >&5
|
|
||||||
|
|
||||||
as_fn_error $? "Package requirements (libsystemd >= 209) were not met:
|
|
||||||
|
|
||||||
$SYSTEMD_PKG_ERRORS
|
|
||||||
|
|
||||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
||||||
installed software in a non-standard prefix.
|
|
||||||
|
|
||||||
Alternatively, you may set the environment variables SYSTEMD_CFLAGS
|
|
||||||
and SYSTEMD_LIBS to avoid the need to call pkg-config.
|
|
||||||
See the pkg-config man page for more details." "$LINENO" 5
|
|
||||||
elif test $pkg_failed = untried; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
||||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
||||||
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
|
|
||||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
|
||||||
path to pkg-config.
|
|
||||||
|
|
||||||
Alternatively, you may set the environment variables SYSTEMD_CFLAGS
|
|
||||||
and SYSTEMD_LIBS to avoid the need to call pkg-config.
|
|
||||||
See the pkg-config man page for more details.
|
|
||||||
|
|
||||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
|
||||||
See \`config.log' for more details" "$LINENO" 5; }
|
|
||||||
else
|
|
||||||
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
||||||
$as_echo "yes" >&6; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
|
|
||||||
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
||||||
$as_echo "yes" >&6; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$SYSTEMD_DIR" = x; then :
|
if test "x$SYSTEMD_DIR" = x; then :
|
||||||
|
|
||||||
SYSTEMD_DIR="\$(prefix)/lib/systemd/system/"
|
SYSTEMD_DIR="\$(prefix)/lib/systemd/system/"
|
||||||
|
|||||||