netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] configure.ac: Add --without-{mysql,pgsql}
@ 2015-05-03 14:23 Harald Welte
  2015-05-15 21:44 ` Eric Leblond
  0 siblings, 1 reply; 2+ messages in thread
From: Harald Welte @ 2015-05-03 14:23 UTC (permalink / raw)
  To: netfilter-devel; +Cc: Harald Welte

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], [], [:])
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] configure.ac: Add --without-{mysql,pgsql}
  2015-05-03 14:23 [PATCH] configure.ac: Add --without-{mysql,pgsql} Harald Welte
@ 2015-05-15 21:44 ` Eric Leblond
  0 siblings, 0 replies; 2+ messages in thread
From: Eric Leblond @ 2015-05-15 21:44 UTC (permalink / raw)
  To: Harald Welte; +Cc: netfilter-devel

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>


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-05-15 21:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-03 14:23 [PATCH] configure.ac: Add --without-{mysql,pgsql} Harald Welte
2015-05-15 21:44 ` Eric Leblond

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).