c8e160a
diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in
c8e160a
--- curl-7.18.0/curl-config.in.multilib	2008-01-10 23:14:02.000000000 +0100
43a8fac
+++ curl-7.18.0/curl-config.in	2008-02-16 06:48:14.000000000 +0100
43a8fac
@@ -45,7 +45,6 @@
43a8fac
   --libs      library linking information
43a8fac
   --prefix    curl install prefix
43a8fac
   --protocols newline separated list of enabled protocols
43a8fac
-  --static-libs static libcurl library linking information
43a8fac
   --version   output version information
43a8fac
   --vernum    output the version information as a number (hexadecimal)
43a8fac
 EOF
43a8fac
@@ -72,7 +71,7 @@
Ivana Varekova a88dcef
 	;;
Ivana Varekova a88dcef
 
Ivana Varekova a88dcef
     --cc)
Ivana Varekova a88dcef
-	echo "@CC@"
Ivana Varekova a88dcef
+	echo "gcc"
Ivana Varekova a88dcef
 	;;
Ivana Varekova a88dcef
 
Ivana Varekova a88dcef
     --prefix)
43a8fac
@@ -189,20 +188,7 @@
Ivana Varekova a88dcef
        	;;
Ivana Varekova a88dcef
 
Ivana Varekova a88dcef
     --libs)
c8e160a
-	if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
b676540
-	   CURLLIBDIR="-L@libdir@ "
b676540
-	else
b676540
-	   CURLLIBDIR=""
b676540
-	fi
b676540
-	if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
b676540
-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
b676540
-	else
b676540
-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
b676540
-	fi
43a8fac
-	;;
43a8fac
-
43a8fac
-    --static-libs)
43a8fac
-	echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
b676540
+	pkg-config libcurl --libs
b676540
 	;;
Ivana Varekova a88dcef
 
43a8fac
     *)