commit 390afeb01a48e206e592afc2b8567741ddf83970
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Wed Aug 1 22:09:05 2012 +0100
Fix configure script to properly handle 'without' switches
* --without-* switches are available for flac, ogg and curl libraries. This
corrects the logic so that configuration can continue if these libraries
are specifically excluded.
configure.ac | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e0dcee1..f2d83c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,9 +189,9 @@ fi
dnl Check for libcurl
dnl -------------------------------------------------------------
-AC_ARG_WITH(curl, AS_HELP_STRING([--without-curl],[Disable coverart download
support]))
+AC_ARG_WITH(curl, AS_HELP_STRING([--without-curl], [Disable coverart download
support]), [], [with_curl=yes])
if test "x$with_curl" != "xno" -a "x$have_curl" = "xno"; then
- AC_MSG_ERROR([curl support explicitly requested but curl could not be
found])
+ AC_MSG_ERROR([The curl library could not be found. Explicity disable
support by rerunning with --without-curl])
fi
AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
@@ -287,10 +287,11 @@ fi
dnl Checks for filetype_ogg plugin
dnl -------------------------------------------------------------
-AC_ARG_WITH(ogg, AS_HELP_STRING([--without-ogg],[Disable Ogg/Vorbis support]))
+AC_ARG_WITH(ogg, AS_HELP_STRING([--without-ogg], [Disable Ogg/Vorbis
support]), [], [with_ogg=yes])
if test "x$with_ogg" != "xno" -a "x$have_vorbis" = "xno"; then
- AC_MSG_ERROR([Ogg/Vorbis support explicitly requested but ogg/vorbis libs
could not be found])
+ AC_MSG_ERROR([Ogg/Vorbis libraries could not be found.
Explicitly disable support by rerunning with --without-ogg])
fi
+
AM_CONDITIONAL(HAVE_PLUGIN_FILETYPE_OGG, test "x$have_vorbis" = "xyes")
if test "x$have_vorbis" = "xyes"; then
AC_DEFINE(HAVE_PLUGIN_FILETYPE_OGG, 1, [Define if you have the ogg/vorbis
support])
@@ -299,9 +300,9 @@ fi
dnl Checks for filetype_flac plugin
dnl -------------------------------------------------------------
-AC_ARG_WITH(flac, AS_HELP_STRING([--without-flac],[Disable FLAC support]))
-if test "xwith_flac" = "xyes" -a "x$have_flac" = "xno"; then
- AC_MSG_ERROR([FLAC support explicitly requested but flac libs could not
be found])
+AC_ARG_WITH(flac, AS_HELP_STRING([--without-flac], [Disable FLAC support]),
[], [with_flac=yes])
+if test "x$with_flac" != "xno" -a "x$have_flac" = "xno"; then
+ AC_MSG_ERROR([The FLAC library could not be found. Explicitly
disable support by rerunning with --without-flac])
fi
AM_CONDITIONAL(HAVE_PLUGIN_FILETYPE_FLAC, test "x$have_flac" = "xyes")
if test "x$have_flac" = "xyes"; then
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
