release/src/router/dnscrypt/packages/gentoo/net-dns/dnscrypt-proxy/files/0001-Handle-disable-plugins-correctly-in-configure.ac.patch

   1 From 3bc510635e4e03b8546c0edb88f5f5cff77724e0 Mon Sep 17 00:00:00 2001
   2 From: Sven Grunewaldt <strayer@olle-orks.org>
   3 Date: Thu, 31 Oct 2013 21:06:11 +0100
   4 Subject: [PATCH] Handle --disable-plugins* correctly in configure.ac
   5
   6 ---
   7  configure.ac | 24 ++++++++++++++++++------
   8  1 file changed, 18 insertions(+), 6 deletions(-)
   9
  10 diff --git a/configure.ac b/configure.ac
  11 index 2c0e8c1..8560275 100644
  12 --- a/configure.ac
  13 +++ b/configure.ac
  14 @@ -69,22 +69,34 @@ AC_ARG_ENABLE(debug,
  15  plugins=disabled
  16  AC_ARG_ENABLE(plugins,
  17  [AS_HELP_STRING(--enable-plugins,Enable support for plugins - experimental)],
  18 -[CPPFLAGS="$CPPFLAGS -DPLUGINS=1"
  19 - plugins=enabled])
  20 +[
  21 +       AS_IF([test "x$enableval" != "xno"], [
  22 +               CPPFLAGS="$CPPFLAGS -DPLUGINS=1"
  23 +               plugins=enabled
  24 +       ])
  25 +])
  26  AM_CONDITIONAL(PLUGINS, test x$plugins = xenabled)
  27
  28  relaxed_plugins_permissions=disabled
  29  AC_ARG_ENABLE(relaxed-plugins-permissions,
  30  [AS_HELP_STRING(--enable-relaxed-plugins-permissions,Allow loading plugins owned by other users)],
  31 -[CPPFLAGS="$CPPFLAGS -DRELAXED_PLUGINS_PERMISSIONS=1"
  32 - relaxed_plugins_permissions=enabled])
  33 +[
  34 +       AS_IF([test "x$enableval" != "xno"], [
  35 +               CPPFLAGS="$CPPFLAGS -DRELAXED_PLUGINS_PERMISSIONS=1"
  36 +               relaxed_plugins_permissions=enabled
  37 +       ])
  38 +])
  39  AM_CONDITIONAL(RELAXED_PLUGINS_PERMISSIONS, test x$relaxed_plugins_permissions = xenabled)
  40
  41  plugins_root=disabled
  42  AC_ARG_ENABLE(plugins-root,
  43  [AS_HELP_STRING(--enable-plugins-root,Only load plugins sitting in the default plugins directory)],
  44 -[CPPFLAGS="$CPPFLAGS -DENABLE_PLUGINS_ROOT=1"
  45 - plugins_root=enabled])
  46 +[
  47 +       AS_IF([test "x$enableval" != "xno"], [
  48 +               CPPFLAGS="$CPPFLAGS -DENABLE_PLUGINS_ROOT=1"
  49 +               plugins_root=enabled
  50 +       ])
  51 +])
  52  AM_CONDITIONAL(ENABLE_PLUGINS_ROOT, test x$plugins_root = xenabled)
  53
  54  AC_SUBST([MAINT])
  55 --
  56 1.8.4.1
  57