configure.ac: rename HAVE_CURL to ENABLE_CURL

2009-09-24 21:40:07 +02:00 · 2009-09-24 21:40:07 +02:00 · 47ab2ad6f3
commit 47ab2ad6f3
parent 06d5d4b03e
4 changed files with 6 additions and 6 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -515,7 +515,7 @@ INPUT_SRC = \
 	src/input_stream.c \
 	src/input/file_input_plugin.c

-if HAVE_CURL
+if ENABLE_CURL
 INPUT_SRC += src/input/curl_input_plugin.c src/icy_metadata.c
 endif

--- a/configure.ac
+++ b/configure.ac
@ -280,9 +280,9 @@ AC_ARG_ENABLE(curl,
 MPD_AUTO_PKG(curl, CURL, [libcurl],
 	[libcurl HTTP streaming], [libcurl not found])
 if test x$enable_curl = xyes; then
-	AC_DEFINE(HAVE_CURL, 1, [Define when libcurl is used for HTTP streaming])
+	AC_DEFINE(ENABLE_CURL, 1, [Define when libcurl is used for HTTP streaming])
 fi
-AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes)
+AM_CONDITIONAL(ENABLE_CURL, test x$enable_curl = xyes)

 AC_ARG_ENABLE(lastfm,
 	AS_HELP_STRING([--enable-lastfm],
--- a/src/input_stream.c
+++ b/src/input_stream.c
@ -27,7 +27,7 @@
 #include "input/archive_input_plugin.h"
 #endif

-#ifdef HAVE_CURL
+#ifdef ENABLE_CURL
 #include "input/curl_input_plugin.h"
 #endif

@ -46,7 +46,7 @@ static const struct input_plugin *const input_plugins[] = {
 #ifdef ENABLE_ARCHIVE
 	&input_plugin_archive,
 #endif
-#ifdef HAVE_CURL
+#ifdef ENABLE_CURL
 	&input_plugin_curl,
 #endif
 #ifdef ENABLE_LASTFM
--- a/src/ls.c
+++ b/src/ls.c
@ -32,7 +32,7 @@
  * connected by IPC socket.
  */
 static const char *remoteUrlPrefixes[] = {
-#ifdef HAVE_CURL
+#ifdef ENABLE_CURL
 	"http://",
 #endif
 #ifdef ENABLE_LASTFM