[svn-commits] tilghman: branch 1.6.0 r134651 - in /branches/1.6.0: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jul 30 16:41:23 2008
New Revision: 134651

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134651
Log:
Merged revisions 134650 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r134650 | tilghman | 2008-07-30 16:40:08 -0500 (Wed, 30 Jul 2008) | 12 lines

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.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configure
    branches/1.6.0/configure.ac

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=134651&r1=134650&r2=134651
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Wed Jul 30 16:41:23 2008
@@ -35,7 +35,7 @@
 
      *)
      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