this is a bit more sane

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16543 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/configure.in b/configure.in
index 54a285d19f35da0c96829eec98f10d41ffb70019..bcb94608da0d7615c8e77eabd08fbfa703380b0d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -363,7 +363,6 @@ if test "$ac_cv_found_odbc" = "yes" ; then
   enable_core_odbc_support="yes"
 fi
 
-LUA_LDFLAGS=
 ESL_LDFLAGS=
 PLATFORM_CORE_DEPLIBS=
 # tweak platform specific flags
@@ -387,8 +386,8 @@ case "$host" in
     ;;
     *-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 @@ esac
 
 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)

diff --git a/src/mod/languages/mod_lua/Makefile.am b/src/mod/languages/mod_lua/Makefile.am
index 303e34480a37bc13fe1d4229ab9f1dc6ca1cfa9a..805b52cb692cfb459b63f10bbf33693974a5e62b 100644 (file)
--- a/src/mod/languages/mod_lua/Makefile.am
+++ b/src/mod/languages/mod_lua/Makefile.am
@@ -10,7 +10,7 @@ mod_LTLIBRARIES = mod_lua.la
 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)