From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 18 Dec 2009 22:42:34 +0000 (+0000)
Subject: Merged revisions 235656 via svnmerge from
X-Git-Tag: 1.6.0.21-rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e861fff264e55a9f8b4dd6394ee8e12c239e2612;p=thirdparty%2Fasterisk.git

Merged revisions 235656 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r235656 | tilghman | 2009-12-18 16:40:46 -0600 (Fri, 18 Dec 2009) | 9 lines

  Merged revisions 235652 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r235652 | tilghman | 2009-12-18 16:39:30 -0600 (Fri, 18 Dec 2009) | 2 lines

    Revise verbiage, per #asterisk-dev discussion
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@235657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/configure b/configure
index 391bed724c..55aee468bc 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 226019 .
+# From configure.ac Revision: 235574 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -36410,8 +36410,8 @@ elif test "x$CURSES_LIB" != "x" ; then
 elif test "x$NCURSES_LIB" != "x" ; then
   EDITLINE_LIB="$NCURSES_LIB"
 else
-  { { echo "$as_me:$LINENO: error: *** termcap support not found (on modern systems, this typically means libncurses5-dev is missing)" >&5
-echo "$as_me: error: *** termcap support not found (on modern systems, this typically means libncurses5-dev is missing)" >&2;}
+  { { echo "$as_me:$LINENO: error: *** termcap support not found (on modern systems, this typically means the ncurses development package is missing)" >&5
+echo "$as_me: error: *** termcap support not found (on modern systems, this typically means the ncurses development package is missing)" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
diff --git a/configure.ac b/configure.ac
index 1db07ec630..0e36e8df49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1528,7 +1528,7 @@ elif test "x$CURSES_LIB" != "x" ; then
 elif test "x$NCURSES_LIB" != "x" ; then
   EDITLINE_LIB="$NCURSES_LIB"
 else
-  AC_MSG_ERROR([*** termcap support not found (on modern systems, this typically means libncurses5-dev is missing)])
+  AC_MSG_ERROR([*** termcap support not found (on modern systems, this typically means the ncurses development package is missing)])
 fi
 AC_SUBST(EDITLINE_LIB)