build with new rtmidi lib.

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

diff --git a/Makefile.am b/Makefile.am
index 9bd86b9e02bae36d3023c7231b6aa5459cc6d19f..9dcb68ba0034a7e255db69d2efe5b9c35fd04724 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -366,9 +366,10 @@ cppFlags += \
        -D__WINDOWS_ASIO__                           \
        -D__WINDOWS_WASAPI__                         \
        -D__WINDOWS_DS__
+cppFlags += $(RTMIDI_CFLAGS)
 
 ldAdd += -ldsound -lwsock32 -lm -lfltk -lwininet -lgdi32 -lshell32 -lvfw32 \
-       -lrpcrt4 -luuid -lcomctl32 -lws2_32 -lsndfile -lsamplerate -lrtmidi \
+       -lrpcrt4 -luuid -lcomctl32 -lws2_32 -lsndfile -lsamplerate $(RTMIDI_LIBS) \
        -lsetupapi -limm32 -lglu32 -lshell32 -lversion \
        -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc \
        -lole32 -lwinmm -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid
@@ -382,9 +383,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 \
+       -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) \
        -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama
 
 endif
@@ -393,9 +395,10 @@ if FREEBSD
 
 # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
 cppFlags += -D__LINUX_PULSE__ -D__UNIX_JACK__
+cppFlags += $(RTMIDI_CFLAGS)
 
 ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
-       -lpthread -lpulse-simple -lpulse -lsamplerate -lrtmidi \
+       -lpthread -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) \
        -lfreetype
 
 endif
@@ -409,8 +412,9 @@ cppFlags += -D__MACOSX_CORE__
 
 # -ObjC++: Juce requires to build some Objective C code
 cxxFlags += -ObjC++
+cppFlags += $(RTMIDI_CFLAGS)
 
-ldAdd += -lsndfile -lfltk -lrtmidi -lsamplerate -lm -lpthread \
+ldAdd += -lsndfile -lfltk $(RTMIDI_LIBS) -lsamplerate -lm -lpthread \
        -lFLAC -logg -lvorbis -lvorbisenc
 
 ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \

diff --git a/configure.ac b/configure.ac
index d7121b32033cbc77a1bd6e4edb1ee98b59d02d54..47d6337d5d587f769f67b6855facd5d8120caaab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,23 +123,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++])
 AC_CHECK_HEADER(