提交 a3605bf6 编写于 作者: M Michael Tokarev

don't run pkg-config for features explicitly disabled

We test pkg-config for curses and curl even if those are explicitly
disabled.  Move these tests inside `if "$feature" != "no"' sections.
Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
上级 dec3fc96
...@@ -2153,13 +2153,12 @@ fi ...@@ -2153,13 +2153,12 @@ fi
########################################## ##########################################
# curses probe # curses probe
if test "$mingw32" = "yes" ; then if test "$curses" != "no" ; then
if test "$mingw32" = "yes" ; then
curses_list="-lpdcurses" curses_list="-lpdcurses"
else else
curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses 2>/dev/null)" curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses 2>/dev/null)"
fi fi
if test "$curses" != "no" ; then
curses_found=no curses_found=no
cat > $TMPC << EOF cat > $TMPC << EOF
#include <curses.h> #include <curses.h>
...@@ -2191,14 +2190,12 @@ fi ...@@ -2191,14 +2190,12 @@ fi
########################################## ##########################################
# curl probe # curl probe
if $pkg_config libcurl --modversion >/dev/null 2>&1; then
curlconfig="$pkg_config libcurl"
else
curlconfig=curl-config
fi
if test "$curl" != "no" ; then if test "$curl" != "no" ; then
if $pkg_config libcurl --modversion >/dev/null 2>&1; then
curlconfig="$pkg_config libcurl"
else
curlconfig=curl-config
fi
cat > $TMPC << EOF cat > $TMPC << EOF
#include <curl/curl.h> #include <curl/curl.h>
int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; } int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册