Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable turning of kinkd and iked #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable turning of kinkd and iked #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

ACLOCAL_AMFLAGS = -I m4

SUBDIRS = lib spmd kinkd iked pskgen samples
SUBDIRS = $(subdirs) pskgen samples


22 changes: 21 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,29 @@ AC_PROG_INSTALL
AC_PROG_RANLIB
AC_PROG_MAKE_SET
RC_IF_INSTALL_OPTS
builddirs="lib spmd"

AC_CONFIG_SUBDIRS([lib spmd iked kinkd])
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
builddirs="$builddirs kinkd"
fi
AC_MSG_CHECKING(if --enable-iked option is specified)
AC_ARG_ENABLE(iked, [ --enable-iked build iked [yes]],
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Why are the two options formatted slightly differently, and why don't we add ac_configure_args to the iked part?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wrote the first one, then I noticed the option that was previously removed would work just needed to use the same variable. I can reformat them the same if you would like.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, just make them look consistent either way you want, so people don't wonder why they look different.

, [enable_iked=yes])
AC_MSG_RESULT($enable_iked)
if test x"$enable_iked" = xyes; then
builddirs="$builddirs iked"
fi


AC_CONFIG_SUBDIRS([$builddirs])
dnl Set the debug option by default for now.
AC_MSG_CHECKING(if --enable-debug option is specified)
AC_ARG_ENABLE(debug,
Expand Down