Revision
16543
Author
mikej
Date
2010-01-30 17:27:40 -0600 (Sat, 30 Jan 2010)

Log Message

this is a bit more sane

Modified Paths

Diff

Modified: freeswitch/trunk/configure.in (16542 => 16543)


--- freeswitch/trunk/configure.in	2010-01-30 23:10:37 UTC (rev 16542)
+++ freeswitch/trunk/configure.in	2010-01-30 23:27:40 UTC (rev 16543)
@@ -363,7 +363,6 @@
   enable_core_odbc_support="yes"
 fi
 
-LUA_LDFLAGS=
 ESL_LDFLAGS=
 PLATFORM_CORE_DEPLIBS=
 # tweak platform specific flags
@@ -387,8 +386,8 @@
     ;;
     *-solaris2*)
         APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048)
+        APR_ADDTO(SWITCH_AM_LDFLAGS, -lsendfile -lresolv -lsocket -lnsl -luuid)
         APR_ADDTO(ESL_LDFLAGS, -lnsl -lsocket)
-	LUA_LDFLAGS="-lsendfile -lresolv -lsocket -lnsl -luuid"
     ;;
     *bsd*)
         APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include)
@@ -397,7 +396,6 @@
 
 APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)
 
-AC_SUBST(LUA_LDFLAGS)
 AC_SUBST(SWITCH_AM_CFLAGS)
 AC_SUBST(SWITCH_ANSI_CFLAGS)
 AC_SUBST(SWITCH_AM_CXXFLAGS)

Modified: freeswitch/trunk/src/mod/languages/mod_lua/Makefile.am (16542 => 16543)


--- freeswitch/trunk/src/mod/languages/mod_lua/Makefile.am	2010-01-30 23:10:37 UTC (rev 16542)
+++ freeswitch/trunk/src/mod/languages/mod_lua/Makefile.am	2010-01-30 23:27:40 UTC (rev 16543)
@@ -10,7 +10,7 @@
 mod_lua_la_SOURCES = mod_lua.cpp freeswitch_lua.cpp mod_lua_wrap.cpp
 mod_lua_la_CXXFLAGS = -Ilua $(AM_CPPFLAGS)
 mod_lua_la_LIBADD = $(switch_builddir)/libfreeswitch.la 
-mod_lua_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm $(LIBLUA_A) $(SOLINK) $(LUA_LDFLAGS)
+mod_lua_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm $(AM_LDFLAGS) $(LIBLUA_A) $(SOLINK)
 
 BUILT_SOURCES = $(LIBLUA_A)
 $(mod_lua_la_SOURCES) : $(BUILT_SOURCES)