Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-01 21:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] try to fix curl config for msys

Browse Source
This commit is contained in:
Timothy Stack 2022-06-04 07:59:07 -07:00
parent d7162f6366
commit 54806f7913
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aminclude_static.am
View File

@ -1,6 +1,6 @@
# aminclude_static.am generated automatically by Autoconf # aminclude_static.am generated automatically by Autoconf
# from AX_AM_MACROS_STATIC on Mon May 16 23:40:06 PDT 2022 # from AX_AM_MACROS_STATIC on Sat Jun 4 07:57:41 PDT 2022
# Code coverage # Code coverage

2
configure.ac
View File

@ -102,7 +102,7 @@ AC_SEARCH_LIBS(BZ2_bzopen, bz2,
AC_SUBST(BZIP2_SUPPORT) AC_SUBST(BZIP2_SUPPORT)
AC_SEARCH_LIBS(dlopen, dl) AC_SEARCH_LIBS(dlopen, dl)
AC_SEARCH_LIBS(backtrace, execinfo) AC_SEARCH_LIBS(backtrace, execinfo)
LIBCURL_CHECK_CONFIG([], [7.23.0], [], []) LIBCURL_CHECK_CONFIG([], [7.23.0], [], [], [test x"${enable_static}" != x"no"])
# Sometimes, curses depends on these libraries being linked in... # Sometimes, curses depends on these libraries being linked in...
AC_ARG_ENABLE([tinfo], AC_ARG_ENABLE([tinfo],

6
m4/libcurl.m4
View File

@ -127,7 +127,11 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
fi fi
if test x"$LIBCURL" = "x" ; then if test x"$LIBCURL" = "x" ; then
LIBCURL=`$_libcurl_config --libs` if $5; then
LIBCURL=`$_libcurl_config --static-libs`
else
LIBCURL=`$_libcurl_config --libs`
fi
# This is so silly, but Apple actually has a bug in their # This is so silly, but Apple actually has a bug in their
# curl-config script. Fixed in Tiger, but there are still # curl-config script. Fixed in Tiger, but there are still