* updato to build system, don't require too new libtool

This commit is contained in:
Dirk-Jan C. Binnema 2011-01-12 23:14:17 +02:00
parent eb6ca790fb
commit 321cae64b9
2 changed files with 6 additions and 4 deletions

View File

@ -26,8 +26,10 @@ AC_CONFIG_MACRO_DIR([m4])
# silent build if we have a new enough automake # silent build if we have a new enough automake
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# instead of AM_PROG_LIBTOOL # for now, use AM_PROG_LIBTOOL, as we don't want to require
LT_INIT([disable-shared]) # a too new setup for autotools/libtool
AM_PROG_LIBTOOL
#LT_INIT([disable-shared])
AS_IF([test x$prefix = xNONE],[ AS_IF([test x$prefix = xNONE],[
prefix=/usr/local]) prefix=/usr/local])
@ -159,8 +161,7 @@ AC_SUBST(XAPIAN_LIBS)
# note that MU_XAPIAN_DB_VERSION does not necessarily follow MU # note that MU_XAPIAN_DB_VERSION does not necessarily follow MU
# versioning, as we hopefully don't have updates for each version; # versioning, as we hopefully don't have updates for each version;
# also, this has nothing to do with Xapian's software 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 # 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 # experiments it can try to build with gtk3, but since that is still

View File

@ -48,6 +48,7 @@ mu_LDADD= \
libmu_la_SOURCES= \ libmu_la_SOURCES= \
mu-bookmarks.c \ mu-bookmarks.c \
mu-bookmarks.h \ mu-bookmarks.h \
mu-cmd-extract.c \
mu-cmd-find.c \ mu-cmd-find.c \
mu-cmd-index.c \ mu-cmd-index.c \
mu-cmd.c \ mu-cmd.c \