From de73f644baab81696db59b70196003e021eb7e06 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 17 Feb 2007 17:52:38 +0100 Subject: [PATCH] Added SEE_CFLAGS to the Makefile.config. Use SEE_CFLAGS only when necessary. --- Makefile.config.in | 1 + configure.in | 1 - src/ecmascript/Makefile | 2 +- src/ecmascript/see/Makefile | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 98afd5b5..0310b9c4 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -83,6 +83,7 @@ PYTHON_LIBS = @PYTHON_LIBS@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_LIBS = @RUBY_LIBS@ +SEE_CFLAGS = @SEE_CFLAGS@ SPARSE = @SPARSE@ SPIDERMONKEY_CFLAGS = @SPIDERMONKEY_CFLAGS@ SPIDERMONKEY_LIBS = @SPIDERMONKEY_LIBS@ diff --git a/configure.in b/configure.in index a484cc1f..accbc2ed 100644 --- a/configure.in +++ b/configure.in @@ -603,7 +603,6 @@ if test "$enable_see" = "yes"; then SEE_LIBS="`$SEE_CONFIG --libs`" SEE_CFLAGS="`$SEE_CONFIG --cppflags`" LIBS="$SEE_LIBS $LIBS" - CPPFLAGS="$CPPFLAGS $SEE_CFLAGS" EL_CONFIG(CONFIG_ECMASCRIPT_SEE, [SEE]) AC_SUBST(SEE_CFLAGS) else diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile index 6581d82a..c5ca6ea0 100644 --- a/src/ecmascript/Makefile +++ b/src/ecmascript/Makefile @@ -1,6 +1,6 @@ top_builddir=../.. include $(top_builddir)/Makefile.config -INCLUDES += $(SPIDERMONKEY_CFLAGS) +INCLUDES += $(SPIDERMONKEY_CFLAGS) $(SEE_CFLAGS) SUBDIRS-$(CONFIG_ECMASCRIPT_SEE) += see SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS) += spidermonkey diff --git a/src/ecmascript/see/Makefile b/src/ecmascript/see/Makefile index 257f9bee..f933a548 100644 --- a/src/ecmascript/see/Makefile +++ b/src/ecmascript/see/Makefile @@ -1,5 +1,6 @@ top_builddir=../../.. include $(top_builddir)/Makefile.config +INCLUDES += $(SEE_CFLAGS) OBJS = checktype.o document.o form.o input.o location.o navigator.o strings.o unibar.o window.o