From: Kern Sibbald Date: Thu, 25 Sep 2008 19:43:35 +0000 (+0000) Subject: Implement ./configure --with-plugindir=xxx X-Git-Tag: Release-7.0.0~4087 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1aa08424563640fb35c9ddec1c816b1557839492;p=bacula%2Fbacula Implement ./configure --with-plugindir=xxx git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7645 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 1c45c017c1..77ac433bb1 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1006,6 +1006,22 @@ AC_ARG_WITH(scriptdir, AC_SUBST(scriptdir) +# ------------------------------------------ +# Where to place plugindir (script files) +# ------------------------------------------ +plugindir=`eval echo ${sysconfdir}` +AC_ARG_WITH(plugindir, + [ --with-plugindir=PATH specify path of Bacula plugins directory], + [ + if test "x$withval" != "xno" ; then + plugindir=$withval + fi + ] +) + +AC_SUBST(plugindir) + + # ------------------------------------------ # Where to send dump email # ------------------------------------------ diff --git a/bacula/configure b/bacula/configure index 1b847dc554..9afe47dd81 100755 --- a/bacula/configure +++ b/bacula/configure @@ -808,6 +808,7 @@ OPENSSL_INC working_dir archivedir scriptdir +plugindir dump_email job_email smtp_host @@ -1506,6 +1507,7 @@ Optional Packages: --with-working-dir=PATH specify path of Bacula working directory --with-archivedir=PATH specify path of SD archive directory --with-scriptdir=PATH specify path of Bacula scripts directory + --with-plugindir=PATH specify path of Bacula plugins directory --with-dump-email=EMAIL dump email address --with-job-email=EMAIL job output email address --with-smtp-host=HOST SMTP mail host address @@ -21024,6 +21026,25 @@ fi +# ------------------------------------------ +# Where to place plugindir (script files) +# ------------------------------------------ +plugindir=`eval echo ${sysconfdir}` + +# Check whether --with-plugindir was given. +if test "${with_plugindir+set}" = set; then + withval=$with_plugindir; + if test "x$withval" != "xno" ; then + plugindir=$withval + fi + + +fi + + + + + # ------------------------------------------ # Where to send dump email # ------------------------------------------ @@ -35781,6 +35802,7 @@ OPENSSL_INC!$OPENSSL_INC$ac_delim working_dir!$working_dir$ac_delim archivedir!$archivedir$ac_delim scriptdir!$scriptdir$ac_delim +plugindir!$plugindir$ac_delim dump_email!$dump_email$ac_delim job_email!$job_email$ac_delim smtp_host!$smtp_host$ac_delim @@ -35842,7 +35864,7 @@ DISTVER!$DISTVER$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 88d35c37e0..523bcb27c1 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -19,6 +19,7 @@ remove reader/writer in FOPTS???? General: 25Sep08 +kes Implement ./configure --with-plugindir=xxx ebl Fix the mysql bug in the new accurate code kes Improve plugin debug. Create plugin test. kes Set main thread specific data to INVALID because it