diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
commit | b6f496f8619b02c50d3f5ced34eff279244b6e9b (patch) | |
tree | d534a1941848a4f9577076cd11330f3ee014033c /configure.ac | |
parent | a27e249e445deecb1d9ef57fbbb203d71bf061dd (diff) | |
parent | 162c9e91e970cc9475bc86ffd00fd1d939e1e487 (diff) | |
download | rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.gz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.xz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.zip |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e1bc248c..2f17e575 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[3.21.6-Test1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.23.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_HEADERS([config.h]) @@ -156,6 +156,28 @@ fi +# Additional module directories +AC_ARG_WITH(moddirs, + [AS_HELP_STRING([--with-moddirs=DIRS],[Additional module search paths appended to @<:@$libdir/rsyslog@:>@])], + [_save_IFS=$IFS ; IFS=$PATH_SEPARATOR ; moddirs="" + for w in ${with_moddirs} ; + do + case $w in + "") continue ;; */) ;; *) w="${w}/" ;; + esac + for m in ${moddirs} ; + do + test "x$w" = "x${libdir}/${PACKAGE}/" || \ + test "x$w" = "x$m" || test "x$w" = "x/" && \ + continue 2 + done + case $moddirs in + "") moddirs="$w" ;; *) moddirs="${moddirs}:${w}" ;; + esac + done ; IFS=$_save_IFS],[moddirs=""] +) +AM_CONDITIONAL(WITH_MODDIRS, test x$moddirs != x) +AC_SUBST(moddirs) # Large file support AC_ARG_ENABLE(largefile, |