[or-cvs] r6951: r8171 at danube: weasel | 2006-07-31 03:20:46 +0200 Backport r6 (tor/branches/tor-0_1_1-patches)

[weasel at seul.org]

Author: weasel
Date: 2006-07-30 21:21:12 -0400 (Sun, 30 Jul 2006)
New Revision: 6951

Modified:
   tor/branches/tor-0_1_1-patches/
   tor/branches/tor-0_1_1-patches/configure.in
Log:
 r8171 at danube:  weasel | 2006-07-31 03:20:46 +0200
 Backport r6632: Fix configure.in to not produce broken configure files with
 more recent versions of autoconf.



Property changes on: tor/branches/tor-0_1_1-patches
___________________________________________________________________
Name: svk:merge
   + 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/branches/tor-0_1_1-patches:8171

Modified: tor/branches/tor-0_1_1-patches/configure.in
===================================================================
--- tor/branches/tor-0_1_1-patches/configure.in	2006-07-30 22:30:11 UTC (rev 6950)
+++ tor/branches/tor-0_1_1-patches/configure.in	2006-07-31 01:21:12 UTC (rev 6951)
@@ -582,16 +582,16 @@
 
 CONFDIR=`eval echo $sysconfdir/tor`
 AC_SUBST(CONFDIR)
+AH_TEMPLATE([CONFDIR],[tor's configuration directory])
 AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR")
-AC_DEFINE([CONFDIR], [], [tor's configuration directory])
 
 BINDIR=`eval echo $bindir`
 AC_SUBST(BINDIR)
 
 LOCALSTATEDIR=`eval echo $localstatedir`
 AC_SUBST(LOCALSTATEDIR)
+AH_TEMPLATE([LOCALSTATEDIR], [Default location to store state files.])
 AC_DEFINE_UNQUOTED(LOCALSTATEDIR,"$LOCALSTATEDIR")
-AC_DEFINE([LOCALSTATEDIR], [], [Default location to store state files.])
 
 # Set CFLAGS _after_ all the above checks, since our warnings are stricter
 # than autoconf's macros like.