Skip to content
This repository has been archived by the owner on Feb 5, 2022. It is now read-only.

Commit

Permalink
rename configure.in to configure.ac
Browse files Browse the repository at this point in the history
Autoconf has been deprecating configure.in for quite a long time.
Rename all our configure.in and preconfigure.in files to .ac.

Signed-off-by: Mike Frysinger <[email protected]>
  • Loading branch information
vapier authored and allanmcrae committed Oct 30, 2013
1 parent 36a4953 commit cb8a6db
Show file tree
Hide file tree
Showing 102 changed files with 245 additions and 68 deletions.
68 changes: 68 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,71 @@
2013-10-30 Mike Frysinger <[email protected]>

* configure.in: Moved to ...
* configure.ac: ... here. Change reference to configure.in
to configure.ac.
* sysdeps/arm/preconfigure.ac: ... here.
configure.in to configure.ac.
* sysdeps/gnu/configure.in: Moved to ...
* sysdeps/gnu/configure.ac: ... here.
* sysdeps/i386/configure.in: Moved to ...
* sysdeps/i386/configure.ac: ... here.
* sysdeps/ieee754/ldbl-opt/configure.in: Moved to ...
* sysdeps/ieee754/ldbl-opt/configure.ac: ... here.
* sysdeps/mach/configure.in: Moved to ...
* sysdeps/mach/configure.ac: ... here.
* sysdeps/mach/hurd/configure.in: Moved to ...
* sysdeps/mach/hurd/configure.ac: ... here.
* sysdeps/powerpc/configure.in: Moved to ...
* sysdeps/powerpc/configure.ac: ... here.
* sysdeps/powerpc/powerpc32/configure.in: Moved to ...
* sysdeps/powerpc/powerpc32/configure.ac: ... here.
* sysdeps/powerpc/powerpc64/configure.in: Moved to ...
* sysdeps/powerpc/powerpc64/configure.ac: ... here.
* sysdeps/s390/s390-32/configure.in: Moved to ...
* sysdeps/s390/s390-32/configure.ac: ... here.
* sysdeps/s390/s390-64/configure.in: Moved to ...
* sysdeps/s390/s390-64/configure.ac: ... here.
* sysdeps/sh/configure.in: Moved to ...
* sysdeps/sh/configure.ac: ... here.
* sysdeps/sparc/configure.in: Moved to ...
* sysdeps/sparc/configure.ac: ... here.
* sysdeps/unix/sysv/linux/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/configure.ac: ... here.
* sysdeps/unix/sysv/linux/powerpc/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/powerpc/configure.ac: ... here.
* sysdeps/x86_64/configure.in: Moved to ...
* sysdeps/x86_64/configure.ac: ... here.
* sysdeps/x86_64/preconfigure.in: Moved to ...
* sysdeps/x86_64/preconfigure.ac: ... here.
* aclocal.m4: Change reference to configure.in to configure.ac.
* config.h.in: Likewise.
* manual/install.texi: Likewise.
* manual/maint.texi: Likewise.
* Makefile: Likewise.
* malloc/Makefile: Likewise.
* nscd/Makefile: Likewise.
* Makeconfig: Change reference to configure.in and
preconfigure.in to configure.ac and preconfigure.ac
respectively.
* INSTALL: Regenerated.
* configure: Likewise.
* sysdeps/gnu/configure: Likewise.
* sysdeps/i386/configure: Likewise.
* sysdeps/ieee754/ldbl-opt/configure: Likewise.
* sysdeps/mach/configure: Likewise.
* sysdeps/mach/hurd/configure: Likewise.
* sysdeps/powerpc/configure: Likewise.
* sysdeps/powerpc/powerpc32/configure: Likewise.
* sysdeps/powerpc/powerpc64/configure: Likewise.
* sysdeps/s390/s390-32/configure: Likewise.
* sysdeps/s390/s390-64/configure: Likewise.
* sysdeps/sh/configure: Likewise.
* sysdeps/sparc/configure: Likewise.
* sysdeps/unix/sysv/linux/configure: Likewise.
* sysdeps/unix/sysv/linux/powerpc/configure: Likewise.
* sysdeps/x86_64/configure: Likewise.
* sysdeps/x86_64/preconfigure: Likewise.

2013-10-29 Andreas Schwab <[email protected]>

* stdio-common/Makefile (tst-swscanf-ENV): Define.
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ build the GNU C Library:
should definitely upgrade `sed'.


If you change any of the `configure.in' files you will also need
If you change any of the `configure.ac' files you will also need

* GNU `autoconf' 2.53 or higher

