From f5c977714654d7c27581cd08b6fe0a7b56724f46 Mon Sep 17 00:00:00 2001 From: James Cowgill Date: Wed, 25 Oct 2017 14:25:50 +0200 Subject: [PATCH] build with new rtmidi lib. Gbp-Pq: Name 02-rtmidi-pkgconfig.patch --- Makefile.am | 4 ++-- configure.ac | 18 +----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index e101bce..6b61ccb 100644 --- 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 9f772f6..a416559 100644 --- 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++]) -- 2.30.2