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

Makefile

@@ -22,7 +22,7 @@ else
 	CXXFLAGS := -pipe -O3 -fno-rtti -fno-exceptions -DNDEBUG
 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
 

Timeline/makefile.inc

@@ -43,7 +43,7 @@ Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
 # $(Timeline_OBJS): Makefile
 # $(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
 	@ echo -n Linking timeline...

configure

@@ -18,7 +18,7 @@ begin_tests
 require_FLTK 1.1.7 images
 require_command FLUID fluid
 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
 

scripts/config-funcs

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