fix libcurl not detected by configure script when pkg-config is not available

Fri, 09 Jun 2023 21:39:51 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 09 Jun 2023 21:39:51 +0200
changeset 751
9598ff469033
parent 750
4d7a2238c5ac
child 752
2b153bc3eb57

fix libcurl not detected by configure script when pkg-config is not available

configure file | annotate | diff | comparison | revisions
make/project.xml file | annotate | diff | comparison | revisions
--- a/configure	Sun May 21 16:34:58 2023 +0200
+++ b/configure	Fri Jun 09 21:39:51 2023 +0200
@@ -288,16 +288,12 @@
         else
             break
         fi
-        curl-config --ldflags > /dev/null
+        curl-config libs > /dev/null
         if [ $? -eq 0 ]; then
-            LDFLAGS="$LDFLAGS `curl-config --ldflags`"
+            LDFLAGS="$LDFLAGS `curl-config libs`"
         else
             break
         fi
-        which curl-config > /dev/null
-        if [ $? -ne 0 ]; then
-        	break
-        fi
 		echo yes
         return 0
     done
--- a/make/project.xml	Sun May 21 16:34:58 2023 +0200
+++ b/make/project.xml	Fri Jun 09 21:39:51 2023 +0200
@@ -12,9 +12,8 @@
 		<pkgconfig>libcurl</pkgconfig>
 	</dependency>
 	<dependency name="curl">
-		<test>which curl-config</test>
 		<cflags type="exec">curl-config --cflags</cflags>
-		<ldflags type="exec">curl-config --ldflags</ldflags>
+		<ldflags type="exec">curl-config libs</ldflags>
 	</dependency>
 	
 	<dependency name="libxml2" platform="windows">

mercurial