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/branches/1.4@134649 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 7a0b7aa502d6be913800dbf2dad093e1b8cc9b05..a847eaf5221dd5440dbcc1a300872e80826cb42e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 132704 .
+# From configure.ac Revision: 134536 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -3961,7 +3961,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 21719e34f8b22563b52ea4658764c6cd53474714..e5f6630c1257ba6f8a8ece47ef5d77369192d147 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,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