Changeset 19356 in vbox for trunk/configure

Timestamp:

May 5, 2009 9:43:35 AM (16 years ago)

Author:

vboxsync

Message:

more for integration of libcurl

File:

• trunk/configure (modified) (3 diffs)

trunk/configure

@@ -99 +99 @@
 INCPNG=""
 LIBPNG="-lpng"
+INCCURL=""
+LIBCURL="-lcurl"
 PKGCONFIG="`which_wrapper pkg-config`"
 PYTHONDIR="/usr /usr/local"
@@ -920 +922 @@
       cnf_append "SDK_VBOX_LIBPNG_LIBS" "`strip_l "$LIBPNG"`"
       cnf_append "SDK_VBOX_LIBPNG_INCS" "$INCPNG"
+    fi
+  fi
+}
+
+#
+# Check for libcurl, needed by S3
+#
+check_curl()
+{
+  test_header libcurl
+  cat > $ODIR.tmp_src.cc << EOF
+#include <cstdio>
+#include <curl/curl.h>
+extern "C" int main(void)
+{
+  printf("found version %s", LIBCURL_VERSION);
+#if LIBCURL_VERSION_MAJOR >= 7 && LIBCURL_VERSION_MINOR >= 19
+  printf(", OK.\n");
+  return 0;
+#else
+  printf(", expected version 7.19.0 or higher\n");
+  return 1;
+#endif
+}
+EOF
+  [ -n "$INCCURL" ] && I_INCCURL=`prefix_I "$INCCURL"`
+#  if test_compile "$LIBCURL $I_INCCURL" libcurl libcurl nofatal; then
+  if test_compile "$LIBCURL $I_INCCURL" libcurl libcurl; then
+#    if test_execute nofatal; then
+    if test_execute; then
+      cnf_append "SDK_VBOX_LIBCURL_LIBS" "`strip_l "$LIBCURL"`"
+      cnf_append "SDK_VBOX_LIBCURL_INCS" "$INCCURL"
     fi
   fi
@@ -2133 +2167 @@
 [ "$OS" != "darwin"  ] && check_z
 [ "$OS" != "darwin" -a "$OS" != "freebsd" ] && check_png
+[ "$OS" != "darwin" -a $OSE -eq 0 ] && check_curl
 [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
 [ $WITH_SDL -eq 1 ]    && check_sdl