attempt at fixing mod_gsmopen build

diff --git a/configure.ac b/configure.ac
index 75c4317b083d5b06f09aed0d2dfaaaa0f2722091..ed650e1bb1c68cde15ce860bf9a30807a848284d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1309,6 +1309,7 @@ AC_CONFIG_FILES([Makefile
                src/mod/directories/mod_ldap/Makefile
                src/mod/endpoints/mod_alsa/Makefile
                src/mod/endpoints/mod_dingaling/Makefile
+               src/mod/endpoints/mod_gsmopen/Makefile
                src/mod/endpoints/mod_h323/Makefile
                src/mod/endpoints/mod_khomp/Makefile
                src/mod/endpoints/mod_loopback/Makefile

diff --git a/src/mod/endpoints/mod_gsmopen/Makefile b/src/mod/endpoints/mod_gsmopen/Makefile
deleted file mode 100644 (file)
index 18943c8..0000000
--- a/src/mod/endpoints/mod_gsmopen/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-MODNAME=mod_gsmopen
-LOCAL_CFLAGS += -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\"
-LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lspandsp -lctb-0.16 -lgsmme
-LOCAL_OBJS=gsmopen_protocol.o
-include ../../../../build/modmake.rules

diff --git a/src/mod/endpoints/mod_gsmopen/Makefile.am b/src/mod/endpoints/mod_gsmopen/Makefile.am
index 0ce65353a74f843b0e5b357d9e2c0bb6d4914d9b..768d608629530de3de009ef059cdc549c3fa5a03 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/Makefile.am
+++ b/src/mod/endpoints/mod_gsmopen/Makefile.am
@@ -11,12 +11,12 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
 
 mod_LTLIBRARIES = mod_gsmopen.la
 mod_gsmopen_la_SOURCES  = mod_gsmopen.cpp gsmopen_protocol.cpp 
-mod_gsmopen_la_CFLAGS   = $(AM_CFLAGS) -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I. -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\"
+mod_gsmopen_la_CFLAGS   = $(AM_CFLAGS) -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
 mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA)
 mod_gsmopen_la_LDFLAGS  = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme
 
 $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
-       cd $(SPANDSP_BUILDDIR) && $(MAKE) -j1
+       cd $(SPANDSP_BUILDDIR) && $(MAKE) -j1 CFLAGS="$(CFLAGS) -I$(TIFF_BUILDDIR)/libtiff -I$(TIFF_DIR)/libtiff"
        $(TOUCH_TARGET)
 
 $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update

diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen.h b/src/mod/endpoints/mod_gsmopen/gsmopen.h
index ffbae385149b96bc27a718eb5de389123d66e83c..f56866a587a95c6075042ccb361a1b8e3c2a14d5 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/gsmopen.h
+++ b/src/mod/endpoints/mod_gsmopen/gsmopen.h
@@ -96,12 +96,6 @@
 #define                AT_BUFSIZ AT_MESG_MAX_LENGTH
 #define AT_MESG_MAX_LINES 20   /* 256 lines, so it can contains the results of AT+CLAC, that gives all the AT commands the phone supports */
 
-#ifdef GSMOPEN_C_VER
-#ifdef MODGSMOPEN_C_VER
-#define GSMOPEN_SVN_VERSION MODGSMOPEN_C_VER"|"GSMOPEN_C_VER
-#endif
-#endif
-
 #ifndef GSMOPEN_SVN_VERSION
 #define GSMOPEN_SVN_VERSION switch_version_full()
 #endif /* GSMOPEN_SVN_VERSION */