[svn-commits] seanbright: editline/trunk r171 - /editline/trunk/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue Jul 27 17:46:01 2010
New Revision: 171

URL: http://svnview.digium.com/svn/thirdparty?view=rev&rev=171
Log:
Merge r259439 from asterisk trunk and fix some autoconf related issues:

  Tue Apr 27 21:13:01 2010 UTC by qwell

  Add gar to the check for AR for those silly OSes (Solaris) that don't have ar.

  autoconf2.13 couldn't handle AC_PROG_GREP, so I removed it.  This is fine,
  since we don't need to use anything that the configure script doesn't.


Modified:
    editline/trunk/config.h.in
    editline/trunk/configure
    editline/trunk/configure.in

Modified: editline/trunk/config.h.in
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/config.h.in?view=diff&rev=171&r1=170&r2=171
==============================================================================
--- editline/trunk/config.h.in (original)
+++ editline/trunk/config.h.in Tue Jul 27 17:46:01 2010
@@ -90,6 +90,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

Modified: editline/trunk/configure.in
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/configure.in?view=diff&rev=171&r1=170&r2=171
==============================================================================
--- editline/trunk/configure.in (original)
+++ editline/trunk/configure.in Tue Jul 27 17:46:01 2010
@@ -61,14 +61,14 @@
 
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_PATH_PROG(AR, ar, , $PATH)
+AC_PATH_PROGS(AR, ar gar, , $PATH)
 
 dnl Search for termcap access routines in termcap, tinfo, curses, and ncurses.
-AC_CHECK_LIB(termcap, tgetent, , \
-  AC_CHECK_LIB(tinfo, tgetent, , \
-    AC_CHECK_LIB(curses, tgetent, , \
-      AC_CHECK_LIB(ncurses, tgetent, , \
-        AC_MSG_ERROR(termcap support not found)))))
+AC_CHECK_LIB([termcap], [tgetent], , \
+  [AC_CHECK_LIB([tinfo], [tgetent], , \
+    [AC_CHECK_LIB([curses], [tgetent], , \
+      [AC_CHECK_LIB([ncurses], [tgetent], , \
+        [AC_MSG_ERROR(termcap support not found)])])])])
 
 dnl Use termcap.h if it exists; otherwise we need both term.h and [n]curses.h.
 AC_CHECK_HEADERS(termcap.h term.h)
@@ -260,4 +260,5 @@
 AC_SUBST(TCSRCS)
 
 AC_CONFIG_HEADER(config.h)
+AH_BOTTOM([#include "sys.h"])
 AC_OUTPUT(Makefile)