astepano / rpms / curl

Forked from rpms/curl 6 years ago
Clone
26c20d8
 curl-config.in |   18 ++----------------
26c20d8
 1 files changed, 2 insertions(+), 16 deletions(-)
9b1299c
014599c
diff --git a/curl-config.in b/curl-config.in
26c20d8
index ebda129..b404827 100644
014599c
--- a/curl-config.in
014599c
+++ b/curl-config.in
26c20d8
@@ -42,7 +42,6 @@ Available values for OPTION include:
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
26c20d8
@@ -69,7 +68,7 @@ while test $# -gt 0; do
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)
26c20d8
@@ -130,25 +129,12 @@ while test $# -gt 0; do
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
 
6d0277e
     --configure)
9b1299c
-      echo @CONFIGURE_OPTIONS@
9b1299c
-    ;;
9b1299c
+	pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
9b1299c
+	;;
9b1299c
 
9b1299c
     *)
9b1299c
         echo "unknown option: $1"
9b1299c
--- a/libcurl.pc.in
9b1299c
+++ b/libcurl.pc.in
26c20d8
@@ -29,6 +29,7 @@ libdir=@libdir@
9b1299c
 includedir=@includedir@
9b1299c
 supported_protocols="@SUPPORT_PROTOCOLS@"
9b1299c
 supported_features="@SUPPORT_FEATURES@"
9b1299c
+configure_options=@CONFIGURE_OPTIONS@
9b1299c
 
9b1299c
 Name: libcurl
9b1299c
 URL: http://curl.haxx.se/