summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2008-07-30 21:40:08 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2008-07-30 21:40:08 +0000
commite9fa4afa4ee39e2e90a85e33e2173ebf2b0f2e06 (patch)
tree326c47194629721bac48cb1f69283cdb6b59d543 /configure
parent2f16a9583fb98eb980bcc6dcb96e7676126c764a (diff)
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 1ea91af88..fcc31b37d 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