FS-10074: [libtiff] stop using embedded libtiff. Build now requires system libtiff

diff --git a/Makefile.am b/Makefile.am
index f6d91b98801479d94ed5ce07fb7372ecab3c4cda..aedd64926c6b586bfb26f992f83f7ba6e7f066ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,7 +125,6 @@ CORE_CFLAGS += -DSWITCH_HAVE_YUV
 endif
 CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
 CORE_CFLAGS += -I$(switch_builddir)/libs/spandsp/src -I$(switch_srcdir)/libs/spandsp/src 
-CORE_CFLAGS += -I$(switch_builddir)/libs/tiff-4.0.2/libtiff -I$(switch_srcdir)/libs/tiff-4.0.2/libtiff
 if ENABLE_LIBVPX
 CORE_CFLAGS += -DSWITCH_HAVE_VPX
 endif
@@ -741,11 +740,6 @@ sndfile-reconf:
        cd libs/libsndfile && ./config.status --recheck
        cd libs/libsndfile && ./config.status
 
-tiff-reconf:
-       cd libs/tiff-4.0.2 && autoreconf -fi
-       cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-       cd libs/tiff-4.0.2 && make
-
 python-reconf:
        rm -f src/mod/languages/mod_python/Makefile
        ./config.status
@@ -767,7 +761,7 @@ iks-reconf:
        cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
        $(MAKE) mod_dingaling-clean
 
-spandsp-reconf: tiff-reconf
+spandsp-reconf:
        cd libs/spandsp && $(MAKE) clean || echo
        cd libs/spandsp && autoreconf -fi
        cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS)

diff --git a/configure.ac b/configure.ac
index 2fc94fc45c5e8baba372836a0c6b05719d413413..4c8b6804c786ec5d5d4719f1f416843923bac637 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2012,7 +2012,6 @@ AC_CONFIG_SUBDIRS([libs/libdingaling])
 AC_CONFIG_SUBDIRS([libs/sofia-sip])
 AC_CONFIG_SUBDIRS([libs/freetdm])
 AC_CONFIG_SUBDIRS([libs/unimrcp])
-AC_CONFIG_SUBDIRS([libs/tiff-4.0.2])
 AC_CONFIG_SUBDIRS([libs/spandsp])
 if test "x${enable_zrtp}" = "xyes"; then
    AC_CONFIG_SUBDIRS([libs/libzrtp])

diff --git a/libs/spandsp/configure.gnu b/libs/spandsp/configure.gnu
index 7bc2bce9d870ab146e5dcc9595ff71f137635ccf..c78238de46bb22504c673df0f1896c982fde860a 100755 (executable)
--- a/libs/spandsp/configure.gnu
+++ b/libs/spandsp/configure.gnu
@@ -1,4 +1,4 @@
 #! /bin/sh
 srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
-$srcpath/configure "$@" --disable-shared --with-pic --enable-builtin-tiff
+$srcpath/configure "$@" --disable-shared --with-pic
 

diff --git a/src/mod/applications/mod_spandsp/Makefile.am b/src/mod/applications/mod_spandsp/Makefile.am
index ae6ab7590e0202168667d460e47f8d144073c6cb..6ac105437002b049337f4f9001280a5bff58f547 100644 (file)
--- a/src/mod/applications/mod_spandsp/Makefile.am
+++ b/src/mod/applications/mod_spandsp/Makefile.am
@@ -1,24 +1,17 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_spandsp
 
-TIFF_DIR=$(switch_srcdir)/libs/tiff-4.0.2
-TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-4.0.2
-TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
 SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
 SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
 SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
 
 mod_LTLIBRARIES = mod_spandsp.la
 mod_spandsp_la_SOURCES  = mod_spandsp.c udptl.c mod_spandsp_fax.c mod_spandsp_dsp.c mod_spandsp_codecs.c mod_spandsp_modem.c
-mod_spandsp_la_CFLAGS   = $(AM_CFLAGS)
-mod_spandsp_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(TIFF_BUILDDIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
-mod_spandsp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA) $(SPANDSP_LA_JBIG) $(SPANDSP_LA_LZMA) -ljpeg -lz
+mod_spandsp_la_CFLAGS   = $(AM_CFLAGS) 
+mod_spandsp_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(SPANDSP_BUILDDIR)/src -I.
+mod_spandsp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(SPANDSP_LA_JBIG) $(SPANDSP_LA_LZMA) -ljpeg -lz -ltiff
 mod_spandsp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
-       cd $(SPANDSP_BUILDDIR) && $(MAKE) CPPFLAGS="$(CPPFLAGS) -I$(TIFF_BUILDDIR)/libtiff -I$(TIFF_DIR)/libtiff" CFLAGS="$(CFLAGS)"
-       $(TOUCH_TARGET)
-
-$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
-       cd $(TIFF_BUILDDIR) && $(MAKE)
+$(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
+       cd $(SPANDSP_BUILDDIR) && $(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
        $(TOUCH_TARGET)