Revert last commit that had bad changed to configure.

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

diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample
index 18de98fbc59fb0235a3da7396e43e8feeb1b11f6..ab8cdd854ce437ff00b01941bdcf5e496fe0acaf 100644 (file)
--- a/configs/extensions.ael.sample
+++ b/configs/extensions.ael.sample
@@ -18,23 +18,15 @@
 // 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";
-       OUTBOUND-TRUNK="Zap/g2";                // Trunk interface
+       TRUNK="Zap/g2";                                 // Trunk interface
        //
-       // Note the 'g2' in the OUTBOUND-TRUNK variable above. It specifies which group (defined
+       // Note the 'g2' in the 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:
        //
@@ -47,7 +39,7 @@ globals {
        // R: use a round-robin search, starting at the next lowest channel than last
        //    time (aka. descending rotary hunt group).
        //
-       OUTBOUND-TRUNKMSD=1;                                    // MSD digits to strip (usually 1 or 0)
+       TRUNKMSD=1;                                     // MSD digits to strip (usually 1 or 0)
        //TRUNK=IAX2/user:pass@provider
 };
 
@@ -218,7 +210,7 @@ context ael-trunkint {
        };
        _9011. => {
                &ael-dundi-e164(${EXTEN:4});
-               Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+               Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
        };
 };
 
@@ -231,7 +223,7 @@ context ael-trunkld {
        };
        _91NXXNXXXXXX => {
                &ael-dundi-e164(${EXTEN:1});
-               Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+               Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
        };
 };
 
@@ -240,7 +232,7 @@ context ael-trunklocal {
        // Local seven-digit dialing accessed through trunk interface
        //
        _9NXXXXXX => {
-               Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+               Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
        };
 };
 
@@ -249,10 +241,10 @@ context ael-trunktollfree {
        // Long distance context accessed through trunk interface
        //
        
-       _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}});
+       _91800NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+       _91888NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+       _91877NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+       _91866NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
 };
 
 context ael-international {

diff --git a/configure b/configure
index f1840f8d81ae30ca2134bb2a3c9927c76dabe20b..9d05829c8063872c5ae8ee618233cb9a1f09b462 100755 (executable)
--- a/configure
+++ b/configure
@@ -564,7 +564,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 #
 # Initializations.
 #
-ac_default_prefix=/usr
+ac_default_prefix=/usr/local
 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/sbin', \`$ac_default_prefix/lib' etc.  You can specify
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 for instance \`--prefix=\$HOME'.