Permalink
Browse files

Check for sed, awk; Prefer CPPFLAGS to CFLAGS

  • Loading branch information...
1 parent 93c67c7 commit 76125dc67a3014aafe75986b715c2cf5034c34a1 @vasi committed Apr 14, 2012
Showing with 5 additions and 4 deletions.
  1. +2 −2 Makefile.am
  2. +0 −1 TODO
  3. +2 −0 configure.ac
  4. +1 −1 gen_swap.sh
View
@@ -11,7 +11,7 @@ squashfuse_SOURCES = swap.c cache.c table.c dir.c file.c fs.c ll.c squashfuse.c
nonstd-pread.c nonstd-makedev.c nonstd-stat.c nonstd-daemon.c nonstd-enoattr.c \
squashfs_fs.h common.h nonstd-internal.h nonstd.h swap.h cache.h table.h \
dir.h file.h decompress.h xattr.h squashfuse.h ll.h
-squashfuse_CPPFLAGS = $(ZLIB_CFLAGS) $(XZ_CFLAGS) $(LZO_CFLAGS)
+squashfuse_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS)
squashfuse_LDADD = $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS)
dist_man_MANS = squashfuse.1
@@ -20,4 +20,4 @@ BUILT_SOURCES = swap.h.inc swap.c.inc
CLEANFILES = swap.h.inc swap.c.inc
EXTRA_DIST = gen_swap.sh LICENSE
swap.h.inc swap.c.inc: gen_swap.sh squashfs_fs.h Makefile
- $(srcdir)/gen_swap.sh $(srcdir)/squashfs_fs.h
+ SED="$(SED)" $(srcdir)/gen_swap.sh $(srcdir)/squashfs_fs.h
View
1 TODO
@@ -1,5 +1,4 @@
For 0.1
- Use AWK/SED
Separate out autoconf macros
Print compression results?
Save/restore flags
View
@@ -7,6 +7,8 @@ AM_INIT_AUTOMAKE([foreign -Wall subdir-objects])
LT_INIT
# Compiler
+AC_PROG_AWK
+AC_PROG_SED
AC_PROG_CPP
AC_PROG_CC_C99
AM_PROG_CC_C_O
View
@@ -23,7 +23,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-sed -n '
+${SED:-sed} -n '
/^struct squashfs_/,/^}/{
s/^struct \(squashfs_\([^[:space:]]*\)\).*/void sqfs_swapin_\2(struct \1 *s){/p;t decl
s/};/}/p;t

0 comments on commit 76125dc

Please sign in to comment.