From a3605bf696a30e793d375b6c4ff1fd88ec546010 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Sat, 25 May 2013 13:17:21 +0400 Subject: [PATCH] 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: Michael Tokarev --- configure | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 918dc36e88..269382a398 100755 --- a/configure +++ b/configure @@ -2153,13 +2153,12 @@ fi ########################################## # curses probe -if test "$mingw32" = "yes" ; then - curses_list="-lpdcurses" -else - curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses 2>/dev/null)" -fi - if test "$curses" != "no" ; then + if test "$mingw32" = "yes" ; then + curses_list="-lpdcurses" + else + curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses 2>/dev/null)" + fi curses_found=no cat > $TMPC << EOF #include @@ -2191,14 +2190,12 @@ fi ########################################## # 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 $pkg_config libcurl --modversion >/dev/null 2>&1; then + curlconfig="$pkg_config libcurl" + else + curlconfig=curl-config + fi cat > $TMPC << EOF #include int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; }