cleanup

diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index f0db222f717c6c0d8b483e50cc62286a4626d827..51923ec3dd7377e31ae7d07073a3443e5f69cf1a 100644 (file)
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -80,9 +80,9 @@ TOUCH_TARGET=@TOUCH_TARGET@
 MAKE_OPTS = `test -n "$(VERBOSE)" || echo -s`
 RECURSE_MODNAME=`pwd | sed -e 's|^.*/||'`
 RECURSE_SOURCEFILE=`if test -f "$$modname.cpp" -o  -f "$(MODDIR)/$$modname.cpp"; then echo "$$modname.cpp"; else echo "$$modname.c"; fi`
-RECURSE_OUR_DEPS=
-RECURSE_OUR_CFLAGS=`$(LOCAL_INSERT_CFLAGS)`
-RECURSE_OUR_LDFLAGS=`$(LOCAL_INSERT_LDFLAGS)`
+RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi `
+RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS) ; $(LOCAL_INSERT_CFLAGS) `
+RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL) ; $(LOCAL_INSERT_LDFLAGS) `
 RECURSE_MODDIR=`if test -z $(MODDIR); then pwd | sed -e 's|$(switch_builddir)|$(switch_srcdir)|'; else echo $(MODDIR); fi`
 RECURSE_MAKE=+modname="$(RECURSE_MODNAME)" ; \
                sourcefile="$(RECURSE_SOURCEFILE)" ; \