Make Boa IPv6-ready. Patch by Alina Friedrichsen. Thanks a lot.

[project/luci.git] / libs / sgi-webuci / Makefile

diff --git a/libs/sgi-webuci/Makefile b/libs/sgi-webuci/Makefile
index fe5fbb8..cea6c74 100644 (file)
--- a/libs/sgi-webuci/Makefile
+++ b/libs/sgi-webuci/Makefile
@@ -24,7 +24,7 @@ $(BOA_DIR)/.prepared: $(BOA_FILE)
 $(BOA_DIR)/.patched: $(BOA_DIR)/.prepared $(BOA_PATCHDIR)/series
        (cd $(BOA_DIR); \
                if [ -x "$$(which quilt 2>/dev/null)" ]; then \
-                       quilt push -a; \
+                       [ "$$(quilt top 2>/dev/null)" = "$$(tail -n1 patches/series)" ] || quilt push -a; \
                else \
                        cat patches/*.patch | patch -p1; \
                fi; \
@@ -36,7 +36,7 @@ $(BOA_DIR)/.configured: $(BOA_DIR)/.patched
        touch $@
 
 boa-compile: $(BOA_DIR)/.configured
-       $(MAKE) -C $(BOA_DIR)/src CC=$(CC) CFLAGS="$(CFLAGS)"
+       $(MAKE) -C $(BOA_DIR)/src CC=$(CC) CFLAGS="$(CFLAGS) -DINET6 -DACCEPT_ON"
 
 %.o: %.c
        $(COMPILE) $(LUA_CFLAGS) -I$(BOA_DIR)/src $(FPIC) -c -o $@ $< 
@@ -44,7 +44,7 @@ boa-compile: $(BOA_DIR)/.configured
 compile: boa-compile src/luci.o src/cgi.o
        mkdir -p dist/usr/bin dist/usr/lib/boa
        cp $(BOA_DIR)/src/boa $(BOA_DIR)/src/boa_indexer dist/usr/bin
-       $(LINK) $(SHLIB_FLAGS) -o dist/usr/lib/boa/luci.so src/luci.o src/cgi.o $(LUA_LIBS)
+       $(LINK) $(SHLIB_FLAGS) -o dist/usr/lib/boa/luci.so src/luci.o src/cgi.o $(LDFLAGS) $(LUA_LIBS)
 
 clean:
        rm -rf $(BOA_DIR) $(BOA_FILE)