From 01dec7254b349bb9edc14864a874c2d8bf387f39 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 22 Jul 2009 19:35:11 +0000
Subject: [PATCH] use internal libtiff instead of system libtiff (please test)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14321 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 configure.in                          | 3 ++-
 libs/spandsp/configure.gnu            | 3 +--
 libs/tiff-3.8.2/.update               | 1 +
 libs/tiff-3.8.2/configure.gnu         | 2 ++
 src/mod/applications/mod_fax/Makefile | 9 ++++++++-
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 libs/tiff-3.8.2/.update
 create mode 100755 libs/tiff-3.8.2/configure.gnu

diff --git a/configure.in b/configure.in
index 9c37a741e6..8cc7e593e6 100644
--- a/configure.in
+++ b/configure.in
@@ -832,6 +832,7 @@ AC_CONFIG_SUBDIRS(libs/speex)
 AC_CONFIG_SUBDIRS(libs/portaudio)
 AC_CONFIG_SUBDIRS(libs/openzap)
 AC_CONFIG_SUBDIRS(libs/unimrcp)
-AC_CHECK_LIB([tiff], [TIFFOpen], AC_CONFIG_SUBDIRS(libs/spandsp), , -lm)
+AC_CONFIG_SUBDIRS(libs/tiff-3.8.2)
+AC_CONFIG_SUBDIRS(libs/spandsp)
 
 AC_OUTPUT
diff --git a/libs/spandsp/configure.gnu b/libs/spandsp/configure.gnu
index a22f176e74..3f2f22095f 100755
--- a/libs/spandsp/configure.gnu
+++ b/libs/spandsp/configure.gnu
@@ -1,3 +1,2 @@
 #! /bin/sh
-./configure "$@" --disable-shared --with-pic
-
+./configure "$@" --disable-shared --with-pic --enable-builtin-tiff
diff --git a/libs/tiff-3.8.2/.update b/libs/tiff-3.8.2/.update
new file mode 100644
index 0000000000..53813277c9
--- /dev/null
+++ b/libs/tiff-3.8.2/.update
@@ -0,0 +1 @@
+Wed Jul 22 15:05:52 EDT 2009
diff --git a/libs/tiff-3.8.2/configure.gnu b/libs/tiff-3.8.2/configure.gnu
new file mode 100755
index 0000000000..dd7048bd67
--- /dev/null
+++ b/libs/tiff-3.8.2/configure.gnu
@@ -0,0 +1,2 @@
+#! /bin/sh
+./configure "$@" --disable-shared --with-pic
diff --git a/src/mod/applications/mod_fax/Makefile b/src/mod/applications/mod_fax/Makefile
index 355e1ac68d..a20600c288 100644
--- a/src/mod/applications/mod_fax/Makefile
+++ b/src/mod/applications/mod_fax/Makefile
@@ -1,5 +1,8 @@
 BASE=../../../..
 
+TIFF_DIR=$(BASE)/libs/tiff-3.8.2
+TIFF_LA=$(TIFF_DIR)/libtiff/libtiff.la
+
 SPANDSP_DIR=$(BASE)/libs/spandsp
 SPANDSP_LA=$(SPANDSP_DIR)/src/libspandsp.la
 
@@ -8,10 +11,14 @@ LOCAL_LIBADD=$(SPANDSP_LA)
 
 include $(BASE)/build/modmake.rules
 
-$(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
+$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
 	cd $(SPANDSP_DIR) && $(MAKE)
 	$(TOUCH_TARGET)
 
+$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
+	cd $(TIFF_DIR) && $(MAKE)
+	$(TOUCH_TARGET)
+
 
 depend_install: $(DESTDIR)$(libdir)/libspandsp.la