Clean up the autotools scripts a bit

diff --git a/configure.ac b/configure.ac
index 482237321d526bbdfa37f512498dc018dadaf738..94a1bbde808839fe2484c486a6d8c2668968afbf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,8 @@ AM_CONDITIONAL([OS_GNU],[test "$os_gnu" = "yes"])
 AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
 
 # Custom check for libao
-PKG_CHECK_MODULES([libao], [ao >= 1.1.0], [HAVE_LIBAO=1], [HAVE_LIBAO=0])
-AM_CONDITIONAL([USE_LIBAO], [test "$HAVE_LIBAO" -eq 1])
+PKG_CHECK_MODULES([libao], [ao >= 1.1.0], [have_libao=1], [have_libao=0])
+AM_CONDITIONAL([HAVE_LIBAO], [test "$have_libao" -eq 1])
 
 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 3672969be59f526708f933de01d25d660d3b8d4d..3697bbc21b104677cdb2f8e91837bb3d9a3c4ca7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = lib
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-if USE_LIBAO
+if HAVE_LIBAO
   bin_PROGRAMS = shairplay
   shairplay_SOURCES = shairplay.c
   shairplay_LDADD = lib/libshairplay.la