Merged revisions 134649 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 30 Jul 2008 21:40:08 +0000 (21:40 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 30 Jul 2008 21:40:08 +0000 (21:40 +0000)
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

configure
configure.ac

index 1ea91af..fcc31b3 100755 (executable)
--- 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
index 4555f34..9b95de2 100644 (file)
@@ -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