From: Juho Vähä-Herttua <juhovh@iki.fi>
Date: Wed, 10 Apr 2013 16:19:09 +0000 (+0300)
Subject: Clean up the autotools scripts a bit
X-Git-Tag: upstream/0.9.0~4^2~24
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=b1df60b553e2f6f944216d5d94b39a25109d17f4;p=deb_shairplay.git

Clean up the autotools scripts a bit
---

diff --git a/configure.ac b/configure.ac
index 4822373..94a1bbd 100644
--- 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 3672969..3697bbc 100644
--- 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