Merged revisions 50782 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r50782 | tilghman | 2007-01-13 23:13:47 -0600 (Sat, 13 Jan 2007) | 10 lines

Merged revisions 50781 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r50781 | tilghman | 2007-01-13 23:01:16 -0600 (Sat, 13 Jan 2007) | 2 lines

Bug 8814 - db should look for its header using a relative path, instead of the system path (Fixes FreeWRT)

........

................


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

main/db1-ast/btree/bt_close.c

@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
 #include <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int bt_meta __P((BTREE *));

main/db1-ast/btree/bt_conv.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static void mswap __P((PAGE *));

main/db1-ast/btree/bt_debug.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_delete.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
 #include <stdio.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int __bt_bdelete __P((BTREE *, const DBT *));

main/db1-ast/btree/bt_get.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
 #include <stddef.h>
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_open.c

@@ -58,7 +58,7 @@ static char sccsid[] = "@(#)bt_open.c	8.10 (Berkeley) 8/17/94";
 #include <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 #ifdef DEBUG

main/db1-ast/btree/bt_overflow.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_page.c

@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
 
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_put.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));

main/db1-ast/btree/bt_search.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
 
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));

main/db1-ast/btree/bt_seq.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));

main/db1-ast/btree/bt_split.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_split.c	8.9 (Berkeley) 7/26/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int	 bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));

main/db1-ast/btree/bt_utils.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*