curl-config: tidy up, optimize

- optimize out `cppflag_curl_staticlib` variable.
- optimize out `CPPFLAG_CURL_STATICLIB` variable and simplify logic.
- lowercase local variable name `CURLLIBDIR`.

Closes #15810

diff --git a/curl-config.in b/curl-config.in
index e89c256392efd782cbb2b0ea08d2b01194268419..55184167ba01906f3a4aa0b2d29f1c23cd6ca7bb 100644 (file)
--- a/curl-config.in
+++ b/curl-config.in
@@ -31,7 +31,6 @@ prefix='@prefix@'
 exec_prefix="@exec_prefix@"
 # shellcheck disable=SC2034
 includedir="@includedir@"
-cppflag_curl_staticlib='@LIBCURL_PC_CFLAGS@'
 
 usage()
 {
@@ -142,28 +141,23 @@ while test "$#" -gt 0; do
     ;;
 
   --cflags)
-    if test "X$cppflag_curl_staticlib" = 'X-DCURL_STATICLIB'; then
-      CPPFLAG_CURL_STATICLIB='-DCURL_STATICLIB '
-    else
-      CPPFLAG_CURL_STATICLIB=''
-    fi
     if test "X@includedir@" = 'X/usr/include'; then
-      echo "${CPPFLAG_CURL_STATICLIB}"
+      echo '@LIBCURL_PC_CFLAGS@'
     else
-      echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
+      echo "@LIBCURL_PC_CFLAGS@ -I@includedir@"
     fi
     ;;
 
   --libs)
     if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
-      CURLLIBDIR="-L@libdir@ "
+      curllibdir="-L@libdir@ "
     else
-      CURLLIBDIR=''
+      curllibdir=''
     fi
     if test 'X@ENABLE_SHARED@' = 'Xno'; then
-      echo "${CURLLIBDIR}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
+      echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
     else
-      echo "${CURLLIBDIR}-lcurl"
+      echo "${curllibdir}-lcurl"
     fi
     ;;