From 09126b1b214562228e98c8b0cb6eb98a37818467 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sun, 25 May 2014 19:00:43 +0200 Subject: [PATCH] Rename configure.in -> configure.ac. Based on PR #976. --- .gitattributes | 2 +- Makefile.am | 4 ++-- autogen.sh | 10 +++++----- build-mingw32.sh | 2 +- configure.in => configure.ac | 4 ++-- libgc/Makefile.direct | 2 +- libgc/README.Mono | 6 +++--- libgc/autogen.sh | 10 +++++----- libgc/{configure.in => configure.ac} | 0 libgc/doc/README | 2 +- libgc/doc/README.changes | 10 +++++----- libgc/version.h | 4 ++-- mono/io-layer/io.c | 2 +- mono/metadata/Makefile.am.in | 2 +- mono/utils/atomic.h | 2 +- mono/utils/gc_wrapper.h | 4 ++-- winconfig.h | 2 +- 17 files changed, 34 insertions(+), 34 deletions(-) rename configure.in => configure.ac (99%) rename libgc/{configure.in => configure.ac} (100%) diff --git a/.gitattributes b/.gitattributes index c7e0c474a2d..5c4cb01ff15 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ # ensure LF endings on all checkouts -configure.in crlf=input +configure.ac crlf=input # ensure native line endings on checkout *.c crlf diff --git a/Makefile.am b/Makefile.am index 30f8cdef0f4..aa4bd78da9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -160,9 +160,9 @@ package-inputs: done echo "" >> msvc/scripts/order.xml -# Update llvm version in configure.in to the output of $LLVM_DIR/bin/llvm-config --version +# Update llvm version in configure.ac to the output of $LLVM_DIR/bin/llvm-config --version update-llvm-version: if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi - REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.in > tmp && mv tmp configure.in && echo "Version set to $$REV." + REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV." diff --git a/autogen.sh b/autogen.sh index a576ed6672a..5213ecffd3c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -37,7 +37,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." @@ -47,8 +47,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." @@ -95,7 +95,7 @@ xlc ) esac -if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then +if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then if test -z "$NO_LIBTOOLIZE" ; then echo "Running libtoolize..." ${LIBTOOL}ize --force --copy @@ -138,7 +138,7 @@ aclocal -Wnone -I m4 -I . $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/build-mingw32.sh b/build-mingw32.sh index 8bcb5ff973c..4c8ed8c1dc4 100755 --- a/build-mingw32.sh +++ b/build-mingw32.sh @@ -57,7 +57,7 @@ function setup () CROSS_DLL_DIR="$CROSS_DIR/bin" PATH=$CROSS_BIN_DIR:$PATH - MONO_VERSION=`grep AC_INIT configure.in | cut -d ',' -f 2|tr -d '\[ \]'` + MONO_VERSION=`grep AC_INIT configure.ac | cut -d ',' -f 2|tr -d '\[ \]'` if [ -d ./.git ]; then MONO_GIT_COMMIT="`git log -1 --format=format:%t`" diff --git a/configure.in b/configure.ac similarity index 99% rename from configure.in rename to configure.ac index 32c3efee89e..dbea6ae64f1 100644 --- a/configure.in +++ b/configure.ac @@ -344,7 +344,7 @@ case "$host" in use_sigposix=yes ;; *) - AC_MSG_WARN([*** Please add $host to configure.in checks!]) + AC_MSG_WARN([*** Please add $host to configure.ac checks!]) host_win32=no libdl="-ldl" ;; @@ -1142,7 +1142,7 @@ if test x$target_win32 = xno; then else LIBS="$LIBS $DL_LIB" AC_DEFINE(HAVE_DL_LOADER,1,[dlopen-based dynamic loader available]) - dnl from glib's configure.in + dnl from glib's configure.ac AC_CACHE_CHECK([for preceeding underscore in symbols], mono_cv_uscore,[ AC_TRY_RUN([#include diff --git a/libgc/Makefile.direct b/libgc/Makefile.direct index 1f03b511c3b..8b4dff1fb73 100644 --- a/libgc/Makefile.direct +++ b/libgc/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/libgc/README.Mono b/libgc/README.Mono index bf2fbf7df7a..559d3ec4932 100644 --- a/libgc/README.Mono +++ b/libgc/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. diff --git a/libgc/autogen.sh b/libgc/autogen.sh index 376c3878856..10ae8cf6831 100755 --- a/libgc/autogen.sh +++ b/libgc/autogen.sh @@ -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/libgc/configure.in b/libgc/configure.ac similarity index 100% rename from libgc/configure.in rename to libgc/configure.ac diff --git a/libgc/doc/README b/libgc/doc/README index a19cb3021b0..eaba6e509d3 100644 --- a/libgc/doc/README +++ b/libgc/doc/README @@ -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/libgc/doc/README.changes b/libgc/doc/README.changes index 97b0b684dde..fa6f279f518 100644 --- a/libgc/doc/README.changes +++ b/libgc/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 diff --git a/libgc/version.h b/libgc/version.h index e1fe24bd0ab..9fcbb7b651f 100644 --- a/libgc/version.h +++ b/libgc/version.h @@ -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 diff --git a/mono/io-layer/io.c b/mono/io-layer/io.c index 40c9591a897..9e2fb959697 100755 --- a/mono/io-layer/io.c +++ b/mono/io-layer/io.c @@ -705,7 +705,7 @@ static gboolean file_setendoffile(gpointer handle) } #ifdef FTRUNCATE_DOESNT_EXTEND - /* I haven't bothered to write the configure.in stuff for this + /* I haven't bothered to write the configure.ac stuff for this * because I don't know if any platform needs it. I'm leaving * this code just in case though */ diff --git a/mono/metadata/Makefile.am.in b/mono/metadata/Makefile.am.in index e4867a8a81a..fa622832634 100644 --- a/mono/metadata/Makefile.am.in +++ b/mono/metadata/Makefile.am.in @@ -75,7 +75,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLA # mono-config.c uses MONO_CFG_DIR # # This won't result in many more false positives than AC_DEFINEing them -# in configure.in. +# in configure.ac. # assembly.lo mono-config.lo: Makefile diff --git a/mono/utils/atomic.h b/mono/utils/atomic.h index c8c70007bc7..c1a1a94b475 100755 --- a/mono/utils/atomic.h +++ b/mono/utils/atomic.h @@ -167,7 +167,7 @@ static inline void InterlockedWrite16(volatile gint16 *dst, gint16 val) mono_memory_barrier (); } -/* Prefer GCC atomic ops if the target supports it (see configure.in). */ +/* Prefer GCC atomic ops if the target supports it (see configure.ac). */ #elif defined(USE_GCC_ATOMIC_OPS) static inline gint32 InterlockedCompareExchange(volatile gint32 *dest, diff --git a/mono/utils/gc_wrapper.h b/mono/utils/gc_wrapper.h index b4ea3770ad2..6da0fb2fc8d 100644 --- a/mono/utils/gc_wrapper.h +++ b/mono/utils/gc_wrapper.h @@ -27,10 +27,10 @@ # if defined(HAVE_KW_THREAD) && defined(USE_INCLUDED_LIBGC) && !defined(__powerpc__) /* The local alloc stuff is in pthread_support.c, but solaris uses solaris_threads.c */ - /* It is also disabled on solaris/x86 by libgc/configure.in */ + /* It is also disabled on solaris/x86 by libgc/configure.ac */ /* * ARM has no definition for some atomic functions in gc_locks.h and - * support is also disabled in libgc/configure.in. + * support is also disabled in libgc/configure.ac. */ # if !defined(__sparc__) && !defined(__sun) && !defined(__arm__) && !defined(__mips__) # define GC_REDIRECT_TO_LOCAL diff --git a/winconfig.h b/winconfig.h index 1084339a44f..427e21f35a8 100644 --- a/winconfig.h +++ b/winconfig.h @@ -1,5 +1,5 @@ /* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* The architecture this is running on */ #if defined(_M_IA64) -- 2.25.1