mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: always name *_LIBS and *_FLAGS in uppercase.

This commit is contained in:
Jonathan Moore Liles 2008-05-20 15:29:10 -05:00
parent 94de188684
commit 7e72339ea9
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -22,7 +22,7 @@ else
CXXFLAGS := -pipe -O3 -fno-rtti -fno-exceptions -DNDEBUG CXXFLAGS := -pipe -O3 -fno-rtti -fno-exceptions -DNDEBUG
endif endif
CXXFLAGS += $(libsndfile_CFLAGS) $(LASH_CFLAGS) $(FLTK_CFLAGS) -DINSTALL_PREFIX="\"$(prefix)\"" -DVERSION=\"$(VERSION)\" CXXFLAGS += $(SNDFILE_CFLAGS) $(LASH_CFLAGS) $(FLTK_CFLAGS) -DINSTALL_PREFIX="\"$(prefix)\"" -DVERSION=\"$(VERSION)\"
include scripts/colors include scripts/colors

2
Timeline/makefile.inc
View File

@ -43,7 +43,7 @@ Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
# $(Timeline_OBJS): Makefile # $(Timeline_OBJS): Makefile
# $(Timeline_OBJS): make.conf # $(Timeline_OBJS): make.conf
Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(libsndfile_LIBS) $(LASH_LIBS) Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LASH_LIBS)
Timeline/timeline: $(Timeline_OBJS) FL Timeline/timeline: $(Timeline_OBJS) FL
@ echo -n Linking timeline... @ echo -n Linking timeline...

2
configure vendored
View File

@ -18,7 +18,7 @@ begin_tests
require_FLTK 1.1.7 images require_FLTK 1.1.7 images
require_command FLUID fluid require_command FLUID fluid
require_package JACK 0.103.0 jack require_package JACK 0.103.0 jack
require_package libsndfile 1.0.17 sndfile require_package sndfile 1.0.17 sndfile
using LASH && require_package LASH 0.5.4 lash-1.0 using LASH && require_package LASH 0.5.4 lash-1.0

12
scripts/config-funcs
View File

@ -57,6 +57,11 @@ using ()
return $? return $?
} }
upcase ()
{
echo "$*" | tr '[[:lower:]]' '[[:upper:]]'
}
extract_options () extract_options ()
{ {
local line name value local line name value
@ -135,6 +140,8 @@ require_command ()
require_package () require_package ()
{ {
local name
echo -n "Checking for $BOLD$1$SGR0..." echo -n "Checking for $BOLD$1$SGR0..."
if ! pkg-config --exists $3 if ! pkg-config --exists $3
then then
@ -146,8 +153,9 @@ require_package ()
fatal "The installed version of $1 (`pkg-config --mod-version $3`) is too old." fatal "The installed version of $1 (`pkg-config --mod-version $3`) is too old."
fi fi
append "${1}_LIBS=`pkg-config --libs $3`" name="`upcase \"$1\"`"
append "${1}_CFLAGS=-DHAVE_${1} `pkg-config --cflags $3`" append "${name}_LIBS=`pkg-config --libs $3`"
append "${name}_CFLAGS=-DHAVE_${1} `pkg-config --cflags $3`"
ok ok
return 0 return 0