From 8b6905d1880f1924e63390e5fa51080274c2e80f Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 7 Apr 2009 19:48:50 +0000 Subject: [PATCH] fix error loading mod_spidermonkey due to missing PR_* symbols git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12939 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- build/modmake.rules.in | 4 ++-- src/mod/languages/mod_spidermonkey/sm.mak | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/modmake.rules.in b/build/modmake.rules.in index bff09b5d07..cd0247b8b1 100644 --- a/build/modmake.rules.in +++ b/build/modmake.rules.in @@ -112,9 +112,9 @@ $(MODNAME).$(LIBTOOL_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJ @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean: diff --git a/src/mod/languages/mod_spidermonkey/sm.mak b/src/mod/languages/mod_spidermonkey/sm.mak index 46daf4b553..6a593dc7b0 100644 --- a/src/mod/languages/mod_spidermonkey/sm.mak +++ b/src/mod/languages/mod_spidermonkey/sm.mak @@ -3,7 +3,8 @@ JS_DIR=$(switch_srcdir)/libs/js JSLA=$(JS_DIR)/libjs.la LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1 -LOCAL_LIBADD+=$(JSLA) $(JS_DIR)/nsprpub/pr/src/libnspr4.* +LOCAL_LDFLAGS_POST=$(JS_DIR)/nsprpub/pr/src/libnspr4.* +LOCAL_LIBADD+=$(JSLA) include $(switch_srcdir)/build/modmake.rules