[xiph-commits] r14825 - in icecast/trunk/icecast: . src

[karl at svn.xiph.org]

Author: karl
Date: 2008-05-02 16:18:52 -0700 (Fri, 02 May 2008)
New Revision: 14825

Modified:
   icecast/trunk/icecast/configure.in
   icecast/trunk/icecast/src/main.c
Log:
check if function exists, some older versions don't have this


Modified: icecast/trunk/icecast/configure.in
===================================================================
--- icecast/trunk/icecast/configure.in	2008-05-02 16:10:22 UTC (rev 14824)
+++ icecast/trunk/icecast/configure.in	2008-05-02 23:18:52 UTC (rev 14825)
@@ -102,6 +102,7 @@
 XIPH_PATH_CURL([
     AC_CHECK_DECL([CURLOPT_NOSIGNAL],
         [ AC_DEFINE([HAVE_AUTH_URL], 1, [Define to compile in auth URL support code])
+        AC_CHECK_FUNCS([curl_global_init])
         ICECAST_OPTIONAL="$ICECAST_OPTIONAL auth_url.o"
         enable_curl="yes"
         XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$CURL_CFLAGS])

Modified: icecast/trunk/icecast/src/main.c
===================================================================
--- icecast/trunk/icecast/src/main.c	2008-05-02 16:10:22 UTC (rev 14824)
+++ icecast/trunk/icecast/src/main.c	2008-05-02 23:18:52 UTC (rev 14825)
@@ -110,8 +110,10 @@
 #if !defined(WIN32) || defined(WIN32_SERVICE)
     /* win32 GUI needs to do the initialise before here */
     xslt_initialize();
+#ifdef HAVE_CURL_GLOBAL_INIT
     curl_global_init (CURL_GLOBAL_ALL);
 #endif
+#endif
 }
 
 static void _shutdown_subsystems(void)