[Freeswitch-svn] [commit] r2532 - in freeswitch/branches/docelmo/trunk: . src/mod/languages/mod_elmoscript

[Freeswitch SVN]

Author: docelmo
Date: Wed Sep  6 02:04:09 2006
New Revision: 2532

Added:
   freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/comp   (contents, props changed)
   freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/switch_swig.o   (contents, props changed)
Modified:
   freeswitch/branches/docelmo/trunk/Makefile.am
   freeswitch/branches/docelmo/trunk/Makefile.in
   freeswitch/branches/docelmo/trunk/modules.conf.in
   freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/switch_swig.c

Log:


Modified: freeswitch/branches/docelmo/trunk/Makefile.am
==============================================================================
--- freeswitch/branches/docelmo/trunk/Makefile.am	(original)
+++ freeswitch/branches/docelmo/trunk/Makefile.am	Wed Sep  6 02:04:09 2006
@@ -41,7 +41,7 @@
 endif
 
 AM_CFLAGS  += -fPIC -Wall
-AM_CFLAGS  +=-I$(PWD)/src/sqlite -I$(PWD) -I$(PWD)/src/include -I$(PREFIX)/include
+AM_CFLAGS  +=-I$(PWD)/src/sqlite -I$(PWD) -I$(PWD)/src/include -I$(PREFIX)/include -I/usr/local/include/php/main/ -I/usr/local/include/php/
 AM_CFLAGS 	+= -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\"
 AM_CFLAGS	+= -DSWITCH_PREFIX_DIR=\"$(PREFIX)\"
 AM_CFLAGS	+= -DSWITCH_CONF_DIR=\"$(PREFIX)/conf\"

Modified: freeswitch/branches/docelmo/trunk/Makefile.in
==============================================================================
--- freeswitch/branches/docelmo/trunk/Makefile.in	(original)
+++ freeswitch/branches/docelmo/trunk/Makefile.in	Wed Sep  6 02:04:09 2006
@@ -252,6 +252,7 @@
 	$(APU_CONFIG) --includes) $(am__append_2) $(am__append_3) \
 	$(am__append_5) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
 	-I$(PWD)/src/include -I$(PREFIX)/include \
+	-I/usr/local/include/php/main/ -I/usr/local/include/php/ \
 	-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
 	-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
 	-DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \
@@ -1108,7 +1109,6 @@
 	@if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi
 	@echo making modules
 	@rm -f build/freeswitch.env
-	@if [ -f $(PWD)/modbuild.env ] ; then cp $(PWD)/modbuild.env build/freeswitch.env ; fi
 	@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
 	@./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH"
 	@./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH"

Modified: freeswitch/branches/docelmo/trunk/modules.conf.in
==============================================================================
--- freeswitch/branches/docelmo/trunk/modules.conf.in	(original)
+++ freeswitch/branches/docelmo/trunk/modules.conf.in	Wed Sep  6 02:04:09 2006
@@ -33,5 +33,6 @@
 formats/mod_sndfile
 #languages/mod_perl
 #languages/mod_spidermonkey
+languages/mod_elmoscript
 timers/mod_softtimer
 #xml_int/mod_xml_rpc

Added: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/comp
==============================================================================
--- (empty file)
+++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/comp	Wed Sep  6 02:04:09 2006
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+gcc -Werror -I/usr/local/freeswitch/include  -pthread -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE 
+-I/usr/local/freeswitch/include/apr-1  -I/usr/local/freeswitch/include/srtp  -I/usr/local/freeswitch/include/apr-1     -fPIC -Wall 
+-I/usr/src/docelmo/trunk/src/sqlite -I/usr/src/docelmo/trunk -I/usr/src/docelmo/trunk/src/include -I/usr/local/freeswitch/include 
+-I/usr/local/include/php/main/ -I/usr/local/include/php/Zend/ -I/usr/local/include/php/TSRM -I/usr/local/include/php/regex -I/usr/local/include/php/  
+-DSWITCH_MOD_DIR=/usr/local/freeswitch/mod -DSWITCH_PREFIX_DIR=/usr/local/freeswitch -DSWITCH_CONF_DIR=/usr/local/freeswitch/conf 
+-DSWITCH_DB_DIR=/usr/local/freeswitch/db -DSWITCH_LOG_DIR=/usr/local/freeswitch/log -DSWITCH_SCRIPT_DIR=/usr/local/freeswitch/scripts 
+-DSWITCH_HTDOCS_DIR=/usr/local/freeswitch/htdocs -fPIC  -c switch_swig.c -o switch_swig.o

Modified: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/switch_swig.c
==============================================================================
--- freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/switch_swig.c	(original)
+++ freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/switch_swig.c	Wed Sep  6 02:04:09 2006
@@ -3,13 +3,11 @@
 #pragma warning (disable:1418)
 #endif
 
-
-/*
 #ifdef _MSC_VER
 #include <php.h>
 #pragma comment(lib, PHP_LIB)
 #endif
-*/
+
 void fs_core_set_globals(void)
 {
 	switch_core_set_globals();

Added: freeswitch/branches/docelmo/trunk/src/mod/languages/mod_elmoscript/switch_swig.o
==============================================================================
Binary file. No diff available.