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

2 files changed, 5 insertions, 7 deletions

diff --git a/configure b/configure
index dc7f60543..f10e21128 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 33995 .
+# From configure.ac Revision: 35391 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59e.
 #
@@ -566,8 +566,6 @@ 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>
@@ -2025,10 +2023,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 db5d50fb9..23813573d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,10 @@ AC_REVISION($Revision$)
 
 case "${host}" in
      *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
         sysconfdir=/etc
      fi