[svn-commits] mvanbaak: branch mvanbaak/res_clialiases_unconditional r151310 - in /team/mva...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Oct 20 04:58:03 CDT 2008
Author: mvanbaak
Date: Mon Oct 20 04:58:03 2008
New Revision: 151310
URL: http://svn.digium.com/view/asterisk?view=rev&rev=151310
Log:
Merged revisions 147899 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r147899 | mvanbaak | 2008-10-09 19:48:53 +0200 (Thu, 09 Oct 2008) | 5 lines
only include this for OpenBSD. At least FreeBSD is borked when including it
(closes issue #13649)
Reported by: ys
........
Added:
team/mvanbaak/res_clialiases_unconditional/autoconf/
- copied from r151246, trunk/autoconf/
team/mvanbaak/res_clialiases_unconditional/autoconf/acx_pthread.m4
- copied unchanged from r151246, trunk/autoconf/acx_pthread.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_c_compile_check.m4
- copied unchanged from r151246, trunk/autoconf/ast_c_compile_check.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_c_define_check.m4
- copied unchanged from r151246, trunk/autoconf/ast_c_define_check.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_check_gnu_make.m4
- copied unchanged from r151246, trunk/autoconf/ast_check_gnu_make.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_check_mandatory.m4
- copied unchanged from r151246, trunk/autoconf/ast_check_mandatory.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_check_openh323.m4
- copied unchanged from r151246, trunk/autoconf/ast_check_openh323.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_check_pwlib.m4
- copied unchanged from r151246, trunk/autoconf/ast_check_pwlib.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_ext_lib.m4
- copied unchanged from r151246, trunk/autoconf/ast_ext_lib.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_ext_tool_check.m4
- copied unchanged from r151246, trunk/autoconf/ast_ext_tool_check.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_func_fork.m4
- copied unchanged from r151246, trunk/autoconf/ast_func_fork.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_gcc_attribute.m4
- copied unchanged from r151246, trunk/autoconf/ast_gcc_attribute.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_prog_egrep.m4
- copied unchanged from r151246, trunk/autoconf/ast_prog_egrep.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_prog_ld.m4
- copied unchanged from r151246, trunk/autoconf/ast_prog_ld.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_prog_ld_gnu.m4
- copied unchanged from r151246, trunk/autoconf/ast_prog_ld_gnu.m4
team/mvanbaak/res_clialiases_unconditional/autoconf/ast_prog_sed.m4
- copied unchanged from r151246, trunk/autoconf/ast_prog_sed.m4
Removed:
team/mvanbaak/res_clialiases_unconditional/acinclude.m4
Modified:
team/mvanbaak/res_clialiases_unconditional/ (props changed)
team/mvanbaak/res_clialiases_unconditional/bootstrap.sh
team/mvanbaak/res_clialiases_unconditional/configure
team/mvanbaak/res_clialiases_unconditional/configure.ac
team/mvanbaak/res_clialiases_unconditional/main/config.c
team/mvanbaak/res_clialiases_unconditional/pbx/pbx_config.c
Propchange: team/mvanbaak/res_clialiases_unconditional/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/mvanbaak/res_clialiases_unconditional/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 20 04:58:03 2008
@@ -1,1 +1,1 @@
-/team/group/res_clialiases:1-151235 /trunk:1-151215
+/team/group/res_clialiases:1-151235 /trunk:1-151309
Modified: team/mvanbaak/res_clialiases_unconditional/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/res_clialiases_unconditional/bootstrap.sh?view=diff&rev=151310&r1=151309&r2=151310
==============================================================================
--- team/mvanbaak/res_clialiases_unconditional/bootstrap.sh (original)
+++ team/mvanbaak/res_clialiases_unconditional/bootstrap.sh Mon Oct 20 04:58:03 2008
@@ -40,7 +40,7 @@
echo "Generating the configure script ..."
-aclocal${MY_AM_VER} 2>/dev/null
+aclocal${MY_AM_VER} -Iautoconf
autoconf${MY_AC_VER}
autoheader${MY_AC_VER}
automake${MY_AM_VER} --add-missing --copy 2>/dev/null
Modified: team/mvanbaak/res_clialiases_unconditional/configure.ac
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/res_clialiases_unconditional/configure.ac?view=diff&rev=151310&r1=151309&r2=151310
==============================================================================
--- team/mvanbaak/res_clialiases_unconditional/configure.ac (original)
+++ team/mvanbaak/res_clialiases_unconditional/configure.ac Mon Oct 20 04:58:03 2008
@@ -1369,7 +1369,7 @@
AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2])
if test "${HAS_PWLIB:-unset}" != "unset"; then
- AST_CHECK_OPENH323_PLATFORM()
+ AST_CHECK_PWLIB_PLATFORM()
PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"
Modified: team/mvanbaak/res_clialiases_unconditional/main/config.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/res_clialiases_unconditional/main/config.c?view=diff&rev=151310&r1=151309&r2=151310
==============================================================================
--- team/mvanbaak/res_clialiases_unconditional/main/config.c (original)
+++ team/mvanbaak/res_clialiases_unconditional/main/config.c Mon Oct 20 04:58:03 2008
@@ -2050,9 +2050,9 @@
result = loader->load_func(db, table, filename, cfg, flags, suggested_include_file, who_asked);
- if (result && result != CONFIG_STATUS_FILEUNCHANGED)
+ if (result && result != CONFIG_STATUS_FILEINVALID && result != CONFIG_STATUS_FILEUNCHANGED)
result->include_level--;
- else
+ else if (result != CONFIG_STATUS_FILEINVALID)
cfg->include_level--;
return result;
Modified: team/mvanbaak/res_clialiases_unconditional/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/res_clialiases_unconditional/pbx/pbx_config.c?view=diff&rev=151310&r1=151309&r2=151310
==============================================================================
--- team/mvanbaak/res_clialiases_unconditional/pbx/pbx_config.c (original)
+++ team/mvanbaak/res_clialiases_unconditional/pbx/pbx_config.c Mon Oct 20 04:58:03 2008
@@ -1412,7 +1412,7 @@
struct ast_flags config_flags = { 0 };
char lastextension[256];
cfg = ast_config_load(config_file, config_flags);
- if (!cfg)
+ if (!cfg || cfg == CONFIG_STATUS_FILEINVALID)
return 0;
/* Use existing config to populate the PBX table */
More information about the svn-commits
mailing list