aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-27 17:01:24 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-27 17:01:24 +0000
commitf95cb3adf0faae072276febd07c91aa84d92c7f9 (patch)
treed1ccdd42ffde2d658b6e3d6a2ac5e18e22f48581
parent03f870d18fa3028e995896bc93671ef9ae10b944 (diff)
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/branches/1.6.2@304465 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 6 deletions
diff --git a/configure b/configure
index 13a5b3c15..d02c34251 100755
--- a/configure
+++ b/configure
@@ -598,8 +598,6 @@ ac_includes_default="\
#endif"
ac_default_prefix=/usr/local
-ac_default_prefix=/usr/local
-ac_default_prefix=/usr
ac_header_list=
ac_subst_vars='LTLIBOBJS
PBX_GENERIC_ODBC
@@ -4549,7 +4547,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
case "${host_os}" in
freebsd*)
-
+ ac_default_prefix=/usr/local
CPPFLAGS=-I/usr/local/include
LDFLAGS=-L/usr/local/lib
;;
@@ -4575,7 +4573,7 @@ $as_echo "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h
;;
*)
-
+ ac_default_prefix=/usr
if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc
diff --git a/configure.ac b/configure.ac
index d3af0fa98..0dbc3f525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD
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
;;
@@ -63,7 +63,7 @@ case "${host_os}" in
AC_DEFINE([_DARWIN_UNLIMITED_SELECT], 1, [Define to 1 if running on Darwin.])
;;
*)
- AC_PREFIX_DEFAULT([/usr])
+ ac_default_prefix=/usr
if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc