From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 30 Jul 2008 21:40:08 +0000 (+0000)
Subject: Merged revisions 134649 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1551
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9fa4afa4ee39e2e90a85e33e2173ebf2b0f2e06;p=thirdparty%2Fasterisk.git

Merged revisions 134649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134649 | tilghman | 2008-07-30 16:38:50 -0500 (Wed, 30 Jul 2008) | 4 lines

Qwell pointed out, via IRC, that the previous fix only worked when explicitly
set.  When nothing is set, and the option is implied, it breaks, because
configure sets the prefix to 'NONE'.  Fixing.

........


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

diff --git a/configure b/configure
index 1ea91af886..fcc31b37d3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 134125 .
+# From configure.ac Revision: 134538 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -4049,7 +4049,7 @@ case "${host_os}" in
 
      *)
      ac_default_prefix=/usr
-     if test ${prefix} = '/usr'; then
+     if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            sysconfdir=/etc
         fi
diff --git a/configure.ac b/configure.ac
index 4555f347ad..9b95de2745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ case "${host_os}" in
 
      *)
      ac_default_prefix=/usr
-     if test ${prefix} = '/usr'; then
+     if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            sysconfdir=/etc
         fi