[svn-commits] trunk r35439 - in /trunk: configure configure.ac

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Jun 22 07:55:49 2006
New Revision: 35439

URL: http://svn.digium.com/view/asterisk?rev=35439&view=rev
Log:
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!)

Modified:
    trunk/configure
    trunk/configure.ac

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=35439&r1=35438&r2=35439&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Jun 22 07:55:49 2006
@@ -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 @@
 
 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 @@
 
 case "${host}" in
      *freebsd*)
-
+     ac_default_prefix=/usr/local
      ;;
      *)
-
+     ac_default_prefix=/usr
      if test ${sysconfdir} = '${prefix}/etc'; then
         sysconfdir=/etc
      fi

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=35439&r1=35438&r2=35439&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jun 22 07:55:49 2006
@@ -24,10 +24,10 @@
 
 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