diff options
| author | Sage Weil <sage@newdream.net> | 2008-02-01 09:59:44 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2008-02-01 09:59:44 -0800 |
| commit | 1a6924367db7648d2e3065a1476f3806b70c553c (patch) | |
| tree | 99f38a8653b11ff721796c918ab6a1519ca7f13f | |
| parent | 4699935a273fbb2b5d43d619ad417ac2f551d09c (diff) | |
| download | ceph-1a6924367db7648d2e3065a1476f3806b70c553c.tar.gz | |
autoconf changes to build on a debian/testing machine
| -rw-r--r-- | INSTALL | 8 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/config.cc | 1 | ||||
| -rw-r--r-- | src/crush/CrushWrapper.h | 1 |
5 files changed, 13 insertions, 3 deletions
@@ -3,7 +3,7 @@ Installation Instructions If pulling from git, you first need to build the configure script with -$ ./reconf +$ ./autogen.sh Then, @@ -13,3 +13,9 @@ $ make Note that if the FUSE library is not found, the user-space fuse client will not be built. +If you are doing development, you may want to do + +$ CXXFLAGS="-g -pg" ./configure + +or similar to avoid the default (-g -O2), which includes optimizations +(-O2). @@ -2,3 +2,5 @@ Ceph - a scalable distributed file system ----------------------------------------- Please see http://ceph.sourceforge.net/ for current info. + +INSTALL for basic build instructions. diff --git a/configure.ac b/configure.ac index ecadc737131..e95c4de21cb 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ AS_IF([test "x$with_ccgnu" != xno], [AC_SUBST([LIBCCGNU2], ["-lccgnu2"]) AC_DEFINE([WITH_CCGNU], [1], [Define if you have ccgnu]) - LIBS="-lccgnu2 $LIBS" + LIBS="-lccgnu2 -ldl $LIBS" ], [if test "x$with_ccgnu" != xcheck; then AC_MSG_FAILURE( @@ -103,7 +103,7 @@ AC_FUNC_FORK AC_PROG_GCC_TRADITIONAL AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_FUNC_MALLOC +#AC_FUNC_MALLOC # this causes annoying rpl_malloc error on some machines; skip it AC_FUNC_MEMCMP AC_FUNC_MMAP AC_FUNC_REALLOC diff --git a/src/config.cc b/src/config.cc index bd19dd6d662..98831d9df73 100644 --- a/src/config.cc +++ b/src/config.cc @@ -16,6 +16,7 @@ #include "config.h" #include "include/types.h" #include <fstream> +#include <stdlib.h> //#define MDS_CACHE_SIZE 4*10000 -> <20mb //#define MDS_CACHE_SIZE 80000 62mb diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h index 4b8f9c662d1..f9c2ba2c578 100644 --- a/src/crush/CrushWrapper.h +++ b/src/crush/CrushWrapper.h @@ -11,6 +11,7 @@ #include "include/encodable.h" +#include <stdlib.h> #include <map> #include <set> |