diff options
author | Sage Weil <sage@newdream.net> | 2008-01-28 11:39:51 -0800 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2008-01-28 11:39:51 -0800 |
commit | 307723dea810cdd6a1cdc4aff86565a6b156cd47 (patch) | |
tree | 7b86e7461bbe22d515eb5756dadfc024e3fdd933 | |
parent | 0e8e2731b629c23ac56979dea7317829066a4a51 (diff) | |
download | ceph-307723dea810cdd6a1cdc4aff86565a6b156cd47.tar.gz |
more automake fun
-rw-r--r-- | .gitignore | 14 | ||||
-rw-r--r--[l---------] | INSTALL | 16 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | src/.gitignore | 2 | ||||
-rw-r--r-- | src/include/atomic.h | 4 |
6 files changed, 40 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 57f6a5d0808..dfa5f3a18a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,20 @@ *.o +*.a *~ *.co -.depend +.deps web/*.html gmon.out core.* vgcore.* +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +stamp-h1 +depcomp +install-sh +missing diff --git a/INSTALL b/INSTALL index 5bb6e7b7e1a..c4ef142a116 120000..100644 --- a/INSTALL +++ b/INSTALL @@ -1 +1,15 @@ -/usr/share/automake-1.10/INSTALL
\ No newline at end of file +Installation Instructions +************************* + +If pulling from git, you first need to build the configure script with + +$ ./reconf + +Then, + +$ ./configure +$ make + +Note that if the FUSE library is not found, the user-space fuse client +will not be built. + diff --git a/Makefile.am b/Makefile.am index 4d07a852e46..90bfb263266 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ AUTOMAKE_OPTIONS = gnu -EXTRA_DIST = doc web reconf +EXTRA_DIST = web reconf SUBDIRS = src
\ No newline at end of file diff --git a/configure.ac b/configure.ac index ad04760118f..ecadc737131 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,7 @@ AC_CHECK_LIB([pthread], [pthread_create]) # fuse? AC_ARG_WITH([fuse], - [AS_HELP_STRING([--with-fuse]), - [use FUSE library for client])], + [AS_HELP_STRING([--with-fuse], [use FUSE library for client])], [], [with_fuse=check]) LIBFUSE= @@ -41,7 +40,7 @@ AM_CONDITIONAL(WITH_FUSE, [test "$HAVE_LIBFUSE" = "1"]) # CommonC++? AC_ARG_WITH([ccgnu], - [AS_HELP_STRING([--with-ccgnu]), + [AS_HELP_STRING([--with-ccgnu], [use CommonC++ library for fast thread-safe reference counting])], [], [with_ccgnu=check]) @@ -61,11 +60,10 @@ AS_IF([test "x$with_ccgnu" != xno], AM_CONDITIONAL(WITH_CCGNU, test "WITH_CCGNU" = "1") # newsyn? requires mpi. -AC_ARG_WITH([newsyn], - [AS_HELP_STRING([--with-newsyn]), - [build newsyn target, requires mpi]], - [], - [with_newsyn=no]) +#AC_ARG_WITH([newsyn], +# [AS_HELP_STRING([--with-newsyn], [build newsyn target, requires mpi])], +# [], +# [with_newsyn=no]) # Checks for header files. AC_HEADER_DIRENT diff --git a/src/.gitignore b/src/.gitignore index 1b438ed694b..f3ce6a71aef 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -17,3 +17,5 @@ mnt TAGS tags out +acconfig.h.in +acconfig.h diff --git a/src/include/atomic.h b/src/include/atomic.h index d6a35cec25b..31a095d8ea9 100644 --- a/src/include/atomic.h +++ b/src/include/atomic.h @@ -15,7 +15,9 @@ #ifndef __CEPH_ATOMIC_H #define __CEPH_ATOMIC_H -#include "acconfig.h" +#ifdef HAVE_CONFIG_H +# include "acconfig.h" +#endif #ifdef WITH_CCGNU /* |