From 78b10682561c8b657be8348a7bedcd2ed7858d84 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 21 May 2012 22:12:28 +0200 Subject: build: Add option for disabling WISPr support --- configure.ac | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1f2b81ea..27104e6e 100644 --- a/configure.ac +++ b/configure.ac @@ -310,11 +310,6 @@ if (test -n "${path_systemdunit}"); then fi AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") -PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes, - AC_MSG_ERROR(GnuTLS library is required)) -AC_SUBST(GNUTLS_CFLAGS) -AC_SUBST(GNUTLS_LIBS) - PKG_CHECK_MODULES(XTABLES, xtables, dummy=yes, AC_MSG_ERROR(Xtables library is required)) AC_SUBST(XTABLES_CFLAGS) @@ -372,16 +367,31 @@ AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner], [enable_pacrunner=${enableval}]) AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no") -AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client], - [disable command line client]), - [disable_client=${enableval}]) -AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") +AC_ARG_ENABLE(wispr, AC_HELP_STRING([--disable-wispr], + [disable WISPr support]), + [enable_wispr=${enableval}]) +AM_CONDITIONAL(WISPR, test "${enable_wispr}" != "no") AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools], [disable testing tools]), [enable_tools=${enableval}]) AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no") +AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client], + [disable command line client]), + [disable_client=${enableval}]) +AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") + +if (test "${enable_wispr}" != "no"); then + PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes, + AC_MSG_ERROR(GnuTLS library is required)) +else + GNUTLS_CFLAGS="" + GNUTLS_LIBS="" +fi +AC_SUBST(GNUTLS_CFLAGS) +AC_SUBST(GNUTLS_LIBS) + if (test "${enable_loopback}" != "no"); then AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, AC_MSG_ERROR(inotify header files are required)) -- cgit v1.2.3