[asterisk-commits] seanbright: trunk r418893 - /trunk/menuselect/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Jul 17 19:07:48 2014
New Revision: 418893

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418893
Log:
Import Asterisk's autoconf magic instead of using our own.

Removed:
    trunk/menuselect/acinclude.m4
Modified:
    trunk/menuselect/aclocal.m4
    trunk/menuselect/autoconfig.h.in
    trunk/menuselect/bootstrap.sh
    trunk/menuselect/configure

Modified: trunk/menuselect/aclocal.m4
URL: http://svnview.digium.com/svn/asterisk/trunk/menuselect/aclocal.m4?view=diff&rev=418893&r1=418892&r2=418893
==============================================================================
--- trunk/menuselect/aclocal.m4 (original)
+++ trunk/menuselect/aclocal.m4 Thu Jul 17 19:07:48 2014
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,4 +11,9 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_include([acinclude.m4])
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_include([../autoconf/ast_check_gnu_make.m4])
+m4_include([../autoconf/ast_ext_lib.m4])
+m4_include([../autoconf/ast_ext_tool_check.m4])
+m4_include([../autoconf/ast_gcc_attribute.m4])
+m4_include([../autoconf/ast_prog_sed.m4])

Modified: trunk/menuselect/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/trunk/menuselect/autoconfig.h.in?view=diff&rev=418893&r1=418892&r2=418893
==============================================================================
--- trunk/menuselect/autoconfig.h.in (original)
+++ trunk/menuselect/autoconfig.h.in Thu Jul 17 19:07:48 2014
@@ -35,7 +35,7 @@
 /* Define to 1 if your GCC C compiler supports the 'weakref' attribute. */
 #undef HAVE_ATTRIBUTE_weakref
 
-/* Define to indicate the ${CURSES_DESCRIP} library */
+/* Define to 1 if you have the curses library. */
 #undef HAVE_CURSES
 
 /* Define to 1 if you have the `getloadavg' function. */
@@ -53,10 +53,10 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to indicate the ${NCURSES_DESCRIP} library */
+/* Define to 1 if you have the ncurses library. */
 #undef HAVE_NCURSES
 
-/* Define to indicate the ${NEWT_DESCRIP} library */
+/* Define to 1 if you have the newt library. */
 #undef HAVE_NEWT
 
 /* Define to 1 if you have the `setenv' function. */

Modified: trunk/menuselect/bootstrap.sh
URL: http://svnview.digium.com/svn/asterisk/trunk/menuselect/bootstrap.sh?view=diff&rev=418893&r1=418892&r2=418893
==============================================================================
--- trunk/menuselect/bootstrap.sh (original)
+++ trunk/menuselect/bootstrap.sh Thu Jul 17 19:07:48 2014
@@ -17,7 +17,7 @@
 	check_for_app automake19
 	check_for_app aclocal19
 	echo "Generating the configure script ..."
-	aclocal19 2>/dev/null
+	aclocal19 -I ../autoconf 2>/dev/null
 	autoconf259
 	autoheader259
 	automake19 --add-missing --copy 2>/dev/null
@@ -32,7 +32,7 @@
 	check_for_app automake
 	check_for_app aclocal
 	echo "Generating the configure script ..."
-	aclocal 2>/dev/null
+	aclocal -I ../autoconf 2>/dev/null
 	autoconf
 	autoheader
 	automake --add-missing --copy 2>/dev/null