24f45c9b31
1. Update to FS git 6eb59c711989774fb797d1c447e3d63aac84826b. 2. Disable mod_perl due to recent changes in perl package. 3. Disable mod_verto (required mod_perl). 4. Remove numbering scheme from patches. Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>
32 lines
1.7 KiB
Diff
32 lines
1.7 KiB
Diff
--- a/src/mod/languages/mod_perl/Makefile.am
|
|
+++ b/src/mod/languages/mod_perl/Makefile.am
|
|
@@ -1,22 +1,22 @@
|
|
include $(top_srcdir)/build/modmake.rulesam
|
|
MODNAME=mod_perl
|
|
-PERL = perl
|
|
-PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
|
|
-PERL_LIBS =`perl -MConfig -e 'print $$Config{libs}'`
|
|
|
|
-perldir=$(prefix)/perl
|
|
+perldir="$(PERL_SITELIB)"
|
|
+
|
|
mod_LTLIBRARIES = mod_perl.la
|
|
perl_LTLIBRARIES = freeswitch.la
|
|
mod_perl_la_SOURCES = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
|
|
mod_perl_la_CFLAGS = $(AM_CFLAGS)
|
|
mod_perl_la_CXXFLAGS = $(AM_CXXFLAGS)
|
|
-mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
|
|
+mod_perl_la_CPPFLAGS = ${PERL_CFLAGS} -I$(switch_srcdir)/libs/libteletone/src/
|
|
mod_perl_la_LIBADD = $(switch_builddir)/libfreeswitch.la
|
|
-mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
|
|
+#mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
|
|
+mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared ${PERL_LDFLAGS}
|
|
|
|
freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
|
|
freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
|
|
-freeswitch_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
|
|
+freeswitch_la_CPPFLAGS = ${PERL_CFLAGS} -I$(switch_srcdir)/libs/libteletone/src/
|
|
+
|
|
reswig: swigclean mod_perl_wrap.cpp
|
|
|
|
swigclean: clean
|