forked from pool/bindfs
60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
|
parent b7b0facdedceb051241cd4ae9154f7e640e30fa1 ()
|
||
|
|
commit fbe46eac3e5638034f73bba5f55475170843b172
|
||
|
|
Author: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: Tue Jun 26 13:54:05 2012 +0200
|
||
|
|
|
||
|
|
build: do not change CFLAGS
|
||
|
|
|
||
|
|
CFLAGS must not be touched: it is a user variable. Your previous way
|
||
|
|
of doing it meant that `export CFLAGS="-O1"; ./configure;` never had
|
||
|
|
any effect.
|
||
|
|
---
|
||
|
|
configure.ac | 9 ++++++---
|
||
|
|
src/Makefile.am | 3 ++-
|
||
|
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 94e2d8b..b618654 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -17,9 +17,9 @@ AC_ARG_WITH([core-foundation],
|
||
|
|
|
||
|
|
|
||
|
|
if test x"$enable_debug" == "xyes" ; then
|
||
|
|
- CFLAGS="${CFLAGS} -g -O0"
|
||
|
|
+ my_CFLAGS="-g -O0"
|
||
|
|
else
|
||
|
|
- CFLAGS="${CFLAGS} -O2"
|
||
|
|
+ my_CFLAGS="-O2"
|
||
|
|
fi
|
||
|
|
|
||
|
|
if test x"$enable_debug_output" == "xyes" ; then
|
||
|
|
@@ -31,7 +31,10 @@ if test x"$with_core_foundation" == "xyes" ; then
|
||
|
|
LDFLAGS="${LDFLAGS} -framework CoreFoundation"
|
||
|
|
fi
|
||
|
|
|
||
|
|
-CFLAGS="${CFLAGS} -Wall -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=25"
|
||
|
|
+my_CPPFLAGS="-D_REENTRANT -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=25"
|
||
|
|
+my_CFLAGS="$my_CFLAGS -Wall"
|
||
|
|
+AC_SUBST([my_CPPFLAGS])
|
||
|
|
+AC_SUBST([my_CFLAGS])
|
||
|
|
|
||
|
|
# Check for xattrs
|
||
|
|
AC_CHECK_FUNCS([setxattr getxattr listxattr removexattr])
|
||
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
||
|
|
index 1d5491c..29661a7 100644
|
||
|
|
--- a/src/Makefile.am
|
||
|
|
+++ b/src/Makefile.am
|
||
|
|
@@ -5,7 +5,8 @@ bin_PROGRAMS = bindfs
|
||
|
|
noinst_HEADERS = debug.h permchain.h userinfo.h misc.h usermap.h
|
||
|
|
bindfs_SOURCES = bindfs.c permchain.c userinfo.c misc.c usermap.c
|
||
|
|
|
||
|
|
-AM_CFLAGS = $(fuse_CFLAGS)
|
||
|
|
+AM_CPPFLAGS = ${my_CPPFLAGS}
|
||
|
|
+AM_CFLAGS = ${my_CFLAGS} $(fuse_CFLAGS)
|
||
|
|
bindfs_LDADD = $(fuse_LIBS)
|
||
|
|
|
||
|
|
man_MANS = bindfs.1
|
||
|
|
--
|
||
|
|
# Created with git-export-patch
|