[or-cvs] Fix configure.in to not produce broken configure files with...

[Peter Palfrader]

Update of /home/or/cvsroot/tor
In directory moria:/tmp/cvs-serv1039

Modified Files:
	configure.in 
Log Message:
Fix configure.in to not produce broken configure files with more recent
versions of autoconf.  Thanks to Clint for his auto* voodoo.


Index: configure.in
===================================================================
RCS file: /home/or/cvsroot/tor/configure.in,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -d -r1.294 -r1.295
--- configure.in	14 Jun 2006 23:21:22 -0000	1.294
+++ configure.in	16 Jun 2006 02:04:04 -0000	1.295
@@ -584,16 +584,16 @@ fi
 
 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.