Howdies
A small patch to use pkg-config to find the location of the jack headers
and libs.
bye
John
Index: configure.in.in
===================================================================
RCS file: /cvsroot/rosegarden/rosegarden/configure.in.in,v
retrieving revision 1.54
diff -u -r1.54 configure.in.in
--- configure.in.in 10 Oct 2003 13:05:50 -0000 1.54
+++ configure.in.in 21 Oct 2003 19:38:47 -0000
@@ -71,12 +71,12 @@
dnl only use JACK when jack/jack.h is found
if test "$with_jack" = "yes"; then
- AC_CHECK_HEADERS(jack/jack.h,,[with_jack=no])
+ PKG_CHECK_MODULES(JACK,jack >= 0.50.0,,[with_jack="no"])
fi
if test "$with_jack" = "yes"; then
AC_CHECK_LIB(rt, shm_open)
- AC_CHECK_LIB(jack, jack_client_new)
+ AC_DEFINE(HAVE_LIBJACK, 1, [Define if you have JACK support])
dnl AC_DEFINE(HAVE_JACK, 1, [Define if you have JACK support])
dnl AC_SUBST(JACKLIB)
Index: sound/Makefile.am
===================================================================
RCS file: /cvsroot/rosegarden/sound/Makefile.am,v
retrieving revision 1.71
diff -u -r1.71 Makefile.am
--- sound/Makefile.am 10 Oct 2003 17:57:57 -0000 1.71
+++ sound/Makefile.am 21 Oct 2003 19:38:48 -0000
@@ -9,7 +9,7 @@
endif
# over stated path
-INCLUDES= $(all_includes) $(arts_includes) -I$(top_srcdir)/gui -I$(top_srcdir)/base
+INCLUDES= $(all_includes) $(arts_includes) -I$(top_srcdir)/gui -I$(top_srcdir)/base @JACK_CFLAGS@
COMPILE_FIRST = libRosegardenSound
@@ -80,7 +80,7 @@
endif
libRosegardenSequencer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -no-undefined
-libRosegardenSequencer_la_LIBADD = $(LIB_QT) $(arts_libs) libRosegardenSound.la ../base/libbase.la @ALSA_LIBS@
+libRosegardenSequencer_la_LIBADD = $(LIB_QT) $(arts_libs) libRosegardenSound.la ../base/libbase.la @ALSA_LIBS@ @JACK_LIBS@
libRosegardenSequencer_la_CFLAGS = @ALSA_CFLAGS@
