From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sun, 27 Dec 2009 20:47:27 +0000 (+0100)
Subject: Let --enable-libtool and --disable-libtool determine if we build plugins and drop... 
X-Git-Tag: Release-7.0.0~2430^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6aa138462cd8b1edb03a3e05cac09087fa8ec864;p=bacula%2Fbacula

Let --enable-libtool and --disable-libtool determine if we build plugins and drop the extra configure option
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 3b71cbf3e2..8e3006313c 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -153,6 +153,8 @@ if test x$use_libtool != xno; then
    LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
    LIBTOOL_CLEAN_TARGET="libtool-clean"
    QMAKE_LIBTOOL="${BUILD_DIR}/libtool"
+   FD_PLUGIN_DIR="src/plugins/fd"
+   have_plugins=yes
 else
    DEFAULT_OBJECT_TYPE=".o"
    DEFAULT_ARCHIVE_TYPE=".a"
@@ -162,6 +164,8 @@ else
    LIBTOOL_UNINSTALL_TARGET=""
    LIBTOOL_CLEAN_TARGET=""
    QMAKE_LIBTOOL="# ${BUILD_DIR}/libtool"
+   FD_PLUGIN_DIR=""
+   have_plugins=no
 fi
 
 AC_SUBST(DEFAULT_OBJECT_TYPE)
@@ -172,6 +176,7 @@ AC_SUBST(LIBTOOL_INSTALL_TARGET)
 AC_SUBST(LIBTOOL_UNINSTALL_TARGET)
 AC_SUBST(LIBTOOL_CLEAN_TARGET)
 AC_SUBST(QMAKE_LIBTOOL)
+AC_SUBST(FD_PLUGIN_DIR)
 
 dnl --------------------------------------------------
 dnl Include file handling
@@ -1671,36 +1676,6 @@ AC_ARG_WITH(sbin-perm,
 
 AC_SUBST(SBINPERM)
 
-dnl --------------------------------------------------
-dnl plugin support
-dnl --------------------------------------------------
-have_plugins=yes
-AC_ARG_ENABLE(plugins,
-   AC_HELP_STRING([--enable-plugins], [enable plugin support @<:@default=yes@:>@]),
-   [
-       if test x$enableval = xno; then
-          have_plugins=no
-       fi
-   ]
-)
-
-if test "x$use_libtool" != "xyes" -a test "x$have_plugins" = "xyes"; then
-   echo " "
-   echo "You specified --enable-plugins but disabled libtool with --disable-libtool"
-   echo "We only support plugins using libtool so either disable plugins or enable libtool"
-   echo " "
-   echo "Aborting the configuration ..."
-   echo " "
-   echo " "
-   exit 1
-fi
-
-FD_PLUGIN_DIR=""
-if test "x$have_plugins" = "xyes" ; then
-   FD_PLUGIN_DIR="src/plugins/fd"
-fi
-AC_SUBST(FD_PLUGIN_DIR)
-
 dnl ------------------------------------------------
 dnl Bacula check for various SQL database engines
 dnl ------------------------------------------------