On Wed, Nov 13, 2013 at 10:22 PM, Patrik Flykt
<patrik.fl...@linux.intel.com> wrote:
> The client test program is the only one to be built so far.
> ---
> Makefile.am | 15 +++++++++++++++
> configure.ac | 9 +++++++++
> src/dhcp/Makefile | 1 +
> 3 files changed, 25 insertions(+)
> create mode 120000 src/dhcp/Makefile
>
> diff --git a/Makefile.am b/Makefile.am
> index 789ca02..cc52f01 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -3739,6 +3739,21 @@ lib_LTLIBRARIES += \
> endif
>
> #
> ------------------------------------------------------------------------------
> +if ENABLE_DHCP
Maybe we just as well could put this under ENABLE_NETWORKD, to avoid
introducing two config switches? (And I certainly don't want to ifdef
out dhcp support in networkd)
> +test_dhcp_client_SOURCES = \
> + src/dhcp/protocol.h \
> + src/dhcp/client.h \
> + src/dhcp/client.c \
> + src/dhcp/test-dhcp-client.c
> +
> +test_dhcp_client_LDADD = \
> + libsystemd-shared.la
> +
> +tests += \
> + test-dhcp-client
> +endif
> +
> +#
> ------------------------------------------------------------------------------
> if ENABLE_MACHINED
> systemd_machined_SOURCES = \
> src/machine/machined.c \
> diff --git a/configure.ac b/configure.ac
> index d0bfcb8..0c28368 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -714,6 +714,14 @@ fi
> AM_CONDITIONAL(ENABLE_RFKILL, [test "$have_rfkill" = "yes"])
>
> #
> ------------------------------------------------------------------------------
> +have_dhcp=no
> +AC_ARG_ENABLE(dhcp, AS_HELP_STRING([--disable-dhcp], [disable dhcp]))
> +if test "x$enable_dhcp" != "xno"; then
> + have_dhcp=yes
> +fi
> +AM_CONDITIONAL(ENABLE_DHCP, [test "$have_dhcp" = "yes"])
> +
> +#
> ------------------------------------------------------------------------------
> have_logind=no
> AC_ARG_ENABLE(logind, AS_HELP_STRING([--disable-logind], [disable login
> daemon]))
> if test "x$enable_logind" != "xno"; then
> @@ -1060,6 +1068,7 @@ AC_MSG_RESULT([
> randomseed: ${have_randomseed}
> backlight: ${have_backlight}
> rfkill: ${have_rfkill}
> + dhcp: ${have_dhcp}
> logind: ${have_logind}
> machined: ${have_machined}
> hostnamed: ${have_hostnamed}
> diff --git a/src/dhcp/Makefile b/src/dhcp/Makefile
> new file mode 120000
> index 0000000..d0b0e8e
> --- /dev/null
> +++ b/src/dhcp/Makefile
> @@ -0,0 +1 @@
> +../Makefile
> \ No newline at end of file
> --
> 1.7.10.4
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
