From abd9574ce7573b967ca6f1b09bfae60de6369e51 Mon Sep 17 00:00:00 2001
From: darkeye <darkeye@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Mon, 5 Mar 2007 20:21:38 +0000
Subject: [PATCH] fixed issue with compiling with jack installed at arbitrary
 locations, fixes #14

---
 darkice/trunk/ChangeLog       |  1 +
 darkice/trunk/configure.in    | 30 +++++++++++++++++++++++-------
 darkice/trunk/src/Makefile.am |  2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog
index e82fe31..463d01c 100644
--- a/darkice/trunk/ChangeLog
+++ b/darkice/trunk/ChangeLog
@@ -16,6 +16,7 @@ DarkIce next release
       Mariusz Mazur <mmazur@kernel.pl>
     o fix to enable file dump feature using ogg vorbis.
       thanks to dsk <derrick@csociety.org>
+    o fix to enable compiling with jack installed at arbitrary locations
 
 
 19-05-2006 DarkIce 0.17.1 released
diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in
index d1c8a6a..4445690 100644
--- a/darkice/trunk/configure.in
+++ b/darkice/trunk/configure.in
@@ -234,17 +234,33 @@ dnl-----------------------------------------------------------------------------
 dnl link JACK sound server if requested 
 dnl-----------------------------------------------------------------------------
 AC_SUBST(JACK_CFLAGS)
-AC_SUBST(JACK_LIBS)
+AC_SUBST(JACK_LDFLAGS)
 
-AC_ARG_WITH( jack,
-[  --with-jack             use JACK audio server [yes] ],
+AC_ARG_WITH(jack,
+[  --with-jack             use JACK sound system [yes] ],
     USE_JACK=${withval}, USE_JACK="yes" )
+AC_ARG_WITH(jack-prefix,
+[  --with-jack-prefix=DIR      alternate location for JACK [/usr]
+                              look for libraries in JACK-PREFIX/lib,
+                              for headers in JACK-PREFIX/include],
+    CONFIG_JACK_PREFIX="${withval}", CONFIG_JACK_PREFIX="/usr")
 
 if test "x${USE_JACK}" = "xyes" ; then
-	PKG_CHECK_MODULES(JACK, jack,
-		[ AC_DEFINE( HAVE_JACK_LIB, 1, [build with JACK audio server support] ) ],
-		[ HAVE_JACK_LIB=0 ]
-	)
+    AC_MSG_CHECKING( [for jack libraries at ${CONFIG_JACK_PREFIX}] )
+    LA_SEARCH_LIB( JACK_LIB_LOC, JACK_INC_LOC, libjack.so, jack/jack.h,
+                   ${CONFIG_JACK_PREFIX})
+
+    if test "x${JACK_LIB_LOC}" != "x" ; then
+
+        AC_DEFINE( HAVE_JACK_LIB, 1, [build with JACK audio server support] )
+        if test "x${JACK_INC_LOC}" != "x${SYSTEM_INCLUDE}" ; then
+            JACK_INCFLAGS="-I${JACK_INC_LOC}"
+        fi
+        JACK_LDFLAGS="-L${JACK_LIB_LOC} -ljack"
+        AC_MSG_RESULT( [found at ${CONFIG_JACK_PREFIX}] )
+    else
+        AC_MSG_WARN( [not found, building without JACK support])
+    fi
 else
     AC_MSG_RESULT( [building without JACK support] )
 fi
diff --git a/darkice/trunk/src/Makefile.am b/darkice/trunk/src/Makefile.am
index 6a5a55d..502f2f7 100644
--- a/darkice/trunk/src/Makefile.am
+++ b/darkice/trunk/src/Makefile.am
@@ -3,7 +3,7 @@ AM_CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
 			  @JACK_CFLAGS@ 
 INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @FAAC_INCFLAGS@ @TWOLAME_INCFLAGS@ @ALSA_INCFLAGS@
 LDADD = @PTHREAD_LIBS@ @LAME_LDFLAGS@ @VORBIS_LDFLAGS@ @FAAC_LDFLAGS@ @TWOLAME_LDFLAGS@ \
-		@ALSA_LDFLAGS@ @JACK_LIBS@
+		@ALSA_LDFLAGS@ @JACK_LDFLAGS@
 
 darkice_SOURCES =   AudioEncoder.h\
                     AudioSource.h\