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

diff --git a/configure b/configure
index 541ee3b58c66d13f2ea4f42102f766930ef55c0e..dc7f60543e01e5f7554f022d778cb98f769cf22f 100755 (executable)
--- 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 <stdio.h>
@@ -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 23813573d016abe24c24a53f5715e3ef0c3ee552..db5d50fb9a8d1f5403c09936cfed8fc0d466d3ad 100644 (file)
--- 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