build with new rtmidi lib.

Gbp-Pq: Name 02-rtmidi-pkgconfig.patch

diff --git a/Makefile.am b/Makefile.am
index e101bce87af0baef4cfa7cc2564a99cf7b6a9d3a..6b61ccb443e9522b7dd1fb340cd4d35eb2ec7608 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -360,10 +360,10 @@ endif
 if LINUX
 
 # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
-cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
+cppFlags += $(RTMIDI_CFLAGS)
 
 ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
-  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \
+  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \
   -lfreetype
 
 endif

diff --git a/configure.ac b/configure.ac
index 9f772f66ae689836b204f2f115ae7eced03b65b7..a416559af3a3e8d185ef974022d55915da0a6318 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -129,23 +129,7 @@ AC_CHECK_HEADER(
 )
 AC_LANG_POP
 
-if test "x$os" = "xosx"; then
-       AC_LANG_PUSH([C++])
-       AC_CHECK_HEADER(
-               [RtMidi.h],
-               [],
-               [AC_MSG_ERROR([library 'rtMidi' not found!])]
-       )
-       AC_LANG_POP
-else
-       AC_LANG_PUSH([C++])
-       AC_CHECK_HEADER(
-               [rtmidi/RtMidi.h],
-               [],
-               [AC_MSG_ERROR([library 'rtMidi' not found!])]
-       )
-       AC_LANG_POP
-fi
+PKG_CHECK_MODULES([RTMIDI], [rtmidi])
 
 
 AC_LANG_PUSH([C++])