From: Yang Tse <yangsita@gmail.com>
Date: Tue, 30 Sep 2008 02:59:35 +0000 (+0000)
Subject: Use CFLAGS for icc linker options instead of LDFLAGS,
X-Git-Tag: curl-7_19_1~255
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=beb14ca6d6758985b389f13040d4ef8d5c798a7b;p=thirdparty%2Fcurl.git

Use CFLAGS for icc linker options instead of LDFLAGS,
otherwise gethostbyname() is not detected.
---

diff --git a/ares/configure.ac b/ares/configure.ac
index 3b9fad3b3b..9a1f1a327e 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -220,7 +220,7 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   dnl #279: controlling expression is constant
   dnl #981: operands are evaluated in unspecified order
   dnl #1469: "cc" clobber ignored
-  if test "$curl_cv_def___INTEL_COMPILER" -lt "910"; then
+  if test "$ac_cv_compiler_num" -lt "910"; then
     CPPFLAGS="$CPPFLAGS -wd 279"
   fi
   CPPFLAGS="$CPPFLAGS -wd 981,1469"
@@ -279,12 +279,12 @@ case $host in
       if test "$ac_cv_compiler_num" -ge "900" &&
         test "$ac_cv_compiler_num" -lt "1000"; then
         dnl icc 9.X specific
-        LDFLAGS="$LDFLAGS -i-dynamic"
+        CFLAGS="$CFLAGS -i-dynamic"
       fi
       #
       if test "$ac_cv_compiler_num" -ge "1000"; then
         dnl icc 10.X or later
-        LDFLAGS="$LDFLAGS -shared-intel"
+        CFLAGS="$CFLAGS -shared-intel"
       fi
       #
     fi
diff --git a/configure.ac b/configure.ac
index 6388e770d0..c4f2bd4d81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,7 +294,7 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   dnl #279: controlling expression is constant
   dnl #981: operands are evaluated in unspecified order
   dnl #1469: "cc" clobber ignored
-  if test "$curl_cv_def___INTEL_COMPILER" -lt "910"; then
+  if test "$ac_cv_compiler_num" -lt "910"; then
     CPPFLAGS="$CPPFLAGS -wd 279"
   fi
   CPPFLAGS="$CPPFLAGS -wd 981,1469"
@@ -353,12 +353,12 @@ case $host in
       if test "$ac_cv_compiler_num" -ge "900" &&
         test "$ac_cv_compiler_num" -lt "1000"; then
         dnl icc 9.X specific
-        LDFLAGS="$LDFLAGS -i-dynamic"
+        CFLAGS="$CFLAGS -i-dynamic"
       fi
       #
       if test "$ac_cv_compiler_num" -ge "1000"; then
         dnl icc 10.X or later
-        LDFLAGS="$LDFLAGS -shared-intel"
+        CFLAGS="$CFLAGS -shared-intel"
       fi
       #
     fi