Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lnav: fix argument to --with-libcurl and simplify #52

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions Formula/lnav.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,10 @@ def install
--with-readline=#{Formula["readline"].opt_prefix}
]

if build.with? "curl"
# Specify the cURL binary path, so that the configure script
# can look up the correct compile time flags.
ENV.prepend_path "PATH", "#{Formula["curl"].bin}"

# cURL depends on libssh2, due to the 'with-libssh2' flag, which in turn
# depends on libcrypto and libssl. These are neither specified by the
# lnav configure scripts, nor curl-config binary.
ENV.append "LIBS", "-lcrypto -lssl"

# OS X ships with libcurl by default, albeit without sftp support. If we
# want lnav to use the keg-only cURL formula that we specify as a
# dependency, we need to pass in the path.
args << "--with-libcurl=#{Formula["curl"].opt_prefix}"
end
# OS X ships with libcurl by default, albeit without sftp support. If we
# want lnav to use the keg-only curl formula that we specify as a
# dependency, we need to pass in the path.
args << "--with-libcurl=#{Formula["curl"].opt_lib}" if build.with? "curl"

system "./autogen.sh" if build.head?
system "./configure", *args
Expand Down