From 321cae64b9f12f4e18053ea6dfb306b020f95ea6 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 12 Jan 2011 23:14:17 +0200 Subject: [PATCH] * updato to build system, don't require too new libtool --- configure.ac | 9 +++++---- src/Makefile.am | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ab1fca7a..21671612 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,10 @@ AC_CONFIG_MACRO_DIR([m4]) # silent build if we have a new enough automake m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -# instead of AM_PROG_LIBTOOL -LT_INIT([disable-shared]) +# for now, use AM_PROG_LIBTOOL, as we don't want to require +# a too new setup for autotools/libtool +AM_PROG_LIBTOOL +#LT_INIT([disable-shared]) AS_IF([test x$prefix = xNONE],[ prefix=/usr/local]) @@ -159,8 +161,7 @@ AC_SUBST(XAPIAN_LIBS) # note that MU_XAPIAN_DB_VERSION does not necessarily follow MU # versioning, as we hopefully don't have updates for each version; # also, this has nothing to do with Xapian's software version -AC_DEFINE(MU_XAPIAN_DB_VERSION,["9.0"], [Schema version of the database]) - +AC_DEFINE(MU_XAPIAN_DB_VERSION,["9.0"], ['Schema' version of the database]) # we test for gtk, which we need if we want to build 'mug'; for # experiments it can try to build with gtk3, but since that is still diff --git a/src/Makefile.am b/src/Makefile.am index edf68505..537e9e04 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,7 @@ mu_LDADD= \ libmu_la_SOURCES= \ mu-bookmarks.c \ mu-bookmarks.h \ + mu-cmd-extract.c \ mu-cmd-find.c \ mu-cmd-index.c \ mu-cmd.c \