This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Remove configure checks for and automatic running of autoconf
- From: Allan McRae <allan at archlinux dot org>
- To: libc-alpha at sourceware dot org
- Date: Wed, 16 Oct 2013 13:47:34 +1000
- Subject: [PATCH] Remove configure checks for and automatic running of autoconf
- Authentication-results: sourceware.org; auth=none
These checks used to be run when using --with-cvs but were left in
when that option was removed. Remove these checks as regeneration
of the configure file should be consciously performed. This also
stops the generation of autom4te.cache in the source directory
while building, allowing the relevant entry to be removed from
.gitignore.
---
.gitignore | 2 --
Makefile | 15 ---------------
configure.ac | 18 ------------------
3 files changed, 35 deletions(-)
This patch is on top of the patch remaning configure.in to configure.ac.
ChangeLog:
2013-10-16 Allan McRae <allan@archlinux.org>
* configure.ac: Remove autoconf check.
* configure: Regenerated.
* Makefile (autoconf-it): Remove.
(configure, %/configure, %/preconfigure): Remove rules.
* .gitignore: Remove autom4te*.cache
diff --git a/.gitignore b/.gitignore
index ee8b6dd..ca6d49b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,8 +34,6 @@ libc.proj
TODO.html
-autom4te*.cache
-
/linuxthreads
/linuxthreads_db
/rtkaio
diff --git a/Makefile b/Makefile
index ccba09a..c2730fc 100644
--- a/Makefile
+++ b/Makefile
@@ -29,21 +29,6 @@ include Makeconfig
.PHONY: all
all: lib others
-ifneq ($(AUTOCONF),no)
-
-define autoconf-it
-@-rm -f $@.new
-$(AUTOCONF) $(ACFLAGS) $< > $@.new
-chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new
-mv -f $@.new $@
-endef
-
-configure: configure.ac aclocal.m4; $(autoconf-it)
-%/configure: %/configure.ac aclocal.m4; $(autoconf-it)
-%/preconfigure: %/preconfigure.ac aclocal.m4; $(autoconf-it)
-
-endif # $(AUTOCONF) = no
-
# We don't want to run anything here in parallel.
.NOTPARALLEL:
diff --git a/configure.ac b/configure.ac
index 2fab40e..a381985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1004,24 +1004,6 @@ AC_CHECK_PROG_VER(AWK, gawk, --version,
AC_CHECK_TOOL(NM, nm, false)
-AC_CHECK_PROGS(AUTOCONF, autoconf, no)
-case "x$AUTOCONF" in
-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.ac > /dev/null 2>&1); then
- libc_cv_autoconf_works=yes
- else
- libc_cv_autoconf_works=no
- fi])
- test $libc_cv_autoconf_works = yes || AUTOCONF=no
- ;;
-esac
-if test "x$AUTOCONF" = xno; then
- aux_missing="$aux_missing autoconf"
-fi
-
test -n "$critic_missing" && AC_MSG_ERROR([
*** These critical programs are missing or too old:$critic_missing
*** Check the INSTALL file for required versions.])
--
1.8.4.1