Merged revisions 235573 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r235573 | tilghman | 2009-12-18 15:19:43 -0600 (Fri, 18 Dec 2009) | 9 lines

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

  ........
    r235572 | tilghman | 2009-12-18 15:18:16 -0600 (Fri, 18 Dec 2009) | 2 lines

    Point to the typical missing package, not the cryptic "termcap support".
  ........
................

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

diff --git a/configure b/configure
index 9bca82d0996d81d9f2145b3aeb649fb03770460f..391bed724c372fe0622578b55233a1dc35f0e477 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 217075 .
+# From configure.ac Revision: 226019 .
 # 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" >&5
-echo "$as_me: error: *** termcap support not found" >&2;}
+  { { 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;}
    { (exit 1); exit 1; }; }
 fi
 

diff --git a/configure.ac b/configure.ac
index 9ee94fd6c3e543c452d3ebb08b3e08c28cc0fccf..1db07ec630f288e423688f4f9ed1c731d2805875 100644 (file)
--- 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)
+  AC_MSG_ERROR([*** termcap support not found (on modern systems, this typically means libncurses5-dev is missing)])
 fi
 AC_SUBST(EDITLINE_LIB)
 

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index faf3a0e7d8b47cac443e3ca62db01d53ace5c88e..78f01cfcb049bf72767909f6e916d0340d5c349e 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -1068,6 +1068,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define to 1 if the C compiler supports function prototypes. */
+#undef PROTOTYPES
+
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
@@ -1084,6 +1087,11 @@
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
 
+/* Define to 1 if the `setvbuf' function takes the buffering type as its
+   second argument and the buffer pointer as the third, as on System V before
+   release 3. */
+#undef SETVBUF_REVERSED
+
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
@@ -1104,30 +1112,20 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1145,6 +1143,20 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#undef __PROTOTYPES
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const