From c1e97c572b266e3961ebcce3f15710784a2c69ac Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 11 Dec 2009 19:03:38 +0000
Subject: [PATCH] fix spandsp --srcdir builds

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15913 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/spandsp/configure.ac    | 4 +++-
 libs/spandsp/src/Makefile.am | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libs/spandsp/configure.ac b/libs/spandsp/configure.ac
index 06eaf6ee88..bfc348584c 100644
--- a/libs/spandsp/configure.ac
+++ b/libs/spandsp/configure.ac
@@ -438,13 +438,15 @@ fi
 
 if test "$enable_builtin_tiff" = "yes" ; then
   abs_tiffdir="`cd $srcdir/../tiff-3.8.2/ && pwd`"
+  spandsp_builddir="`pwd`"
+  abs_tiffbuilddir="`cd $spandsp_builddir/../tiff-3.8.2/ && pwd`"
   save_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -I$abs_tiffdir/libtiff"
   AC_CHECK_HEADERS([tiffio.h])
   CFLAGS="$save_CFLAGS"
   COMP_VENDOR_CFLAGS="-I$abs_tiffdir/libtiff $COMP_VENDOR_CFLAGS"
   COMP_VENDOR_LDFLAGS="-L$abs_tiffdir/libtiff $COMP_VENDOR_LDFLAGS"
-  LIBS="$LIBS $abs_tiffdir/libtiff/libtiff.la"
+  LIBS="$LIBS $abs_tiffbuilddir/libtiff/libtiff.la"
   AC_DEFINE([HAVE_LIBTIFF], [1], [Define to 1 if you have the `tiff' library (-ltiff).])
 else
   AC_CHECK_HEADERS([tiffio.h])
diff --git a/libs/spandsp/src/Makefile.am b/libs/spandsp/src/Makefile.am
index 85b28a6de2..4c4c7d531a 100644
--- a/libs/spandsp/src/Makefile.am
+++ b/libs/spandsp/src/Makefile.am
@@ -288,10 +288,10 @@ noinst_HEADERS =        faxfont.h \
                         v29tx_constellation_maps.h
 
 make_at_dictionary$(EXEEXT): $(top_srcdir)/src/make_at_dictionary.c
-	$(CC_FOR_BUILD) -o make_at_dictionary$(EXEEXT) $(top_srcdir)/src/make_at_dictionary.c  -DHAVE_CONFIG_H 
+	$(CC_FOR_BUILD) -o make_at_dictionary$(EXEEXT) $(top_srcdir)/src/make_at_dictionary.c  -DHAVE_CONFIG_H -I$(abs_builddir)
 
 make_modem_filter$(EXEEXT): $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c 
-	$(CC_FOR_BUILD) -o make_modem_filter$(EXEEXT) $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c -DHAVE_CONFIG_H -lm
+	$(CC_FOR_BUILD) -o make_modem_filter$(EXEEXT) $(top_srcdir)/src/make_modem_filter.c $(top_srcdir)/src/filter_tools.c -DHAVE_CONFIG_H -I$(abs_builddir) -lm
 
 # We need to run make_at_dictionary, so it generates the
 # at_interpreter_dictionary.h file