[asterisk-commits] pabelanger: branch pabelanger/non-root r677 - in /asterisk/team/pabelanger/no...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Sun Aug  1 19:30:57 2010
New Revision: 677

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=677
Log:
More updates for configure

Added:
    asterisk/team/pabelanger/non-root/Makefile   (with props)
    asterisk/team/pabelanger/non-root/autoconf/
    asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4   (with props)
    asterisk/team/pabelanger/non-root/makeopts.in   (with props)
Modified:
    asterisk/team/pabelanger/non-root/configure
    asterisk/team/pabelanger/non-root/configure.ac

Added: asterisk/team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/Makefile?view=auto&rev=677
==============================================================================
--- asterisk/team/pabelanger/non-root/Makefile (added)
+++ asterisk/team/pabelanger/non-root/Makefile Sun Aug  1 19:30:57 2010
@@ -1,0 +1,38 @@
+# even though we could use '-include makeopts' here, use a wildcard
+# lookup anyway, so that make won't try to build makeopts if it doesn't
+# exist (other rules will force it to be built if needed)
+ifneq ($(wildcard makeopts),)
+  include makeopts
+endif
+
+GREP=grep
+AWK=awk
+HAVEDOT=no
+
+TESTSUITEVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
+
+all: _all
+
+_all: makeopts
+
+makeopts: configure
+	@echo "****"
+	@echo "**** The configure script must be executed before running '$(MAKE)'."
+	@echo "****               Please run \"./configure\"."
+	@echo "****"
+	@exit 1
+
+progdocs:
+	(cat contrib/testsuite-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
+	echo "PROJECT_NUMBER=$(TESTSUITEVERSION)") | doxygen -
+
+clean: _clean
+
+_clean:
+	rm -f asterisk-test-suite-report.xml
+
+distclean: _clean
+	rm -f makeopts
+	rm -f config.log config.status config.cache
+	rm -rf autom4te.cache aclocal.m4
+	rm -rf doc/api

Propchange: asterisk/team/pabelanger/non-root/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/non-root/Makefile
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/non-root/Makefile
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4?view=auto&rev=677
==============================================================================
--- asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4 (added)
+++ asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4 Sun Aug  1 19:30:57 2010
@@ -1,0 +1,23 @@
+# Check whether any of the mandatory modules are not present, and
+# print error messages in case. The mandatory list is built using
+# --with-* arguments when invoking configure.
+
+AC_DEFUN([AST_CHECK_MANDATORY],
+[
+	AC_MSG_CHECKING([for mandatory modules: ${ac_mandatory_list}])
+	err=0;
+	for i in ${ac_mandatory_list}; do
+		eval "a=\${PBX_$i}"
+		if test "x${a}" = "x1" ; then continue; fi
+		if test ${err} = "0" ; then AC_MSG_RESULT(fail) ; fi
+		AC_MSG_RESULT()
+		eval "a=\${${i}_OPTION}"
+		AC_MSG_NOTICE([***])
+		AC_MSG_NOTICE([*** The $i installation appears to be missing or broken.])
+		AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+		AC_MSG_NOTICE([*** including --without-${a}.])
+		err=1
+	done
+	if test $err = 1 ; then exit 1; fi
+	AC_MSG_RESULT(ok)
+])

Propchange: asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/non-root/autoconf/ast_check_mandatory.m4
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: asterisk/team/pabelanger/non-root/configure.ac
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/configure.ac?view=diff&rev=677&r1=676&r2=677
==============================================================================
--- asterisk/team/pabelanger/non-root/configure.ac (original)
+++ asterisk/team/pabelanger/non-root/configure.ac Sun Aug  1 19:30:57 2010
@@ -2,17 +2,22 @@
 
 AC_INIT([asterisk], [trunk], [https://issues.asterisk.org])
 
-# cross-compile macros
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-
 # check existence of the package
-AC_CONFIG_SRCDIR([main/asterisk.c])
+AC_CONFIG_SRCDIR([asttest/asttest.c])
 
 AC_CONFIG_AUX_DIR(`pwd`)
 
 AC_COPYRIGHT("Asterisk")
 AC_REVISION($Revision$)
 
+AC_PROG_CC
 
-AC_PROG_CC
+AC_CONFIG_FILES([makeopts])
+
+AC_OUTPUT
+
+AC_MSG_NOTICE(Package configured for: )
+AC_MSG_NOTICE( OS type  : $host_os)
+AC_MSG_NOTICE( Host CPU : $host_cpu)
+AC_MSG_NOTICE( build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :)
+AC_MSG_NOTICE( host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :)

Added: asterisk/team/pabelanger/non-root/makeopts.in
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/makeopts.in?view=auto&rev=677
==============================================================================
    (empty)

Propchange: asterisk/team/pabelanger/non-root/makeopts.in
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/non-root/makeopts.in
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/non-root/makeopts.in
------------------------------------------------------------------------------
    svn:mime-type = text/plain