fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-09 23:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/autotools: cleanup udev-dir option in configure.ac

Browse source 
- also accept empty value to autodetect. This makes it similar
  to what is done with meson.
- log the chosen udev-dir.
- use ${prefix} instead of $(prefix). It's usually used at other
  places.
This commit is contained in:
Thomas Haller 2022-05-11 15:16:58 +02:00
parent bddffb1731
commit 331a7c9943
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -306,11 +306,12 @@ AC_ARG_WITH(udev-dir,
[Absolute path of the udev base directory. Set to 'no' not to install the udev rules]),
[], [with_udev_dir="yes"])
if test "$with_udev_dir" != 'no'; then
if test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'; then
AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'])
fi
if test "$with_udev_dir" = 'yes'; then
with_udev_dir="\$(prefix)/lib/udev"
if test "$with_udev_dir" = 'yes' -o "$with_udev_dir" = "" ; then
with_udev_dir="\${prefix}/lib/udev"
else
if printf '%s' "$with_udev_dir" | grep -v -q '^/'; then
AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'])
fi
fi
UDEV_DIR="$with_udev_dir"
AC_SUBST(UDEV_DIR)
@ -1364,6 +1365,7 @@ echo " localstatedir: $localstatedir"
echo " runstatedir: $runstatedir"
echo " datadir: $datadir"
echo " systemdunitdir: $with_systemdsystemunitdir"
echo " udev-dir: $with_udev_dir"
echo " nmbinary: $nmbinary"
echo " nmconfdir: $nmconfdir"
echo " nmlibdir: $nmlibdir"