Use AX_WITH_CURSES macro to detect curses

configure.ac

@@ -157,20 +157,13 @@ else
    AC_MSG_RESULT([Configuring for Unix binary])
 
    dnl On true Unix systems, test for valid curses-like libraries
-   if test "$CURSES_CLIENT" != "no" ; then
-      AC_CHECK_LIB(ncurses,newterm)
-      if test "$ac_cv_lib_ncurses_newterm" = "no" ; then
-         AC_CHECK_LIB(curses,newterm)
-         if test "$ac_cv_lib_curses_newterm" = "no" ; then
-            AC_CHECK_LIB(cur_colr,newterm)
-            if test "$ac_cv_lib_cur_colr_newterm" = "no" ; then
-               if test "$CURSES_CLIENT" = "yes" ; then
-                 AC_MSG_ERROR(Cannot find any curses-type library)
-               else
-                 AC_MSG_WARN(Cannot find any curses-type library)
-                 CURSES_CLIENT="no"
-               fi
-            fi
+   if test "$CURSES_CLIENT" != "no"; then
+      AX_WITH_CURSES
+      if test "$ax_cv_curses" != "yes"; then
+         AC_CHECK_LIB(cur_colr,newterm)
+         if test "$ac_cv_lib_cur_colr_newterm" != "yes"; then
+            AC_MSG_WARN(Cannot find any curses-type library)
+            CURSES_CLIENT="no"
          fi
       fi
    fi
@@ -311,6 +304,8 @@ if test "$GUI_CLIENT" = "probe"; then
 fi
 if test "$CURSES_CLIENT" = "probe"; then
   CURSES_CLIENT="yes"
+  LIBS="$LIBS $CURSES_LIBS"
+  CFLAGS="$CFLAGS $CURSES_CFLAGS"
 fi
 
 dnl Do i18n stuff

m4/ax_require_defined.m4

@@ -0,0 +1,37 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED