revert my change to use the AC_PREFIX_DEFAULT macro since it is not something

that is expanded inline, so it didn't do what I wanted it to. The --help output
will be wrong again, but that's better than completely breaking it. :)
(Thanks to jcollie for catching this!)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-06-22 12:55:49 +00:00
parent e217604a44
commit a236f488be
2 changed files with 5 additions and 7 deletions

8
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 33995 . # From configure.ac Revision: 35391 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59e. # Generated by GNU Autoconf 2.59e.
# #
@@ -566,8 +566,6 @@ PACKAGE_BUGREPORT=
ac_unique_file="asterisk" ac_unique_file="asterisk"
ac_unique_file="asterisk.c" ac_unique_file="asterisk.c"
ac_default_prefix=/usr/local
ac_default_prefix=/usr
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
@@ -2025,10 +2023,10 @@ ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h"
case "${host}" in case "${host}" in
*freebsd*) *freebsd*)
ac_default_prefix=/usr/local
;; ;;
*) *)
ac_default_prefix=/usr
if test ${sysconfdir} = '${prefix}/etc'; then if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc sysconfdir=/etc
fi fi

View File

@@ -24,10 +24,10 @@ AC_REVISION($Revision$)
case "${host}" in case "${host}" in
*freebsd*) *freebsd*)
AC_PREFIX_DEFAULT(/usr/local) ac_default_prefix=/usr/local
;; ;;
*) *)
AC_PREFIX_DEFAULT(/usr) ac_default_prefix=/usr
if test ${sysconfdir} = '${prefix}/etc'; then if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc sysconfdir=/etc
fi fi