emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* configure.ac/Makfile.am: add m4 as a macro dir, require stdc

This commit is contained in:
Dirk-Jan C. Binnema 2010-12-07 23:10:05 +02:00
parent 68af173246
commit a53f549d07
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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

22
configure.ac
View File

@ -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