[58139] trunk/base

[toby at macports.org]

Revision: 58139
          http://trac.macports.org/changeset/58139
Author:   toby at macports.org
Date:     2009-09-22 14:50:20 -0700 (Tue, 22 Sep 2009)
Log Message:
-----------
work around bizarre curl-config --libs output

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2009-09-22 21:50:09 UTC (rev 58138)
+++ trunk/base/aclocal.m4	2009-09-22 21:50:20 UTC (rev 58139)
@@ -760,9 +760,14 @@
 	fi
 
 	CFLAGS_LIBCURL=$($CURL_CONFIG --cflags)
-	# Due to a bug in dist, --arch flags are improperly supplied by curl-config.
-	# Get rid of them.
-	LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | [sed 's/-arch [A-Za-z0-9_]* //g'])
+	if test "x$curlprefix" = "x"; then
+		# System curl-config emits absurd output for --libs
+		LDFLAGS_LIBCURL="-lcurl"
+	else
+		# Due to a bug in dist, --arch flags are improperly supplied by curl-config.
+		# Get rid of them.
+		LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | [sed 's/-arch [A-Za-z0-9_]* //g'])
+	fi
 
 	AC_SUBST(CFLAGS_LIBCURL)
 	AC_SUBST(LDFLAGS_LIBCURL)

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2009-09-22 21:50:09 UTC (rev 58138)
+++ trunk/base/configure	2009-09-22 21:50:20 UTC (rev 58139)
@@ -9083,9 +9083,14 @@
 	fi
 
 	CFLAGS_LIBCURL=$($CURL_CONFIG --cflags)
-	# Due to a bug in dist, --arch flags are improperly supplied by curl-config.
-	# Get rid of them.
-	LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | sed 's/-arch [A-Za-z0-9_]* //g')
+	if test "x$curlprefix" = "x"; then
+		# System curl-config emits absurd output for --libs
+		LDFLAGS_LIBCURL="-lcurl"
+	else
+		# Due to a bug in dist, --arch flags are improperly supplied by curl-config.
+		# Get rid of them.
+		LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | sed 's/-arch [A-Za-z0-9_]* //g')
+	fi
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090922/2d241fd9/attachment.html>