[xiph-commits] r9558 - trunk/vorbis-tools

[thomasvs at svn.xiph.org]

Author: thomasvs
Date: 2005-07-11 03:20:12 -0700 (Mon, 11 Jul 2005)
New Revision: 9558

Modified:
   trunk/vorbis-tools/acinclude.m4
   trunk/vorbis-tools/configure.ac
Log:
make ogg123 build even without curl

Modified: trunk/vorbis-tools/acinclude.m4
===================================================================
--- trunk/vorbis-tools/acinclude.m4	2005-07-10 14:29:35 UTC (rev 9557)
+++ trunk/vorbis-tools/acinclude.m4	2005-07-11 10:20:12 UTC (rev 9558)
@@ -483,6 +483,7 @@
 
   if test "x$no_curl" = "x" ; then
      AC_MSG_RESULT(yes)
+     AC_DEFINE(HAVE_CURL, 1, [Define if you have libcurl.])
      ifelse([$1], , :, [$1])     
   else
      AC_MSG_RESULT(no)
@@ -515,7 +516,6 @@
      CURL_LIBS=""
      ifelse([$2], , :, [$2])
   fi
-  AC_DEFINE(HAVE_CURL, 1, [Define if you have libcurl.])
 else
   CURL_CFLAGS=""
   CURL_LIBS=""

Modified: trunk/vorbis-tools/configure.ac
===================================================================
--- trunk/vorbis-tools/configure.ac	2005-07-10 14:29:35 UTC (rev 9557)
+++ trunk/vorbis-tools/configure.ac	2005-07-11 10:20:12 UTC (rev 9558)
@@ -157,10 +157,14 @@
 dnl Check for ogg123 critical libraries and other optional libraries
 dnl --------------------------------------------------
 
+dnl curl is an optional dependancy of ogg123
+dnl FIXME: upstream curl has switched to having a curl-config;
+dnl maybe that's better than using AM_PATH_CURL from an acinclude.m4 in svn
+AM_PATH_CURL(have_curl=yes, have_curl=no; AC_MSG_WARN(libcurl missing))
+
 if test "x$build_ogg123" = xyes; then
   AC_MSG_RESULT([checking for ogg123 requirements])
   XIPH_PATH_AO(,build_ogg123=no; AC_MSG_WARN(libao missing))
-  AM_PATH_CURL(,build_ogg123=no; AC_MSG_WARN(libcurl missing))
 
   ACX_PTHREAD(,build_ogg123=no; AC_MSG_WARN(POSIX threads missing))
 fi
@@ -304,8 +308,8 @@
 
 if test "x$build_ogg123" != xyes; then
     AC_MSG_WARN([Prerequisites for ogg123 not met, ogg123 will be skipped.
-Please ensure that you have POSIX threads, libcurl and libao libraries and
-headers present if you would like to build ogg123.])
+Please ensure that you have POSIX threads, libao, and (optionally) libcurl
+libraries and headers present if you would like to build ogg123.])
 else
     if test "x$have_libFLAC" != xyes; then
         AC_MSG_WARN([FLAC and/or OggFLAC libraries or headers missing, ogg123 
@@ -315,4 +319,8 @@
         AC_MSG_WARN([Speex libraries and/or headers missing, ogg123 
 will NOT be built with Speex read support.])
     fi         
+    if test "x$have_curl" != xyes; then
+        AC_MSG_WARN([curl libraries and/or headers missing, ogg123 
+will NOT be built with http support.])
+    fi         
 fi