diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 10:33:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 10:33:24 -0400 |
| commit | 7795f42e4be2d04d3f40e227a094dbdce533b173 (patch) | |
| tree | 9814500ff44228fb0ffa896c11f86d8b05140b3f /configure.in | |
| parent | b3b4f319367e1fb50ea99ba042ed60030e909c12 (diff) | |
| parent | 09d90b1b65066e79dc6de59f2ffca9e28ab5e7ea (diff) | |
| download | tor-7795f42e4be2d04d3f40e227a094dbdce533b173.tar.gz tor-7795f42e4be2d04d3f40e227a094dbdce533b173.zip | |
Merge branch 'bug6524_nm'
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/configure.in b/configure.in index 1c342c5bf9..dba2fec1d9 100644 --- a/configure.in +++ b/configure.in @@ -3,10 +3,11 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.4.0-alpha-dev) +AC_INIT([tor],[0.2.4.0-alpha-dev]) +AC_CONFIG_SRCDIR([src/or/main.c]) +AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_CONFIG_HEADER(orconfig.h) +AC_CONFIG_HEADERS([orconfig.h]) AC_CANONICAL_HOST @@ -1309,23 +1310,12 @@ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_z AC_CONFIG_FILES([ Doxyfile Makefile - contrib/Makefile - contrib/suse/Makefile contrib/suse/tor.sh contrib/tor.logrotate contrib/tor.sh contrib/torctl contrib/torify - doc/Makefile - src/Makefile - src/common/Makefile - src/config/Makefile src/config/torrc.sample - src/or/Makefile - src/test/Makefile - src/tools/Makefile - src/tools/tor-fw-helper/Makefile - src/win32/Makefile tor.spec ]) @@ -1334,4 +1324,3 @@ AC_OUTPUT if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then ./contrib/updateVersions.pl fi - |