diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-10-29 15:15:49 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-10-29 15:15:49 +0000 |
| commit | 1c451b9db991705cf83f166e0f0f3fa326098ff3 (patch) | |
| tree | 129dfa5cbc412b94160a686293bab498d7f3292d /configure.in | |
| parent | 28652aec691b1780230095dd6746634ac40fa957 (diff) | |
| download | tor-1c451b9db991705cf83f166e0f0f3fa326098ff3.tar.gz tor-1c451b9db991705cf83f166e0f0f3fa326098ff3.zip | |
r16252@catbus: nickm | 2007-10-29 11:13:03 -0400
Change symbol from DATADIR to SHARE_DATADIR, since DATADIR conflicts with objidl.h in mingw.
svn:r12268
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 08adf087df..3abcf2648e 100644 --- a/configure.in +++ b/configure.in @@ -620,10 +620,11 @@ AH_TEMPLATE([LOCALSTATEDIR], [Default location to store state files.]) AC_DEFINE_UNQUOTED(LOCALSTATEDIR,"$LOCALSTATEDIR") dnl Note: this is not the same as Tor's "DataDir" config option. -DATADIR=`eval echo $datadir` -AC_SUBST(DATADIR) -AH_TEMPLATE([DATADIR], [Default location for platform-independent read-only data.]) -AC_DEFINE_UNQUOTED(DATADIR,"$DATADIR") +dnl We'd call it 'DATADIR', except that's a symbol in MinGW's objidl.h. +SHARE_DATADIR=`eval echo $datadir` +AC_SUBST(SHARE_DATADIR) +AH_TEMPLATE([SHARE_DATADIR], [Default location for platform-independent read-only data.]) +AC_DEFINE_UNQUOTED(SHARE_DATADIR,"$SHARE_DATADIR") # Set CFLAGS _after_ all the above checks, since our warnings are stricter # than autoconf's macros like. |