netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Leblond <eric@regit.org>
To: Harald Welte <laforge@gnumonks.org>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH] configure.ac: Add --without-{mysql,pgsql}
Date: Fri, 15 May 2015 23:44:48 +0200	[thread overview]
Message-ID: <1431726288.29730.28.camel@regit.org> (raw)
In-Reply-To: <1430663032-12704-1-git-send-email-laforge@gnumonks.org>

Hello Harald,

Thanks for the patch! I've just pushed it to the master branch.

BR,
--
Eric

On Sun, 2015-05-03 at 16:23 +0200, Harald Welte wrote:
> In some cases you may not want to build a certain output plugin, even
> if the headers/libraries actually exist on the build host.
> ---
>  configure.ac | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index c814bec..1a7f8de 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -85,7 +85,10 @@ if [! test "x$enable_nfacct" = "xyes"]; then
>  	enable_nfacct="no"
>  fi
>  
> -CT_CHECK_POSTGRES_DB()
> +AC_ARG_WITH([pgsql], AS_HELP_STRING([--without-pgsql], [Build without postgresql output plugin [default=test]]))
> +AS_IF([test "x$with_pgsql" != "xno"], [
> +	CT_CHECK_POSTGRES_DB()
> +])
>  AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x")
>  if test "x$PQLIBPATH" != "x"; then
>  	enable_pgsql="yes"
> @@ -93,7 +96,10 @@ else
>  	enable_pgsql="no"
>  fi
>  
> -CT_CHECK_MYSQL_DB()
> +AC_ARG_WITH([mysql], AS_HELP_STRING([--without-mysql], [Build without mysql output plugin [default=test]]))
> +AS_IF([test "x$with_mysql" != "xno"], [
> +	CT_CHECK_MYSQL_DB()
> +])
>  AM_CONDITIONAL(HAVE_MYSQL, test "x$MYSQL_LIB" != "x")
>  if test "x$MYSQL_LIB" != "x"; then
>  	enable_mysql="yes"
> @@ -101,6 +107,7 @@ else
>  	enable_mysql="no"
>  fi
>  
> +
>  AC_ARG_WITH([sqlite], AS_HELP_STRING([--without-sqlite], [Build without SQLITE3 output plugin [default=test]]))
>  AS_IF([test "x$with_sqlite" != "xno"], [
>      PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])

-- 
Eric Leblond <eric@regit.org>


      reply	other threads:[~2015-05-15 21:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-03 14:23 [PATCH] configure.ac: Add --without-{mysql,pgsql} Harald Welte
2015-05-15 21:44 ` Eric Leblond [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431726288.29730.28.camel@regit.org \
    --to=eric@regit.org \
    --cc=laforge@gnumonks.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).