From: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
Date: Sun, 15 Jan 2017 17:51:32 +0000 (+0000)
Subject: rtmidi-pkgconfig
X-Git-Tag: archive/raspbian/0.15.4+ds1-1+rpi1~1^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fbd4016172fea6af9ab6a3c995dddc5d9fd86095;p=giada.git

rtmidi-pkgconfig


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

diff --git a/Makefile.am b/Makefile.am
index edb15a4..b4f388a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -211,9 +211,9 @@ giada_SOURCES += src/deps/rtaudio-mod/RtAudio.h src/deps/rtaudio-mod/RtAudio.cpp
 # -Wno-error=vla: mute rtAudio error on variable length array
 # -Wno-error=misleading-indentation: mute JUCE warnings on GCC6
 giada_CXXFLAGS += -Wno-error=vla -Wno-error=misleading-indentation
-giada_CPPFLAGS += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
+giada_CPPFLAGS += $(RTMIDI_CFLAGS)
 giada_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
 
@@ -303,7 +303,7 @@ src/deps/juce/modules/juce_gui_extra/juce_gui_extra.cpp
 endif
 
 giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
-  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
+  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse $(RTMIDI_LIBS) \
   -lfreetype
 
 giada_tests_CXXFLAGS = -std=c++11
diff --git a/configure.ac b/configure.ac
index 16fd0c3..8e6f8ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,13 +106,7 @@ AC_CHECK_HEADER(
 )
 AC_LANG_POP
 
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(
-	[RtMidi.h],
-	[],
-	[AC_MSG_ERROR([library 'rtMidi' not found!])]
-)
-AC_LANG_POP
+PKG_CHECK_MODULES([RTMIDI], [rtmidi])
 
 AC_LANG_PUSH([C++])
 AC_CHECK_HEADER(