From e156997d5770ad2bce60168da941388e6ad42488 Mon Sep 17 00:00:00 2001
From: lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 15 Mar 2010 20:46:06 +0000
Subject: Update extensions.ael file to not overlap extensions.conf. Updated
 the extensions.ael file so the global variables don't overlap those that we
 have in extensions.conf (sample files). This way unexpected things won't
 happed hopefully if both pbx_ael and res_config are loaded.

(closes issue #17035)
Reported by: pprindeville

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@252531 f38db490-d61c-443f-a65b-d21fe96a405b
---
 configs/extensions.ael.sample | 28 ++++++++++++++++++----------
 configure                     |  4 ++--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample
index ab8cdd854..18de98fbc 100644
--- a/configs/extensions.ael.sample
+++ b/configs/extensions.ael.sample
@@ -18,15 +18,23 @@
 // function: ${ENV(VARIABLE)}
 //
 
+// NOTE! NOTE! NOTE!
+// Asterisk by default will load both extensions.conf and extensions.ael files.
+// Upon loading these files the dialplans generated from both with be merged,
+// so you must make sure that you don't have any overlapping contexts or global
+// variables. If you do, then unexpected behavior may result when the data is
+// merged.
+// NOTE! NOTE! NOTE!
+
 globals {
 	CONSOLE="Console/dsp"; 		// Console interface for demo
 	//CONSOLE=Zap/1
 	//CONSOLE=Phone/phone0
 	IAXINFO=guest;				// IAXtel username/password
 	//IAXINFO="myuser:mypass";
-	TRUNK="Zap/g2";					// Trunk interface
+	OUTBOUND-TRUNK="Zap/g2";		// Trunk interface
 	//
-	// Note the 'g2' in the TRUNK variable above. It specifies which group (defined
+	// Note the 'g2' in the OUTBOUND-TRUNK variable above. It specifies which group (defined
 	// in chan_dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in
 	// the specified group. The four possible options are:
 	//
@@ -39,7 +47,7 @@ globals {
 	// R: use a round-robin search, starting at the next lowest channel than last
 	//    time (aka. descending rotary hunt group).
 	//
-	TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
+	OUTBOUND-TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
 	//TRUNK=IAX2/user:pass@provider
 };
 
@@ -210,7 +218,7 @@ context ael-trunkint {
 	};
 	_9011. => {
 		&ael-dundi-e164(${EXTEN:4});
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -223,7 +231,7 @@ context ael-trunkld {
 	};
 	_91NXXNXXXXXX => {
 		&ael-dundi-e164(${EXTEN:1});
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -232,7 +240,7 @@ context ael-trunklocal {
 	// Local seven-digit dialing accessed through trunk interface
 	//
 	_9NXXXXXX => {
-		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 	};
 };
 
@@ -241,10 +249,10 @@ context ael-trunktollfree {
 	// Long distance context accessed through trunk interface
 	//
 	
-	_91800NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
-	_91888NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
-	_91877NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
-	_91866NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+	_91800NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+	_91888NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+	_91877NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+	_91866NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
 };
 
 context ael-international {
diff --git a/configure b/configure
index 9d05829c8..f1840f8d8 100755
--- a/configure
+++ b/configure
@@ -564,7 +564,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 #
 # Initializations.
 #
-ac_default_prefix=/usr/local
+ac_default_prefix=/usr
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
@@ -1479,7 +1479,7 @@ Installation directories:
 			  [PREFIX]
 
 By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+\`$ac_default_prefix/sbin', \`$ac_default_prefix/lib' etc.  You can specify
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 for instance \`--prefix=\$HOME'.
 
-- 
cgit v1.2.3