summaryrefslogtreecommitdiff
blob: 200fa85883fa2bf6e245e4636b83dce0a239a8a9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
diff -ru a/Makefile.am b/Makefile.am
--- a/Makefile.am	2008-10-23 11:35:19.000000000 -0500
+++ b/Makefile.am	2009-06-21 15:07:05.000000000 -0500
@@ -68,9 +68,7 @@
 		    test_io.c \
 		    svnrev.c
 
-AM_CFLAGS=          $(CFLAGS) $(FUSE_CFLAGS)
-
-AM_LDFLAGS=         $(FUSE_LIBS)
+AM_CFLAGS=          $(FUSE_CFLAGS)
 
 svnrev.c:
 			printf 'const int s3backer_svnrev = %u;\n' `svn info | grep -w Rev | sed -r 's/^.*Rev: //g'` > svnrev.c
diff -ru a/configure.ac b/configure.ac
--- a/configure.ac	2008-12-19 17:09:04.000000000 -0600
+++ b/configure.ac	2009-06-21 13:00:01.000000000 -0500
@@ -9,7 +9,7 @@
 AC_PREFIX_DEFAULT(/usr)
 AC_PROG_MAKE_SET
 
-[CFLAGS='-g -O3 -pipe -Wall -Waggregate-return -Wcast-align -Wchar-subscripts -Wcomment -Wformat -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long -Wparentheses -Wpointer-arith -Wredundant-decls -Wreturn-type -Wswitch -Wtrigraphs -Wuninitialized -Wunused -Wwrite-strings -Wshadow -Wstrict-prototypes -Wcast-qual']
+[CFLAGS="-g -O3 -pipe -Wall -Waggregate-return -Wcast-align -Wchar-subscripts -Wcomment -Wformat -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long -Wparentheses -Wpointer-arith -Wredundant-decls -Wreturn-type -Wswitch -Wtrigraphs -Wuninitialized -Wunused -Wwrite-strings -Wshadow -Wstrict-prototypes -Wcast-qual $CFLAGS"]
 AC_SUBST(CFLAGS)
 
 # Compile flags for Linux
@@ -36,6 +36,8 @@
 	[AC_MSG_ERROR([required library libcrypto missing])])
 AC_CHECK_LIB(expat, XML_ParserCreate,,
 	[AC_MSG_ERROR([required library expat missing])])
+AC_CHECK_LIB(fuse, fuse_version,,
+	[AC_MSG_ERROR([required library libfuse missing])])
 AC_CHECK_LIB(z, compressBound,,
 	[AC_MSG_ERROR([required library zlib missing])])