Skip to content

Commit

Permalink
Rename configure.in -> configure.ac. Based on PR mono#976.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Rønne Petersen committed May 25, 2014
1 parent d61bf0d commit 09126b1
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .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
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
Expand Up @@ -160,9 +160,9 @@ package-inputs:
done
echo "</root>" >> 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."


10 changes: 5 additions & 5 deletions autogen.sh
Expand Up @@ -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."
Expand All @@ -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."
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-mingw32.sh
Expand Up @@ -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`"
Expand Down
4 changes: 2 additions & 2 deletions configure.in → configure.ac
Expand Up @@ -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"
;;
Expand Down Expand Up @@ -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 <dlfcn.h>
Expand Down
2 changes: 1 addition & 1 deletion libgc/Makefile.direct
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions libgc/README.Mono
Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down
10 changes: 5 additions & 5 deletions libgc/autogen.sh
Expand Up @@ -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."
Expand All @@ -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."
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion libgc/doc/README
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions libgc/doc/README.changes
Expand Up @@ -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.
Expand Down Expand Up @@ -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 ...)
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/io.c
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion mono/metadata/Makefile.am.in
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion mono/utils/atomic.h
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions mono/utils/gc_wrapper.h
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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)
Expand Down

0 comments on commit 09126b1

Please sign in to comment.