From 394664a09aa5b4fe39b709a0cdfce008dd8f55d2 Mon Sep 17 00:00:00 2001
From: Sebastian Dransfeld <sd@tango.flipp.net>
Date: Wed, 26 Sep 2007 17:14:27 +0000
Subject: [PATCH] curl is used both by ecore_file and ecore_con

SVN revision: 31824
---
 legacy/ecore/configure.in | 53 ++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 3d3304349c..642e5dc623 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -602,7 +602,6 @@ if test "x$want_ecore_evas_sdl" = "xyes"; then
 
   save_CFLAGS=$CFLAGS
   CFLAGS=$CFLAGS" $sdl_cflags"
-echo $CFLAGS
   AC_CHECK_HEADER(Evas_Engine_SDL.h,
     [
       AC_DEFINE(BUILD_ECORE_EVAS_SDL, 1, [Support for SDL in Ecore_Evas])
@@ -678,6 +677,27 @@ if test "x$use_openssl" = "xyes"; then
   )
 fi
 
+AC_ARG_ENABLE(curl,
+  AC_HELP_STRING(
+    [--enable-curl],
+    [enable curl support @<:@default=auto@:>@]
+  ),
+  [ use_curl=$enableval ],
+  [ use_curl=yes ]
+)
+
+if test "x$use_curl" = "xyes"; then
+  PKG_CHECK_MODULES(CURL, libcurl,
+    [
+      AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ])
+      requirements_ecore_file="$requirements_ecore_file libcurl"
+      requirements_ecore_con="$requirements_ecore_con libcurl"
+    ], [
+      use_curl=no
+    ]
+  )
+fi
+
 want_abstract_sockets="yes"
 AC_ARG_ENABLE(abstract-sockets,
   AC_HELP_STRING(
@@ -806,35 +826,6 @@ if test "x$have_ecore_file" = "xyes"; then
   if test "x$use_poll" = "xyes"; then
     AC_DEFINE(HAVE_POLL, 1, [ File monitoring with polling ])
   fi
-
-  use_curl="yes"
-  AC_MSG_CHECKING(whether CURL is to be used for file download)
-  AC_ARG_ENABLE(curl,
-    [  --disable-curl                disable curl in the ecore_file module],
-    [
-      if test "$enableval" = "yes"; then
-        AC_MSG_RESULT(yes)
-      else
-        AC_MSG_RESULT(no)
-        use_curl="no"
-      fi
-    ], [
-      AC_MSG_RESULT(yes)
-    ]
-  )
-
-  if test "x$use_curl" = "xyes"; then
-    PKG_CHECK_MODULES(CURL, libcurl,
-      [
-        AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ])
-        ecore_file_libs="$ecore_file_libs $CURL_LIBS"
-        ecore_file_win32_lib="$ecore_file_win32_lib $winsock_libs"
-        requirements_ecore_file="$requirements_ecore_file libcurl"
-      ], [
-        use_curl="no"
-      ]
-    )
-  fi
 fi
 
 AC_SUBST(fam_libs)
@@ -916,7 +907,7 @@ echo
 echo "Optional Modules:"
 echo
 echo "  Ecore_Job....................: $have_ecore_job"
-echo "  Ecore_Con....................: $have_ecore_con (OpenSSL: $use_openssl)"
+echo "  Ecore_Con....................: $have_ecore_con (OpenSSL: $use_openssl) (CURL: $use_curl)"
 echo "  Ecore_Txt....................: $have_ecore_txt"
 if test "x$have_ecore_x_xcb" = "xyes" ; then
 echo "  Ecore_X (XCB backend)........: $have_ecore_x_xcb (Xprint: $have_ecore_x_xcb_xprint) (Xinerama: $have_ecore_x_xcb_xinerama) (Xrandr: $have_ecore_x_xcb_randr) (Xscreensaver: $have_ecore_x_xcb_screensaver) (Xshape: $have_ecore_x_xcb_shape) (Xsync: $have_ecore_x_xcb_sync) (Xrender: $have_ecore_x_xcb_render) (Xfixes: $have_ecore_x_xcb_xfixes) (Xdamage: $have_ecore_x_xcb_damage) (Xdpms: $have_ecore_x_xcb_dpms)"