Skip to content

Commit

Permalink
autoconf changes to build on a debian/testing machine
Browse files Browse the repository at this point in the history
  • Loading branch information
liewegas committed Feb 1, 2008
1 parent 4699935 commit 1a69243
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
8 changes: 7 additions & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Installation Instructions

If pulling from git, you first need to build the configure script with

$ ./reconf
$ ./autogen.sh

Then,

Expand All @@ -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 changes: 2 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ Ceph - a scalable distributed file system
-----------------------------------------

Please see http://ceph.sourceforge.net/ for current info.

INSTALL for basic build instructions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/crush/CrushWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include "include/encodable.h"

#include <stdlib.h>
#include <map>
#include <set>

Expand Down

0 comments on commit 1a69243

Please sign in to comment.