build with new rtmidi lib.

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

diff --git a/Makefile.am b/Makefile.am
index 93e11fc6c2b0f1c306374c99afb2125fe1cb4c92..3c4b47ee6a032ef5dbc3a5f0c3807bf4d0fe5df7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -358,7 +358,7 @@ cppFlags += \
        -D__WINDOWS_DS__
 
 ldAdd += -ldsound -lwsock32 -lm -lfltk -lwininet -lgdi32 -lshell32 -lvfw32 \
-  -lrpcrt4 -luuid -lcomctl32 -lole32 -lws2_32 -lsndfile -lsamplerate -lrtmidi \
+  -lrpcrt4 -luuid -lcomctl32 -lole32 -lws2_32 -lsndfile -lsamplerate $(RTMIDI_LIBS) \
   -lwinmm -lsetupapi -lksuser -ljansson -limm32 -lglu32 -lshell32 -lversion \
   -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc
 
@@ -371,9 +371,10 @@ 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 -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama
 
 endif
@@ -388,7 +389,7 @@ cppFlags += -D__MACOSX_CORE__
 # -ObjC++: Juce requires to build some Objective C code
 cxxFlags += -ObjC++
 
-ldAdd += -lsndfile -lfltk -lrtmidi -lsamplerate -ljansson -lm -lpthread \
+ldAdd += -lsndfile -lfltk $(RTMIDI_LIBS) -lsamplerate -ljansson -lm -lpthread \
   -lFLAC -logg -lvorbis -lvorbisenc
 
 ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \

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++])