summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2006-07-31 01:21:12 +0000
committerPeter Palfrader <peter@palfrader.org>2006-07-31 01:21:12 +0000
commit44321284edfc1d2eb3176c1bc52d365d3eb0219d (patch)
tree6ccd28c25ee807ede63eb10c3fce6c952bdaa33d
parent46482cef096e332f66e2032092232370d3419276 (diff)
downloadtor-44321284edfc1d2eb3176c1bc52d365d3eb0219d.tar.gz
tor-44321284edfc1d2eb3176c1bc52d365d3eb0219d.zip
r8171@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. svn:r6951
-rw-r--r--configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 07466bdcf5..eadbd09d3d 100644
--- a/configure.in
+++ b/configure.in
@@ -582,16 +582,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.