From a019e2b5c898629919a6b22e4cbadeac3e337fa8 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Tue, 17 Mar 2020 22:09:01 +0000 Subject: [PATCH 02/13] Enable turning of kinkd and iked --- Makefile.am | 2 +- configure.ac | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3d3f01b..358e97e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = lib spmd kinkd iked pskgen samples +SUBDIRS = $(subdirs) pskgen samples diff --git a/configure.ac b/configure.ac index 955ebe5..e04bb6f 100644 --- a/configure.ac +++ b/configure.ac @@ -15,8 +15,27 @@ AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_MAKE_SET RC_IF_INSTALL_OPTS +AC_CONFIG_SUBDIRS(lib spmd) + +AC_MSG_CHECKING(if --enable-kinkd option is specified) +AC_ARG_ENABLE(kinkd, + [ --enable-kinkd enable kinkd[yes]], + AC_MSG_RESULT($enable_kinkd), + AC_MSG_RESULT(default to yes) + enable_kinkd=yes + ac_configure_args="$ac_configure_args --enable-kinkd") + +if test "x$enable_kinkd" = xyes; then + AC_CONFIG_SUBDIRS(kinkd) +fi +AC_MSG_CHECKING(if --enable-iked option is specified) +AC_ARG_ENABLE(iked, [ --enable-iked build iked [yes]], + , [enable_iked=yes]) +AC_MSG_RESULT($enable_iked) +if test x"$enable_iked" = xyes; then + AC_CONFIG_SUBDIRS(iked) +fi -AC_CONFIG_SUBDIRS([lib spmd iked kinkd]) dnl Set the debug option by default for now. AC_MSG_CHECKING(if --enable-debug option is specified)