From: Michael Jerris <mike@jerris.com>
Date: Tue, 20 Jan 2015 19:32:36 +0000 (-0500)
Subject: FS-7180: when using system lua, properly link against renamed library versions on... 
X-Git-Tag: v1.4.16~1^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c36196db3f5e7c4dd4c7b5af3fec5654e5860c22;p=thirdparty%2Ffreeswitch.git

FS-7180: when using system lua, properly link against renamed library versions on debian for esl luamod
---

diff --git a/libs/esl/Makefile.am b/libs/esl/Makefile.am
index 3b1563eaed..b59c7f24f1 100644
--- a/libs/esl/Makefile.am
+++ b/libs/esl/Makefile.am
@@ -74,7 +74,7 @@ phpmod: $(MYLIB)
 	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C php 
 
 luamod: $(MYLIB)
-	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C lua
+	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" LUA_CFLAGS="$(LUA_CFLAGS)" LUA_LIBS="$(LUA_LIBS)" -C lua
 
 pymod: $(MYLIB)
 	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python
diff --git a/libs/esl/lua/Makefile b/libs/esl/lua/Makefile
index 872888dff5..24b6fbd18e 100644
--- a/libs/esl/lua/Makefile
+++ b/libs/esl/lua/Makefile
@@ -1,5 +1,5 @@
 LOCAL_CFLAGS=
-LOCAL_LDFLAGS=-llua -lpthread
+LOCAL_LDFLAGS=$(LUA_LIBS) -lpthread
 WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 
 all: ESL.so
@@ -8,7 +8,7 @@ esl_wrap.cpp:
 	swig2.0 -module ESL -lua -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
-	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o
+	$(CXX) $(CXX_CFLAGS) $(LUA_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o
 
 ESL.so: esl_wrap.o
 	$(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o ESL.so -L. $(LIBS)