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

[ivo at svn.xiph.org]

Author: ivo
Date: 2008-02-14 20:56:21 -0800 (Thu, 14 Feb 2008)
New Revision: 14514

Modified:
   trunk/vorbis-tools/configure.ac
Log:
Patch for libcurl check to make sure it compiles even if "the system pkg-config exists, but the
installed libcurl has not installed a pkg-config file".

Modified: trunk/vorbis-tools/configure.ac
===================================================================
--- trunk/vorbis-tools/configure.ac	2008-02-15 01:58:24 UTC (rev 14513)
+++ trunk/vorbis-tools/configure.ac	2008-02-15 04:56:21 UTC (rev 14514)
@@ -165,6 +165,9 @@
 dnl curl is an optional dependancy of ogg123
 if test "x$HAVE_PKG_CONFIG" = "xyes"; then
   PKG_CHECK_MODULES(CURL, libcurl, HAVE_CURL=yes, HAVE_CURL=no)
+  if test "x$HAVE_CURL" = "xno"; then
+    AM_PATH_CURL(HAVE_CURL=yes, HAVE_CURL=no; AC_MSG_WARN(libcurl missing))
+  fi
 else
   AM_PATH_CURL(HAVE_CURL=yes, HAVE_CURL=no; AC_MSG_WARN(libcurl missing))
 fi
@@ -350,9 +353,9 @@
     if test "x$have_libspeex" != xyes; then
         AC_MSG_WARN([Speex libraries and/or headers missing, ogg123 
 will NOT be built with Speex read support.])
-    fi         
+    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
 fi