Mercurial > dovecot > core-2.2
changeset 12442:e0b42fcf31a1
configure: --with-systemdsystemunitdir wasn't working right.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Thu, 18 Nov 2010 18:49:34 +0000 |
parents | ae5b5961a6a7 |
children | 94c5d2189006 |
files | configure.in |
diffstat | 1 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Thu Nov 18 18:38:08 2010 +0000 +++ b/configure.in Thu Nov 18 18:49:34 2010 +0000 @@ -219,6 +219,20 @@ ) AC_SUBST(statedir) +AC_ARG_WITH([systemdsystemunitdir], +AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files (auto=detect)]), [ + if test "$withval" = "auto"; then + systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd` + elif test "$withval" != "no"; then + systemdsystemunitdir=$withval + fi +], []) +if test "$systemdsystemunitdir" != ""; then + AC_SUBST(systemdsystemunitdir) + AC_DEFINE(HAVE_SYSTEMD,, Define if you want to use systemd socket activation) +fi +AM_CONDITIONAL(BUILD_LUCENE, test "$systemdsystemunitdir" != "") + AC_ARG_WITH(gc, AS_HELP_STRING([--with-gc], [Use Boehm garbage collector]), TEST_WITH(gc, $withval), @@ -2624,15 +2638,6 @@ AC_SUBST(RUN_TEST) AC_SUBST(abs_top_builddir) -AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -if test "x$with_systemdsystemunitdir" != xno; then - AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) - AC_DEFINE(HAVE_SYSTEMD,, Define if you want to use systemd socket activation) -fi -AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) - AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ Makefile