diff --git a/config/software/curl.rb b/config/software/curl.rb
index 1e37ae54b..a8f310792 100644
--- a/config/software/curl.rb
+++ b/config/software/curl.rb
@@ -33,10 +33,8 @@
     FileUtils.rm_rf(File.join(project_dir, "src/tool_hugehelp.c"))
   end
 
-  # curl requires pkg-config that is shipped with the agent
-  env = { "PATH" => "#{install_dir}/embedded/bin" + File::PATH_SEPARATOR + ENV["PATH"] }
-  command ["./configure",
-           "--prefix=#{install_dir}/embedded",
+  env = with_standard_compiler_flags(with_embedded_path)
+  configure_options = [
            "--disable-manual",
            "--disable-debug",
            "--enable-optimize",
@@ -47,13 +45,15 @@
            "--enable-proxy",
            "--disable-dependency-tracking",
            "--enable-ipv6",
-           "--without-libidn",
+           "--without-libidn2",
            "--without-gnutls",
            "--without-librtmp",
            "--without-libssh2",
-           "--with-ssl=#{install_dir}/embedded",
-           "--with-zlib=#{install_dir}/embedded",
-           "--with-nghttp2=#{install_dir}/embedded"].join(" "), env: env
+           "--with-openssl",
+           "--with-zlib",
+           "--with-nghttp2",
+  ]
+  configure(*configure_options, env: env)
 
   command "make -j #{workers}", env: { "LD_RUN_PATH" => "#{install_dir}/embedded/lib" }
   command "make install"