added installation instructions, more autoconf cleanups

This commit is contained in:
Sears Russell 2009-04-18 04:58:51 +00:00
parent 434a5fdb55
commit f864f6f66c
3 changed files with 31 additions and 22 deletions

29
INSTALL Normal file
View file

@ -0,0 +1,29 @@
Prerequisites (ubuntu/debian):
autoconf build-essential cmake
Recommended build procedure:
./bootstrap ; mkdir build ; cd build ; cmake ..
make -j 4
cd test ; make test
Optional dependencies:
flex yacc (for a relational algebra language demo)
fuse (for a fuse demo)
swig (for python bindings)
libconfuse
Berkeley DB (for performance comparisons)
Obsolete build procedure
=========================
(Uses automake and libtool)
./reconf ; ./configure --quiet
make -j 4
Extra requirements for obsolete build:
automake libtool

View file

@ -14,3 +14,5 @@ find . | perl -ne 'print if (/\/storefile.txt$/)' | xargs rm -f
find . | perl -ne 'print if (/\/logfile.txt$/)' | xargs rm -f find . | perl -ne 'print if (/\/logfile.txt$/)' | xargs rm -f
find . | perl -ne 'print if (/\/blob._file.txt$/)' | xargs rm -f find . | perl -ne 'print if (/\/blob._file.txt$/)' | xargs rm -f
rm -f test/gmon.out test/lladd/gmon.out rm -f test/gmon.out test/lladd/gmon.out
rm -f m4/ltsugar.m4 m4/libtool.m4 m4/ltversion.m4 m4/lt~obsolete.m4 m4/ltoptions.m4
rm -f configure.in

View file

@ -3,8 +3,6 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([Stasis],[0.1],[sears@cs.berkeley.edu]) AC_INIT([Stasis],[0.1],[sears@cs.berkeley.edu])
#AM_INIT_AUTOMAKE() #hello,0.1)
#AM_INIT_AUTOMAKE([subdir-objects]) # @todo use subdir-objects once transition to libtool is done.
AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADER([config.h])
@ -12,11 +10,8 @@ AC_CONFIG_HEADER([config.h])
#AC_PROG_CXX #AC_PROG_CXX
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
#AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
## Need AC_PROG_LIBTOOL
#AC_PROG_LIBTOOL
AC_PROG_AWK AC_PROG_AWK
AC_PROG_RANLIB AC_PROG_RANLIB
AC_PROG_YACC AC_PROG_YACC
@ -25,7 +20,6 @@ AC_PROG_LEX
# For SWIG & Python # For SWIG & Python
# AC_PROG_LIBTOOL # AC_PROG_LIBTOOL
#AM_PATH_PYTHON(2.3)
AC_PROG_SWIG(1.3) AC_PROG_SWIG(1.3)
SWIG_ENABLE_CXX SWIG_ENABLE_CXX
SWIG_PYTHON SWIG_PYTHON
@ -52,27 +46,11 @@ if test "$db_cv_open_o_direct" = "yes"; then
AH_TEMPLATE(HAVE_O_DIRECT, [Define to 1 if you have the O_DIRECT flag.]) AH_TEMPLATE(HAVE_O_DIRECT, [Define to 1 if you have the O_DIRECT flag.])
fi fi
AC_CHECK_LIB([check], [suite_create])
AC_CHECK_LIB([check], [suite_create],
have_libcheck=yes,
have_libcheck=no)
#if test x$have_libcheck = xyes ; then
##AM_CONDITIONAL(HAVE_LIBCHECK, true)
#else
##AM_CONDITIONAL(HAVE_LIBCHECK, false)
#AC_MSG_WARN([Check not found; cannot run unit tests!])
#fi
AC_CHECK_LIB([m], [sqrt]) AC_CHECK_LIB([m], [sqrt])
AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([pthread], [pthread_create])
AC_CONFIG_DB AC_CONFIG_DB
#AM_CONDITIONAL(DB_ENABLED, test $DB_ENABLED = 1)
if test x$build_benchmarks = xyes ; then if test x$build_benchmarks = xyes ; then
if test $DB_ENABLED = 0; then if test $DB_ENABLED = 0; then
AC_MSG_WARN([Could not find Berkeley DB; some benchmarks will not be built]) AC_MSG_WARN([Could not find Berkeley DB; some benchmarks will not be built])