In order to (partially) multi-arch-ify curl-config, remove all

Origin: vendor
Bug-Debian: http://bugs.debian.org/731998
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2017-01-10

mention of @includedir@ and @libdir@ from the script.  On Debian, the actual
header and library directories are architecture-dependent, but will always be
in the C compiler's default search path, so -I and -L options are not
necessary (and may be harmful in multi-arch environments.)

Gbp-Pq: Name 11_omit-directories-from-config.patch

diff --git a/curl-config.in b/curl-config.in
index 085bb1ef56dbc178331b1a6e7d684f9480110eb4..d90bfbcbcf0de6f0b7e03709ab3e25b205db2929 100644 (file)
--- a/curl-config.in
+++ b/curl-config.in
@@ -27,8 +27,6 @@ prefix="@prefix@"
 # Used in @libdir@
 # shellcheck disable=SC2034
 exec_prefix=@exec_prefix@
-# shellcheck disable=SC2034
-includedir=@includedir@
 cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@
 
 usage()
@@ -145,19 +143,11 @@ while test "$#" -gt 0; do
     else
       CPPFLAG_CURL_STATICLIB=""
     fi
-    if test "X@includedir@" = "X/usr/include"; then
-      echo "${CPPFLAG_CURL_STATICLIB}"
-    else
-      echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
-    fi
+    echo "${CPPFLAG_CURL_STATICLIB}"
     ;;
 
   --libs)
-    if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-      CURLLIBDIR="-L@libdir@ "
-    else
-      CURLLIBDIR=""
-    fi
+    CURLLIBDIR=""
     if test "X@ENABLE_SHARED@" = "Xno"; then
       echo "${CURLLIBDIR}-lcurl @LIBCURL_LIBS@"
     else
@@ -171,7 +161,7 @@ while test "$#" -gt 0; do
 
   --static-libs)
     if test "X@ENABLE_STATIC@" != "Xno" ; then
-      echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_LIBS@
+      echo -Wl,-Bstatic -lcurl -Wl,-Bdynamic @LDFLAGS@ @LIBCURL_LIBS@
     else
       echo 'curl was built with static libraries disabled' >&2
       exit 1