From fd0273875aef6d90fadf315f1a873626d01292a1 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 22 Jun 2006 10:30:51 +0000 Subject: [PATCH] use the AC_PREFIX_DEFAULT macro to set the default prefix instead of setting the variable directly, so that the configure --help information shows the correct default prefix git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35391 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure | 8 +++++--- configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 541ee3b58c..dc7f60543e 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 33953 . +# From configure.ac Revision: 33995 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59e. # @@ -566,6 +566,8 @@ PACKAGE_BUGREPORT= ac_unique_file="asterisk" ac_unique_file="asterisk.c" +ac_default_prefix=/usr/local +ac_default_prefix=/usr # Factoring default headers for most tests. ac_includes_default="\ #include @@ -2023,10 +2025,10 @@ ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h" case "${host}" in *freebsd*) - ac_default_prefix=/usr/local + ;; *) - ac_default_prefix=/usr + if test ${sysconfdir} = '${prefix}/etc'; then sysconfdir=/etc fi diff --git a/configure.ac b/configure.ac index 23813573d0..db5d50fb9a 100644 --- a/configure.ac +++ b/configure.ac @@ -24,10 +24,10 @@ AC_REVISION($Revision$) case "${host}" in *freebsd*) - ac_default_prefix=/usr/local + AC_PREFIX_DEFAULT(/usr/local) ;; *) - ac_default_prefix=/usr + AC_PREFIX_DEFAULT(/usr) if test ${sysconfdir} = '${prefix}/etc'; then sysconfdir=/etc fi