From 376f86383377c2f8ed88c0a317cf79f3d93b1278 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Wed, 7 Mar 2012 18:22:37 -0800 Subject: [PATCH] More build system tweaks. --- scripts/config-funcs | 6 +++--- sequencer/configure | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/config-funcs b/scripts/config-funcs index a3804b7..9a67270 100644 --- a/scripts/config-funcs +++ b/scripts/config-funcs @@ -185,7 +185,7 @@ begin () echo -n "Checking sanity..." require_command tput tput > /dev/null require_command pkg-config pkg-config > /dev/null - require_command fltk-config ../lib/fltk/fltk-config >/dev/null + require_command fltk-config lib/fltk/fltk-config >/dev/null require_command sed sed > /dev/null ok } @@ -260,11 +260,11 @@ require_command () if [ -x "$2" ] then name="$PWD/$2" - ok + ok "$name" elif [ -x "`which "$2"`" ] then name="`which "$2"`" - ok + ok "$name" else failed fatal "Command $1 not found." diff --git a/sequencer/configure b/sequencer/configure index 1491d38..90fddce 100755 --- a/sequencer/configure +++ b/sequencer/configure @@ -17,7 +17,7 @@ begin_tests require_package JACK 0.103.0 jack suggest_package XPM 2.0.0 xpm require_FLTK 1.3.0 images -require_command FLUID lib/fltk/fluid/fluid && append "FLUID=lib/fltk/fluid/fluid" +require_command FLUID lib/fltk/fluid/fluid test_version `version_of jack` 0.105.0 || append "JACK_MIDI_PROTO_API=yes" require_package liblo 0.23 liblo