Expand Down
8 changes: 4 additions & 4 deletions Makeconfig
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ $(common-objpfx)config.status: $(..)version.h $(..)configure \
$(wildcard $(dir)/Implies) \
$(patsubst %.in,%,\
$(firstword $(wildcard \
$(addprefix $(dir)/,configure configure.in))))) \
$(addprefix $(dir)/,configure configure.ac))))) \
$(patsubst %.in,%,\
$(wildcard $(..)sysdeps/*/preconfigure $(..)sysdeps/*/preconfigure.in)) \
$(wildcard $(..)sysdeps/*/preconfigure $(..)sysdeps/*/preconfigure.ac)) \
$(patsubst %.in,%,\
$(foreach add-on,$(add-ons),\
$(firstword $(wildcard \
$(addprefix $(firstword $(filter /%,$(add-on)) $(..)$(add-on))/,\
configure configure.in))) \
configure configure.ac))) \
$(wildcard $(addprefix $(firstword $(filter /%,$(add-on)) $(..)$(add-on))/,\
sysdeps/*/preconfigure sysdeps/*/preconfigure.in))))
sysdeps/*/preconfigure sysdeps/*/preconfigure.ac))))
@cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \
echo The GNU C library has not been configured. >&2; \
echo Run \`configure\' to configure it before building. >&2; \
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) [email protected]
mv -f $@.new $@
endef

configure: configure.in aclocal.m4; $(autoconf-it)
%/configure: %/configure.in aclocal.m4; $(autoconf-it)
%/preconfigure: %/preconfigure.in aclocal.m4; $(autoconf-it)
configure: configure.ac aclocal.m4; $(autoconf-it)
%/configure: %/configure.ac aclocal.m4; $(autoconf-it)
%/preconfigure: %/preconfigure.ac aclocal.m4; $(autoconf-it)

endif # $(AUTOCONF) = no

Expand Down
6 changes: 3 additions & 3 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ m4_defn([AC_AUTOCONF_VERSION])
), [63])])dnl
dnl
dnl We define the macro GLIBC_PROVIDES to do an AC_PROVIDE for each macro
dnl which appears in configure.in before the sysdep configure scripts are run.
dnl Each sysdep configure.in does GLIBC_PROVIDES first, to avoid any
dnl which appears in configure.ac before the sysdep configure scripts are run.
dnl Each sysdep configure.ac does GLIBC_PROVIDES first, to avoid any
dnl AC_REQUIREs or AC_BEFOREs duplicating their code.
dnl
define([GLIBC_PROVIDES], [dnl
Expand Down Expand Up @@ -39,7 +39,7 @@ dnl Ripped out of AS_INIT, which does more cruft we do not want.
m4_wrap([m4_divert_pop([BODY])[]])
m4_divert_push([BODY])[]dnl
dnl End of ripped out of AS_INIT.
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
define([_AC_LANG], [C])dnl
])dnl
dnl
Expand Down
6 changes: 3 additions & 3 deletions config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@
They are used only in miscellaneous generator programs, not
in compiling libc itself. */

/* sysdeps/generic/configure.in */
/* sysdeps/generic/configure.ac */
#undef HAVE_PSIGNAL

/* sysdeps/unix/configure.in */
/* sysdeps/unix/configure.ac */
#undef HAVE_STRERROR

/* sysdeps/unix/common/configure.in */
/* sysdeps/unix/common/configure.ac */
#undef HAVE_SYS_SIGLIST
#undef HAVE__SYS_SIGLIST
#undef HAVE__CTYPE_
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -5171,7 +5171,7 @@ $as_echo_n "checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works... " >&6; }
if ${libc_cv_autoconf_works+:} false; then :
$as_echo_n "(cached) " >&6
else
if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then
if (cd $srcdir; $AUTOCONF $ACFLAGS configure.ac > /dev/null 2>&1); then
libc_cv_autoconf_works=yes
else
libc_cv_autoconf_works=no
Expand Down
4 changes: 2 additions & 2 deletions configure.in → configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ xno|x|x:) AUTOCONF=no ;;
*)
AC_CACHE_CHECK(dnl
whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works, libc_cv_autoconf_works, [dnl
if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then
if (cd $srcdir; $AUTOCONF $ACFLAGS configure.ac > /dev/null 2>&1); then
libc_cv_autoconf_works=yes
else
libc_cv_autoconf_works=no
Expand Down Expand Up @@ -2155,7 +2155,7 @@ AC_SUBST(static_nss)

AC_SUBST(DEFINES)

dnl See sysdeps/mach/configure.in for this variable.
dnl See sysdeps/mach/configure.ac for this variable.
AC_SUBST(mach_interface_list)

VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h`
Expand Down
6 changes: 6 additions & 0 deletions libidn/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2013-10-30 Mike Frysinger <[email protected]>

* configure.in: Moved to ...
* configure.ac: ... here.
* configure: Regenerated.

2013-08-29 Ondřej Bílka <[email protected]>

* stringprep.c: Fix typos.
Expand Down
2 changes: 1 addition & 1 deletion libidn/configure
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!

libc_add_on_canonical=

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion malloc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ install-bin-script += memusage
generated += memusagestat memusage
extra-objs += memusagestat.o

# The configure.in check for libgd and its headers did not use $SYSINCLUDES.
# The configure.ac check for libgd and its headers did not use $SYSINCLUDES.
# The directory specified by --with-headers usually contains only the basic
# kernel interface headers, not something like libgd. So the simplest thing
# is to presume that the standard system headers will be ok for this file.
Expand Down
2 changes: 1 addition & 1 deletion manual/install.texi
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ should definitely upgrade @code{sed}.
@end itemize

@noindent
If you change any of the @file{configure.in} files you will also need
If you change any of the @file{configure.ac} files you will also need

@itemize @bullet
@item
Expand Down
8 changes: 4 additions & 4 deletions manual/maint.texi
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ This file is a shell script fragment to be run at configuration time.
The top-level @file{configure} script uses the shell @code{.} command to
read the @file{configure} file in each system-dependent directory
chosen, in order. The @file{configure} files are often generated from
@file{configure.in} files using Autoconf.
@file{configure.ac} files using Autoconf.

A system-dependent @file{configure} script will usually add things to
the shell variables @samp{DEFS} and @samp{config_vars}; see the
Expand All @@ -329,14 +329,14 @@ shell variable @w{@samp{with_@var{package}}} (with any dashes in
just @w{@samp{--with-@var{package}}} (no argument), then it sets
@w{@samp{with_@var{package}}} to @samp{yes}.

@item configure.in
@item configure.ac

This file is an Autoconf input fragment to be processed into the file
@file{configure} in this subdirectory. @xref{Introduction,,,
autoconf.info, Autoconf: Generating Automatic Configuration Scripts},
for a description of Autoconf. You should write either @file{configure}
or @file{configure.in}, but not both. The first line of
@file{configure.in} should invoke the @code{m4} macro
or @file{configure.ac}, but not both. The first line of
@file{configure.ac} should invoke the @code{m4} macro
@samp{GLIBC_PROVIDES}. This macro does several @code{AC_PROVIDE} calls
for Autoconf macros which are used by the top-level @file{configure}
script; without this, those macros might be invoked again unnecessarily
Expand Down
9 changes: 9 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/pthread/configure.in: Moved to ...
* sysdeps/pthread/configure.ac: ... here.
* sysdeps/x86_64/configure.in: Moved to ...
* sysdeps/x86_64/configure.ac: ... here.
* sysdeps/pthread/configure: Regenerated.
* sysdeps/x86_64/configure: Likewise.

2013-10-04 Maciej W. Rozycki <[email protected]>

* tst-mutex8.c (check_type) [ENABLE_PI]: Handle ENOTSUP failure
Expand Down
2 changes: 1 addition & 1 deletion nptl/sysdeps/pthread/configure
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!

if test "x$libc_cv_gcc___thread" != xyes; then
as_fn_error $? "compiler support for __thread is required" "$LINENO" 5
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion nptl/sysdeps/x86_64/configure
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/i386.

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for .cfi_personality and .cfi_lsda pseudo-ops" >&5
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion nscd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ endif
nscd-modules += selinux
selinux-LIBS := -lselinux $(libaudit) $(libcap)

# The configure.in check for libselinux and its headers did not use
# The configure.ac check for libselinux and its headers did not use
# $SYSINCLUDES. The directory specified by --with-headers usually
# contains only the basic kernel interface headers, not something like
# libselinux. So the simplest thing is to presume that the standard
Expand Down
5 changes: 5 additions & 0 deletions ports/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2013-10-30 Mike Frysinger <[email protected]>

* README: Change references to preconfigure.in to
preconfigure.ac.

2013-01-02 Joseph Myers <[email protected]>

* README: Update copyright dates in example.
Expand Down
6 changes: 6 additions & 0 deletions ports/ChangeLog.aarch64
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/unix/sysv/linux/aarch64/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/aarch64/configure.ac: ... here.
* sysdeps/unix/sysv/linux/aarch64/configure: Regenerated.

2013-09-30 Andrew Pinski <[email protected]>

* sysdeps/unix/sysv/linux/aarch64/sysdep.h (SYSCALL_ERROR_HANDLER):
Expand Down
9 changes: 9 additions & 0 deletions ports/ChangeLog.alpha
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/alpha/configure.in: Moved to ...
* sysdeps/alpha/configure.ac: ... here.
* sysdeps/unix/sysv/linux/alpha/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/alpha/configure.ac: ... here.
* sysdeps/alpha/configure: Regenerated.
* sysdeps/unix/sysv/linux/alpha/configure: Likewise.

2013-10-12 Yuri Chornoivan <[email protected]>

* sysdeps/unix/sysv/linux/alpha/nptl/pt-vfork.S: Fix typos.
Expand Down
6 changes: 6 additions & 0 deletions ports/ChangeLog.am33
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/unix/sysv/linux/am33/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/am33/configure.ac: ... here.
* sysdeps/unix/sysv/linux/am33/configure: Regenerated.

2013-08-29 Ondřej Bílka <[email protected]>

* sysdeps/unix/sysv/linux/am33/bits/fcntl.h: Fix typos.
Expand Down
20 changes: 20 additions & 0 deletions ports/ChangeLog.arm
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/arm/configure.in: Moved to ...
* sysdeps/arm/configure.ac: ... here.
* sysdeps/arm/preconfigure.in: Moved to ...
* sysdeps/arm/preconfigure.ac: ... here. Change reference to
configure.in to configure.ac.
* sysdeps/arm/preconfigure: Regenerated.
* sysdeps/arm/armv7/configure.in: Moved to ...
* sysdeps/arm/armv7/configure.ac: ... here.
* sysdeps/unix/sysv/linux/arm/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/arm/configure.ac: ... here. Change
reference to preconfigure.in to preconfigure.ac.
* sysdeps/unix/sysv/linux/arm/configure: Regenerated.
* sysdeps/unix/sysv/linux/arm/nptl/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/arm/nptl/configure.ac: ... here.
* sysdeps/arm/configure: Regenerated.
* sysdeps/sysdeps/arm/armv7/configure: Likewise.
* sysdeps/unix/sysv/linux/arm/nptl/configure: Likewise.

2013-10-04 Will Newton <[email protected]>

* sysdeps/arm/__longjmp.S (NO_THUMB): Remove define.
Expand Down
6 changes: 6 additions & 0 deletions ports/ChangeLog.hppa
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/hppa/configure.in: Moved to ...
* sysdeps/hppa/configure.ac: ... here.
* sysdeps/hppa/configure: Regenerated.

2013-09-11 Andreas Schwab <[email protected]>

* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (__O_TMPFILE): Define.
Expand Down
9 changes: 9 additions & 0 deletions ports/ChangeLog.ia64
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/ia64/configure.in: Moved to ...
* sysdeps/ia64/configure.ac: ... here.
* sysdeps/unix/sysv/linux/ia64/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/ia64/configure.ac: ... here.
* sysdeps/ia64/configure: Regenerated.
* sysdeps/unix/sysv/linux/ia64/configure: Likewise.

2013-10-04 Alan Modra <[email protected]>

* sysdeps/ia64/fpu/printf_fphex.c: Adjust for fpnum change.
Expand Down
6 changes: 6 additions & 0 deletions ports/ChangeLog.m68k
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/unix/sysv/linux/m68k/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/m68k/configure.ac: ... here.
* sysdeps/unix/sysv/linux/m68k/configure: Regenerated.

2013-10-08 Andreas Schwab <[email protected]>

* sysdeps/m68k/start.S [SHARED]: Use PIC.
Expand Down
6 changes: 6 additions & 0 deletions ports/ChangeLog.microblaze
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/unix/sysv/linux/microblaze/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/microblaze/configure.ac: ... here.
* sysdeps/unix/sysv/linux/microblaze/configure: Regenerated.

2013-06-15 Siddhesh Poyarekar <[email protected]>

* sysdeps/unix/sysv/linux/microblaze/nptl/libpthread.abilist:
Expand Down
12 changes: 12 additions & 0 deletions ports/ChangeLog.mips
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
2013-10-30 Mike Frysinger <[email protected]>

* sysdeps/mips/configure.in: Moved to ...
* sysdeps/mips/configure.ac: ... here.
* sysdeps/unix/sysv/linux/mips/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/mips/configure.ac: ... here.
* sysdeps/unix/sysv/linux/mips/mips64/configure.in: Moved to ...
* sysdeps/unix/sysv/linux/mips/mips64/configure.ac: ... here.
* sysdeps/mips/configure: Regenerated.
* sysdeps/unix/sysv/linux/mips/configure: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/configure: Likewise.

2013-09-26 Steve Ellcey <[email protected]>

[BZ #15632]
Expand Down
Loading

0 comments on commit cb8a6db

Please sign in to comment.