aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-04 11:12:00 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-04 11:12:00 -0400
commit485b4b7eee3bebf3f783d5d0d5d3c9cd8133f7f7 (patch)
treefbc1be2c8e0b4154fc799598282e4846d1829ff5
parent05ded76cb6791d5f9472e39c9e3ebb64f450d219 (diff)
downloadtor-485b4b7eee3bebf3f783d5d0d5d3c9cd8133f7f7.tar
tor-485b4b7eee3bebf3f783d5d0d5d3c9cd8133f7f7.tar.gz
Rename configure.in to configure.ac
This is the preferred filename to use with Autoconf 2.50 and later.
-rw-r--r--acinclude.m42
-rw-r--r--configure.ac (renamed from configure.in)0
-rwxr-xr-xcontrib/updateVersions.pl4
-rw-r--r--doc/HACKING2
-rw-r--r--src/common/compat.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 9ab684877..5ea3097ce 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,4 @@
-dnl Helper macros for Tor configure.in
+dnl Helper macros for Tor configure.ac
dnl Copyright (c) 2001-2004, Roger Dingledine
dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
dnl Copyright (c) 2007-2008, Roger Dingledine, Nick Mathewson
diff --git a/configure.in b/configure.ac
index dba2fec1d..dba2fec1d 100644
--- a/configure.in
+++ b/configure.ac
diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl
index 9c24134f4..710d7d935 100755
--- a/contrib/updateVersions.pl
+++ b/contrib/updateVersions.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-$CONFIGURE_IN = './configure.in';
+$CONFIGURE_IN = './configure.ac';
$ORCONFIG_H = './src/win32/orconfig.h';
$TOR_NSI = './contrib/tor-mingw.nsi.in';
@@ -13,7 +13,7 @@ demand($CONFIGURE_IN);
demand($ORCONFIG_H);
demand($TOR_NSI);
-# extract version from configure.in
+# extract version from configure.ac
open(F, $CONFIGURE_IN) or die "$!";
$version = undef;
diff --git a/doc/HACKING b/doc/HACKING
index bc409dc0d..e76b374d3 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -467,7 +467,7 @@ a stable release, add it to the ReleaseNotes file too. If we're adding
to a release-0.2.x branch, manually commit the changelogs to the later
git branches too.
-4) Bump the version number in configure.in and rebuild.
+4) Bump the version number in configure.ac and rebuild.
5) Make dist, put the tarball up somewhere, and tell #tor about it. Wait
a while to see if anybody has problems building it. Try to get Sebastian
diff --git a/src/common/compat.c b/src/common/compat.c
index ca850a303..12025b227 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -18,7 +18,7 @@
/* XXXX024 We should just use AC_USE_SYSTEM_EXTENSIONS in our autoconf,
* and get this (and other important stuff!) automatically. Once we do that,
* make sure to also change the extern char **environ detection in
- * configure.in, because whether that is declared or not depends on whether
+ * configure.ac, because whether that is declared or not depends on whether
* we have _GNU_SOURCE defined! Maybe that means that once we take this out,
* we can also take out the configure check. */
#define _GNU_SOURCE