mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-04 15:21:12 +00:00
build: move paths of dhcp clients from config-extra.h to config.h
Some path variable like $(bindir), $(datadir), etc. are special for
autotools and must be handled separately through config-extra.h.
But dhcp path variables are just normal variables defined through
the configure script and should go into config.h.
(cherry picked from commit 087c367d62
)
This commit is contained in:
parent
b66607af95
commit
4fd6623161
|
@ -120,9 +120,6 @@ config-extra.h: Makefile
|
|||
echo "/* Generated by Makefile.am */" >$@ && \
|
||||
echo "#define BINDIR \"$(bindir)\"" >>$@ && \
|
||||
echo "#define DATADIR \"$(datadir)\"" >>$@ && \
|
||||
echo "#define DHCLIENT_PATH \"$(DHCLIENT_PATH)\"" >>$@ && \
|
||||
echo "#define DHCPCANON_PATH \"$(DHCPCANON_PATH)\"" >>$@ && \
|
||||
echo "#define DHCPCD_PATH \"$(DHCPCD_PATH)\"" >>$@ && \
|
||||
echo "#define LIBEXECDIR \"$(libexecdir)\"" >>$@ && \
|
||||
echo "#define LOCALSTATEDIR \"$(localstatedir)\"" >>$@ && \
|
||||
echo "#define NMCONFDIR \"$(nmconfdir)\"" >>$@ && \
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
#mesondefine BINDIR
|
||||
#mesondefine DATADIR
|
||||
#mesondefine DHCLIENT_PATH
|
||||
#mesondefine DHCPCANON_PATH
|
||||
#mesondefine DHCPCD_PATH
|
||||
#mesondefine LIBEXECDIR
|
||||
#mesondefine LOCALSTATEDIR
|
||||
#mesondefine NMCONFDIR
|
||||
|
|
|
@ -822,7 +822,7 @@ if test "$with_dhcpcanon" != "no"; then
|
|||
fi
|
||||
if test "$with_dhcpcanon" != "no"; then
|
||||
AC_DEFINE(WITH_DHCPCANON, 1, [Define if you have dhcpcanon])
|
||||
AC_SUBST(DHCPCANON_PATH, $with_dhcpcanon)
|
||||
AC_DEFINE_UNQUOTED(DHCPCANON_PATH, "$with_dhcpcanon", [Define path to dhcpcanon])
|
||||
else
|
||||
AC_DEFINE(WITH_DHCPCANON, 0, [Define if you have dhcpcanon])
|
||||
fi
|
||||
|
@ -855,7 +855,7 @@ if test "$with_dhclient" != "no"; then
|
|||
fi
|
||||
if test "$with_dhclient" != "no"; then
|
||||
AC_DEFINE(WITH_DHCLIENT, 1, [Define if you have dhclient])
|
||||
AC_SUBST(DHCLIENT_PATH, $with_dhclient)
|
||||
AC_DEFINE_UNQUOTED(DHCLIENT_PATH, "$with_dhclient", [Define path to dhclient])
|
||||
else
|
||||
AC_DEFINE(WITH_DHCLIENT, 0, [Define if you have dhclient])
|
||||
fi
|
||||
|
@ -874,7 +874,7 @@ if test "$with_dhcpcd" != "no"; then
|
|||
fi
|
||||
if test "$with_dhcpcd" != "no"; then
|
||||
AC_DEFINE(WITH_DHCPCD, 1, [Define if you have dhcpcd])
|
||||
AC_SUBST(DHCPCD_PATH, $with_dhcpcd)
|
||||
AC_DEFINE_UNQUOTED(DHCPCD_PATH, "$with_dhcpcd", [Define path to dhcpcd])
|
||||
else
|
||||
AC_DEFINE(WITH_DHCPCD, 0, [Define if you have dhcpcd])
|
||||
fi
|
||||
|
|
|
@ -885,15 +885,6 @@ config_extra_h = configuration_data()
|
|||
|
||||
config_extra_h.set_quoted('BINDIR', nm_bindir)
|
||||
config_extra_h.set_quoted('DATADIR', nm_datadir)
|
||||
if enable_dhclient
|
||||
config_extra_h.set_quoted('DHCLIENT_PATH', dhclient.path())
|
||||
endif
|
||||
if enable_dhcpcanon
|
||||
config_extra_h.set_quoted('DHCPCANON_PATH', dhcpcanon.path())
|
||||
endif
|
||||
if enable_dhcpcd
|
||||
config_extra_h.set_quoted('DHCPCD_PATH', dhcpcd.path())
|
||||
endif
|
||||
config_extra_h.set_quoted('LIBEXECDIR', nm_libexecdir)
|
||||
config_extra_h.set_quoted('LOCALSTATEDIR', nm_localstatedir)
|
||||
config_extra_h.set_quoted('NMCONFDIR', nm_pkgconfdir)
|
||||
|
|
Loading…
Reference in a new issue