--- vorbis-tools-1.0/configure.sopwith	Thu Aug  7 13:24:03 2003
+++ vorbis-tools-1.0/configure	Thu Aug  7 13:25:27 2003
@@ -425,23 +425,9 @@
 
 if test "x$curl_prefix" != "xno" ; then
 
-  if test "x$curl_libraries" != "x" ; then
-    CURL_LIBS="-L$curl_libraries"
-  elif test "x$curl_prefix" != "x" ; then
-    CURL_LIBS="-L$curl_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    CURL_LIBS="-L$prefix/lib"
-  fi
+  CURL_LIBS="`curl-config --libs`"
+  CURL_CFLAGS="`curl-config --cflags`"
 
-  CURL_LIBS="$CURL_LIBS -lcurl"
-
-  if test "x$curl_includes" != "x" ; then
-    CURL_CFLAGS="-I$curl_includes"
-  elif test "x$curl_prefix" != "x" ; then
-    CURL_CFLAGS="-I$curl_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    CURL_CFLAGS="-I$prefix/include"
-  fi
 
   AC_MSG_CHECKING(for libcurl)
   no_curl=""