diff options
| author | Moritz Neeb <nt4u@kpvn.de> | 2012-03-15 22:36:10 +0100 |
|---|---|---|
| committer | Moritz Neeb <nt4u@kpvn.de> | 2012-03-15 22:36:10 +0100 |
| commit | c540ef25fd8c3b09eed3f72c012fd2939f94f301 (patch) | |
| tree | 4a82da90e9a38f2bb2b13137870309f5b6260fb3 | |
| parent | 989b61a6d2e4d4b7be3f64124858d47be7342f78 (diff) | |
| download | zeitgeist-c540ef25fd8c3b09eed3f72c012fd2939f94f301.tar.gz | |
disable-fts option implemented
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | extensions/Makefile.am | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 1a6f8a3e..3e75943e 100644 --- a/configure.ac +++ b/configure.ac @@ -82,18 +82,15 @@ AC_SUBST(DBUS_SERVICES_DIR) ################################################# -# Configure options: --enable-fts[=no]. +# Configure options: --disable-fts. ################################################# -AC_ARG_ENABLE([fts++], - [AS_HELP_STRING([--enable-fts++], - [Build with FTS++ extension])], - [ftspp="$withval"], [ftspp=no]) -AM_CONDITIONAL(HAVE_FTSPP, test "x$fts" = "xyes") +AC_ARG_ENABLE([fts], + AS_HELP_STRING([--disable-fts], [Build without FTS++ extension])) -# 1. enable-fts++ ok, or should it be called disable-fts? -# 2. in AC_CONFIG_FILES (below) the Makefiles for fts++ will still be added, -# since I don't know how to make a condition for AC_CONFIG_FILES. -# 3. dee-icu is an option only for fts++, isn't it? so what should be done if I call ./autogen.sh --with-dee-icu? +if test "x$enable_fts" = "x" ; then + enable_fts=yes +fi +AM_CONDITIONAL(HAVE_FTS, test "x$enable_fts" != "xno") AC_CONFIG_FILES([ Makefile @@ -146,7 +143,7 @@ ${PACKAGE}-${VERSION} Install Prefix: ${prefix} Optional dependencies - fts++: ${ftspp} + fts++: ${enable_fts} dee-icu: ${with_dee_icu} EOF diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 792637ae..060f36b8 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -1,4 +1,4 @@ -if HAVE_FTSPP +if HAVE_FTS SUBDIRS = fts++ endif |