Enlightenment CVS committal
Author : vapier
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
make curl option more flexible so people can explicitly enable/disable curl
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- configure.in 18 Jun 2005 00:41:28 -0000 1.94
+++ configure.in 18 Jun 2005 01:22:18 -0000 1.95
@@ -777,7 +777,7 @@
)
if test "x$have_ecore_config" = "xyes"; then
- AC_ARG_WITH(eet-config, [ --with-eet-config=EET_CONFIG use eet-config
specified ],
+ AC_ARG_WITH(eet-config, [ --with-eet-config=EET_CONFIG use eet-config
specified ],
[ EET_CONFIG=$withval;
echo "using "$EET_CONFIG" for eet-config"; ],
[ if test -z "$EET_CONFIG"; then
@@ -892,19 +892,26 @@
curl_flags=""
curl_libs=""
-# Check for CURL
-AC_ARG_WITH(curl-config, [ --with-curl-config=CURL_CONFIG use curl-config
specified ],
- [ CURL_CONFIG=$withval;
- echo "using "$CURL_CONFIG" for curl-config"; ],
- [ if test -z "$CURL_CONFIG"; then
- AC_PATH_PROG(CURL_CONFIG, "curl-config", "", $PATH)
- fi
- ])
-if test "$CURL_CONFIG"; then
+AC_ARG_WITH(curl-config,
+[ --with-curl-config=CURL_CONFIG use curl-config specified], [
+ CURL_CONFIG=$withval
+],[
+ CURL_CONFIG="yes"
+]
+)
+if test "$CURL_CONFIG" = "yes"; then
+ AC_PATH_PROG(CURL_CONFIG, "curl-config", "", $PATH)
+elif test "$CURL_CONFIG" != "no"; then
+ AC_MSG_RESULT(using "$CURL_CONFIG" for curl-config)
+else
+ CURL_CONFIG=""
+fi
+
+if test -n "$CURL_CONFIG"; then
use_curl="yes"
curl_cflags=`$CURL_CONFIG --cflags`
curl_libs=`$CURL_CONFIG --libs`
- AC_DEFINE(HAVE_CURL, 1, [Downloading with CURL])
+ AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ])
fi
if test "x$have_ecore_file" = "xyes"; then
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
