diff options
author | Alex Ronne Petersen <alexrp@xamarin.com> | 2014-05-25 19:00:43 +0200 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2015-05-17 13:26:03 +0300 |
commit | 9fb43a936fe54198189e56f96ccfd0eeb7625026 (patch) | |
tree | f75d9fa3689f4ae39d5648ee8a0a183b2837053c | |
parent | 07710e40270672890e08324d263ca75b6f8d5920 (diff) | |
download | bdwgc-9fb43a936fe54198189e56f96ccfd0eeb7625026.tar.gz |
Rename configure.in -> configure.ac. Based on PR #976.
-rw-r--r-- | Makefile.direct | 2 | ||||
-rw-r--r-- | README.Mono | 6 | ||||
-rwxr-xr-x | autogen.sh | 10 | ||||
-rw-r--r-- | configure.ac (renamed from configure.in) | 0 | ||||
-rw-r--r-- | doc/README | 2 | ||||
-rw-r--r-- | doc/README.changes | 10 | ||||
-rw-r--r-- | version.h | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.direct b/Makefile.direct index 1f03b511..8b4dff1f 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \ TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \ tests/leak_test.c tests/thread_leak_test.c tests/middle.c -GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \ +GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \ libtool.m4 install-sh configure.host Makefile.in \ aclocal.m4 config.sub config.guess \ include/Makefile.am include/Makefile.in \ diff --git a/README.Mono b/README.Mono index bf2fbf7d..559d3ec4 100644 --- a/README.Mono +++ b/README.Mono @@ -5,8 +5,8 @@ This is a modified version of Boehm GC 6.1 for Mono. - Makefile changes: libgc has a lot of configurable options which are AC_DEFINE()d in its - configure.in. To make it easier to build and bundle it with Mono, I - replaced most of the orignal configure.in and the makefiles with custom + configure.ac. To make it easier to build and bundle it with Mono, I + replaced most of the orignal configure.ac and the makefiles with custom versions which just define what we actually need for Mono. This means that you can just run configure in this directory and it'll @@ -58,7 +58,7 @@ This is a modified version of Boehm GC 6.1 for Mono. cvs diff -u -r LIBGC - When importing new upstream versions, don't import the new configure.in or any of the + When importing new upstream versions, don't import the new configure.ac or any of the Makefile.am's; they've been replaced by custom versions. Just import all the new source files and it should be fine. @@ -22,7 +22,7 @@ if [ -z "$LIBTOOL" ]; then fi fi -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { +(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && { ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`libtool' installed to compile Mono." @@ -32,8 +32,8 @@ fi } } -grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ +grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && { + grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \ (gettext --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`gettext' installed to compile Mono." @@ -80,7 +80,7 @@ xlc ) esac -if grep "^AC_PROG_LIBTOOL" configure.in >/dev/null; then +if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then if test -z "$NO_LIBTOOLIZE" ; then echo "Running libtoolize..." ${LIBTOOL}ize --force --copy @@ -99,7 +99,7 @@ aclocal $ACLOCAL_FLAGS || { exit 1 } -if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then +if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then echo "Running autoheader..." autoheader || { echo "**Error**: autoheader failed."; exit 1; } fi diff --git a/configure.in b/configure.ac index 837e2cb9..837e2cb9 100644 --- a/configure.in +++ b/configure.ac @@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. The file linux_threads.c is also Copyright (c) 1998 by Fergus Henderson. All rights reserved. -The files Makefile.am, and configure.in are +The files Makefile.am, and configure.ac are Copyright (c) 2001 by Red Hat Inc. All rights reserved. Several files supporting GNU-style builds are copyrighted by the Free diff --git a/doc/README.changes b/doc/README.changes index 97b0b684..fa6f279f 100644 --- a/doc/README.changes +++ b/doc/README.changes @@ -1269,7 +1269,7 @@ Since 6.0alpha6: many places. (Thanks to Benjamin Lerman.) - Made win32_threads.c more tolerant of detaching a thread that it didn't know about. (Thanks to Paul Nash.) - - Added Makefile.am and configure.in from gcc to the distribution, with + - Added Makefile.am and configure.ac from gcc to the distribution, with minimal changes. For the moment, those are just placeholders. In the future, we're planning to switch to a GNU-style build environment for Un*x-like systems, though the old Makefile will remain as a backup. @@ -1491,7 +1491,7 @@ Since 6.1alpha3: - Fixed a formatting error in dbg_mlc.c. Added prototype to GC_abort() declaration. (Thanks to Michael Smith.) - Removed "source" argument to GC_find_start(). Eliminate GC_FIND_START(). - - Added win32 recognition code in configure.in. Changed some of the + - Added win32 recognition code in configure.ac. Changed some of the dllimport/export defines in gc.h. (Thanks to Adam Megacz.) - GC_malloc_many didn't set hb_last_reclaimed when it called GC_reclaim_generic. (I'm not sure this matters much, but ...) @@ -1629,7 +1629,7 @@ Since 6.1alpha4: Since 6.1alpha5: - Added GC_MAXIMUM_HEAP_SIZE environment variable. - - Fix configure.in for MIPS/LINUX. (Thanks to H.J. Lu.) + - Fix configure.ac for MIPS/LINUX. (Thanks to H.J. Lu.) - Double page hash table size for -DLARGE_CONFIG. - Integrated Bo Thorsen's X86-64 support. - STACKBOTTOM definition for LINUX/MIPS was partially changed back. @@ -1942,7 +1942,7 @@ Since 6.3alpha1: There is also still some code duplication with pthread_support.c. (Thread descriptors did become much smaller, since Ben Hutchings removed the thread context from them.) - - Integrated a Solaris configure.in patch from Rainer Orth. + - Integrated a Solaris configure.ac patch from Rainer Orth. - Added GC_IGNORE_FB and associated warning to very partially address the issue of the collector treating a mapped frame buffer as part of the root set. (Thanks to David Peroutka for providing some @@ -2151,7 +2151,7 @@ Since 6.3: it seems to be incorrect if the preceding memory op is a load. - Fixed print_block_list to print the correct kind number for STUBBORN. (Thanks to Rutger Ovidus.) - - Have configure.in generate an error if it is asked to support + - Have configure.ac generate an error if it is asked to support pthreads, but doesn't know how to. - Added Kazuhiro Inaoka's patch for Renesas M32R support. - Have the GNU build mechanism link with -ldl. Rename THREADLIBS @@ -1,4 +1,4 @@ -/* The version here should match that in configure/configure.in */ +/* The version here should match that in configure/configure.ac */ /* Eventually this one may become unnecessary. For now we need */ /* it to keep the old-style build process working. */ #define GC_TMP_VERSION_MAJOR 6 @@ -14,7 +14,7 @@ GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \ defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \ defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION -# error Inconsistent version info. Check README, version.h, and configure.in. +# error Inconsistent version info. Check README, version.h, and configure.ac. # endif #else # define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR |