diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-27 17:03:44 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-27 17:03:44 +0000 |
commit | f9b6381cfb8134871cb15c02dec0e067f891ffae (patch) | |
tree | 512d0ba104b5cf041a9ef9b147be8ce0c4f48d3c /configure | |
parent | 902de945d153cdb052017244bec7782f2fc1b729 (diff) |
Merged revisions 304466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r304466 | qwell | 2011-01-27 11:03:01 -0600 (Thu, 27 Jan 2011) | 23 lines
Merged revisions 304465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r304465 | qwell | 2011-01-27 11:01:24 -0600 (Thu, 27 Jan 2011) | 16 lines
Merged revisions 304464 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r304464 | qwell | 2011-01-27 10:57:46 -0600 (Thu, 27 Jan 2011) | 9 lines
Fix default prefix=/usr regression on non-Linux systems.
This partially reverts a change made in branches/1.4/ r267759, which will
cause issue #17013 to be reopened. This issue was pointed out by a user
on #asterisk, who helpfully discovered that paths were being set incorrectly.
To truly understand what was wrong, one should run:
svn diff --force -c<this revision> configure
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@304467 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -597,10 +597,6 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_default_prefix=/usr/local -ac_default_prefix=/usr/local -ac_default_prefix=/usr/local -ac_default_prefix=/usr ac_header_list= ac_subst_vars='LTLIBOBJS PBX_SYSLOG @@ -4520,12 +4516,12 @@ esac case "${host_os}" in freebsd*) - + ac_default_prefix=/usr/local CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ;; openbsd*) - + ac_default_prefix=/usr/local if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then if test ${sysconfdir} = '${prefix}/etc'; then astetcdir=/etc/asterisk @@ -4538,7 +4534,7 @@ case "${host_os}" in LDFLAGS=-L/usr/local/lib ;; darwin*) - + ac_default_prefix=/usr/local if test ${prefix} = 'NONE'; then astlibdir='/Library/Application Support/Asterisk/Modules' astvarlibdir='/Library/Application Support/Asterisk' @@ -4566,7 +4562,7 @@ $as_echo "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h fi ;; *) - + ac_default_prefix=/usr if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then if test ${sysconfdir} = '${prefix}/etc'; then sysconfdir=/etc |