aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure21
1 files changed, 9 insertions, 12 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
+if test "$curses" != "no" ; then
+ if test "$mingw32" = "yes" ; then
curses_list="-lpdcurses"
-else
+ else
curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses 2>/dev/null)"
-fi
-
-if test "$curses" != "no" ; then
+ fi
curses_found=no
cat > $TMPC << EOF
#include <curses.h>
@@ -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 <curl/curl.h>
int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; }