[xiph-cvs] cvs commit: m4 xiph_curl.m4

[Karl Heyes]

karl        03/07/26 20:15:53

  Modified:    .        xiph_curl.m4
  Log:
  fixup last curl test with all the info it needs and avoid variable
  name clashes.

Revision  Changes    Path
1.4       +10 -8     m4/xiph_curl.m4

Index: xiph_curl.m4
===================================================================
RCS file: /usr/local/cvsroot/m4/xiph_curl.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xiph_curl.m4	24 Jul 2003 02:31:36 -0000	1.3
+++ xiph_curl.m4	27 Jul 2003 00:15:52 -0000	1.4
@@ -33,8 +33,10 @@
 
 curl_ok="yes"
 
-ac_curl_CPPFLAGS="$CPPFLAGS"
-ac_curl_LIBS="$LIBS"
+xt_curl_CFLAGS="$CFLAGS"
+xt_curl_CPPFLAGS="$CPPFLAGS"
+xt_curl_LIBS="$LIBS"
+CFLAGS="-DCURL_CFLAG"
 CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
 LIBS="$CURL_LIBS $LIBS"
 dnl
@@ -42,18 +44,16 @@
 dnl
 AC_CHECK_HEADERS([curl/curl.h],, curl_ok="no") 
 AC_MSG_CHECKING(for libcurl)
-if test "$curl_ok" = "yes"; then
-    AC_RUN_IFELSE([
+if test "$curl_ok" = "yes"
+then
+    AC_RUN_IFELSE(AC_LANG_SOURCE([
 #include <curl/curl.h>
 int main()
 {
     return 0;
 }
-],,[curl_ok="no"])
+]),,[curl_ok="no"])
 fi
-CPPFLAGS="$ac_curl_CPPFLAGS"
-LIBS="$ac_curl_LIBS"
-
 if test "$curl_ok" = "yes"; then
     AC_MSG_RESULT(yes)
     AC_DEFINE(HAVE_CURL, 1, [Define if you have libcurl.])
@@ -64,4 +64,6 @@
     CURL_CFLAGS=""
     ifelse([$2], , :, [$2])
 fi
+CPPFLAGS="$xt_curl_CPPFLAGS"
+LIBS="$xt_curl_LIBS"
 ])

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.