Revision
14321
Author
mikej
Date
2009-07-22 14:35:11 -0500 (Wed, 22 Jul 2009)

Log Message

use internal libtiff instead of system libtiff (please test)

Modified Paths

Added Paths

Diff

Modified: freeswitch/trunk/configure.in (14320 => 14321)


--- freeswitch/trunk/configure.in	2009-07-22 19:33:55 UTC (rev 14320)
+++ freeswitch/trunk/configure.in	2009-07-22 19:35:11 UTC (rev 14321)
@@ -832,6 +832,7 @@
 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

Modified: freeswitch/trunk/libs/spandsp/configure.gnu (14320 => 14321)


--- freeswitch/trunk/libs/spandsp/configure.gnu	2009-07-22 19:33:55 UTC (rev 14320)
+++ freeswitch/trunk/libs/spandsp/configure.gnu	2009-07-22 19:35:11 UTC (rev 14321)
@@ -1,3 +1,2 @@
 #! /bin/sh
-./configure "$@" --disable-shared --with-pic
-
+./configure "$@" --disable-shared --with-pic --enable-builtin-tiff

Added: freeswitch/trunk/libs/tiff-3.8.2/.update (0 => 14321)


--- freeswitch/trunk/libs/tiff-3.8.2/.update	                        (rev 0)
+++ freeswitch/trunk/libs/tiff-3.8.2/.update	2009-07-22 19:35:11 UTC (rev 14321)
@@ -0,0 +1 @@
+Wed Jul 22 15:05:52 EDT 2009

Added: freeswitch/trunk/libs/tiff-3.8.2/configure.gnu (0 => 14321)


--- freeswitch/trunk/libs/tiff-3.8.2/configure.gnu	                        (rev 0)
+++ freeswitch/trunk/libs/tiff-3.8.2/configure.gnu	2009-07-22 19:35:11 UTC (rev 14321)
@@ -0,0 +1,2 @@
+#! /bin/sh
+./configure "$@" --disable-shared --with-pic
Property changes on: freeswitch/trunk/libs/tiff-3.8.2/configure.gnu
___________________________________________________________________
Name: svn:executable
   + *

Modified: freeswitch/trunk/src/mod/applications/mod_fax/Makefile (14320 => 14321)


--- freeswitch/trunk/src/mod/applications/mod_fax/Makefile	2009-07-22 19:33:55 UTC (rev 14320)
+++ freeswitch/trunk/src/mod/applications/mod_fax/Makefile	2009-07-22 19:35:11 UTC (rev 14321)
@@ -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,11 +11,15 @@
 
 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
 
 $(DESTDIR)$(libdir)/libspandsp.la: $(SPANDSP_LA)