From a53f549d07314f329dcaad98ba2ff4266034a40a Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 7 Dec 2010 23:10:05 +0200 Subject: [PATCH] * configure.ac/Makfile.am: add m4 as a macro dir, require stdc --- Makefile.am | 2 ++ configure.ac | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 156b1b2a..bde3c201 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,8 @@ include $(top_srcdir)/gtest.mk SUBDIRS=man src contrib toys +ACLOCAL_AMFLAGS=-I m4 + # so we can say 'make test' check: test cleanupnote diff --git a/configure.ac b/configure.ac index 913e7334..7808934b 100644 --- a/configure.ac +++ b/configure.ac @@ -19,25 +19,21 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/mu.cc]) AM_INIT_AUTOMAKE([dist-bzip2]) +# libtoolize wants to put some stuff in here +AC_CONFIG_MACRO_DIR([m4]) + # silent build AM_SILENT_RULES([yes]) -# we set the set the version of the Xapian database layout here; it -# will become part of the db name, so we can automatically recreate the -# database when we incompatible have changes. -# -# 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]) - LT_INIT # don't use AC_PROG_LIBTOOL anymore AS_IF([test x$prefix = xNONE],[ prefix=/usr/local]) AC_SUBST(prefix) + AC_PROG_CC +AC_PROG_CC_STDC AC_PROG_CXX AC_HEADER_STDC @@ -127,6 +123,14 @@ AS_IF([test "x$XAPIAN" = "xno"],[ AC_SUBST(XAPIAN_CXXFLAGS) AC_SUBST(XAPIAN_LIBS) +# we set the set the version of the Xapian database layout here; it +# will become part of the db name, so we can automatically recreate the +# database when we incompatible have changes. +# +# 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]) # we test for gtk, which we need if we want to build 'mug'; for