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: https://origsvn.digium.com/svn/asterisk/trunk@304467
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
# 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
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
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'
fi
;;
*)
-
+ ac_default_prefix=/usr
if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc
case "${host_os}" in
freebsd*)
- AC_PREFIX_DEFAULT([/usr/local])
+ ac_default_prefix=/usr/local
CPPFLAGS=-I/usr/local/include
LDFLAGS=-L/usr/local/lib
;;
openbsd*)
- AC_PREFIX_DEFAULT([/usr/local])
+ ac_default_prefix=/usr/local
if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
if test ${sysconfdir} = '${prefix}/etc'; then
astetcdir=/etc/asterisk
LDFLAGS=-L/usr/local/lib
;;
darwin*)
- AC_PREFIX_DEFAULT([/usr/local])
+ ac_default_prefix=/usr/local
if test ${prefix} = 'NONE'; then
astlibdir='/Library/Application Support/Asterisk/Modules'
astvarlibdir='/Library/Application Support/Asterisk'
fi
;;
*)
- AC_PREFIX_DEFAULT([/usr])
+ ac_default_prefix=/usr
if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc