UI

Makefile.in

@@ -206,6 +206,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SSL = @SSL@
 STRIP = @STRIP@
+USE_NCURSES = @USE_NCURSES@
 VERSION = @VERSION@
 ZLIB = @ZLIB@
 abs_builddir = @abs_builddir@

configure

@@ -637,9 +637,12 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+USE_NCURSES_FALSE
+USE_NCURSES_TRUE
 HAVE_HEP_FALSE
 HAVE_HEP_TRUE
 HIREDIS_LIBS
+USE_NCURSES
 NCURSES_LIBS
 PCRE_LIBS
 PCAP_LIBS
@@ -12872,7 +12875,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
 $as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
 if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
-  EXTRA_LIBS="${EXTRA_LIBS} -lncurses"
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNCURSES 1
+_ACEOF
+
+  LIBS="-lncurses $LIBS"
+
 else
   as_fn_error $? "libncurses required" "$LINENO" 5
 fi
@@ -12881,6 +12889,8 @@ fi
 $as_echo "#define USE_NCURSES 1" >>confdefs.h
 
 
+	USE_NCURSES=yes
+
 fi
 
 
@@ -12933,7 +12943,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
 $as_echo "$ac_cv_lib_z_inflate" >&6; }
 if test "x$ac_cv_lib_z_inflate" = xyes; then :
-   LIBS="${LIBS} -lz"
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
 else
   as_fn_error $? "sipgrep requires but cannot find lz" "$LINENO" 5
 fi
@@ -12992,7 +13007,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hiredis_redisCommand" >&5
 $as_echo "$ac_cv_lib_hiredis_redisCommand" >&6; }
 if test "x$ac_cv_lib_hiredis_redisCommand" = xyes; then :
-   LIBS="${LIBS} -lhiredis"
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBHIREDIS 1
+_ACEOF
+
+  LIBS="-lhiredis $LIBS"
+
 else
   as_fn_error $? "sipgrep requires but cannot find lhiredis" "$LINENO" 5
 fi
@@ -13053,7 +13073,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_accept" >&5
 $as_echo "$ac_cv_lib_ssl_SSL_accept" >&6; }
 if test "x$ac_cv_lib_ssl_SSL_accept" = xyes; then :
-   LIBS="${LIBS} -lssl"
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSSL 1
+_ACEOF
+
+  LIBS="-lssl $LIBS"
+
 else
   as_fn_error $? "sipgrep requires but cannot find ssl" "$LINENO" 5
 fi
@@ -13082,6 +13107,14 @@ else
   HAVE_HEP_FALSE=
 fi
 
+ if test "x$USE_NCURSES" == "xyes"; then
+  USE_NCURSES_TRUE=
+  USE_NCURSES_FALSE='#'
+else
+  USE_NCURSES_TRUE='#'
+  USE_NCURSES_FALSE=
+fi
+
 
 # Checks for typedefs, structures, and compiler characteristics.
 ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
@@ -13588,6 +13621,10 @@ if test -z "${HAVE_HEP_TRUE}" && test -z "${HAVE_HEP_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_HEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_NCURSES_TRUE}" && test -z "${USE_NCURSES_FALSE}"; then
+  as_fn_error $? "conditional \"USE_NCURSES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0

configure.ac

@@ -189,9 +189,10 @@ dnl
 if test "$NCURSES" = "yes"; then
 	AC_CHECKING([for ncurses Library and Header files])
 	AC_CHECK_HEADER([ncurses.h], ,AC_MSG_ERROR([Could not find ncurses headers !]))
-	AC_CHECK_LIB([ncurses], [initscr], [EXTRA_LIBS="${EXTRA_LIBS} -lncurses"], [AC_MSG_ERROR([libncurses required])])
+	AC_CHECK_LIB([ncurses], [initscr],, [AC_MSG_ERROR([libncurses required])])
 	AC_DEFINE(USE_NCURSES, 1, [Use NCURSES library])
 	AC_SUBST(NCURSES_LIBS)
+	AC_SUBST(USE_NCURSES, yes)   
 fi
 
 
@@ -202,7 +203,7 @@ dnl
 if test "$ZLIB" = "yes"; then
    AC_CHECKING([for zip Library and Header files])
    AC_CHECK_HEADER(zlib.h,,[AC_MSG_ERROR([zlib.h headers not found.])])
-   AC_CHECK_LIB(z, inflate, [ LIBS="${LIBS} -lz" ], [AC_MSG_ERROR([sipgrep requires but cannot find lz])])
+   AC_CHECK_LIB(z, inflate, , [AC_MSG_ERROR([sipgrep requires but cannot find lz])])
    AC_DEFINE(USE_ZLIB, 1, [Use ZIP library])
 fi
 
@@ -213,7 +214,7 @@ dnl
 if test "$REDIS" = "yes"; then
    AC_CHECKING([for redis Library and Header files])
    AC_CHECK_HEADER(hiredis/hiredis.h,,[AC_MSG_ERROR([hiredis/hiredis.h headers not found.])])
-   AC_CHECK_LIB(hiredis, redisCommand, [ LIBS="${LIBS} -lhiredis" ], [AC_MSG_ERROR([sipgrep requires but cannot find lhiredis])])
+   AC_CHECK_LIB(hiredis, redisCommand, , [AC_MSG_ERROR([sipgrep requires but cannot find lhiredis])])
    AC_DEFINE(USE_REDIS, 1, [Use REDIS library])
    AC_SUBST(HIREDIS_LIBS)
 fi
@@ -226,7 +227,7 @@ dnl
 if test "$SSL" = "yes"; then
    AC_CHECKING([for OpenSSL SSL Library and Header files])
    AC_CHECK_HEADER(openssl/ssl.h,, [AC_MSG_ERROR([OpenSSL SSL headers not found.])])	
-   AC_CHECK_LIB(ssl, SSL_accept, [ LIBS="${LIBS} -lssl" ], [AC_MSG_ERROR([sipgrep requires but cannot find ssl])])
+   AC_CHECK_LIB(ssl, SSL_accept, , [AC_MSG_ERROR([sipgrep requires but cannot find ssl])])
    AC_DEFINE(USE_SSL, 1, [Use OpenSSL SSL library])
 fi
 
@@ -235,6 +236,7 @@ AC_CHECK_HEADER(pcap.h,,[AC_MSG_ERROR([sipgrep cannot find pcap.h])])
 
 # conditional checks
 AM_CONDITIONAL([HAVE_HEP],[test "x$HAVE_HEP" == "xyes"])
+AM_CONDITIONAL([USE_NCURSES],[test "x$USE_NCURSES" == "xyes"])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_INT32_T