lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-20 11:21:29 +03:00
Code Activity

Add --enable-maintainer-mode configure option

Browse Source 
Autoconf is tested for and run if needed only when --enable-maintainer-mode
is used on configure.  This results in the autom4te.cache directory only
being written in the source directory during configure if automatic
autoconf usage is requested.

Fixes BZ #14120.
This commit is contained in:
Allan McRae
2013-12-16 11:25:04 +10:00
parent 73616a7427
commit 8894bad34c
3 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2013-12-16 Allan McRae <allan@archlinux.org> 2013-12-16 Allan McRae <allan@archlinux.org>
[BZ #14120]
* configure.ac: Added --enable-maintainer-mode. Check for
autoconf when enabled.
* configure: Regenerated.
* nscd/nscd.service: New file. * nscd/nscd.service: New file.
* nscd/nscd.tmpfiles: New file. * nscd/nscd.tmpfiles: New file.

14
configure vendored
View File

@@ -747,6 +747,7 @@ enable_hidden_plt
enable_bind_now enable_bind_now
enable_static_nss enable_static_nss
enable_force_install enable_force_install
enable_maintainer_mode
enable_kernel enable_kernel
enable_all_warnings enable_all_warnings
enable_multi_arch enable_multi_arch
@@ -1408,6 +1409,9 @@ Optional Features:
--enable-static-nss build static NSS modules [default=no] --enable-static-nss build static NSS modules [default=no]
--disable-force-install don't force installation of files from this package, --disable-force-install don't force installation of files from this package,
even if they are older than the installed files even if they are older than the installed files
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
--enable-kernel=VERSION compile for compatibility with kernel not older than --enable-kernel=VERSION compile for compatibility with kernel not older than
VERSION VERSION
--enable-all-warnings enable all useful warnings gcc can issue --enable-all-warnings enable all useful warnings gcc can issue
@@ -3530,6 +3534,14 @@ fi
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; maintainer=$enableval
else
maintainer=no
fi
# Check whether --enable-kernel was given. # Check whether --enable-kernel was given.
if test "${enable_kernel+set}" = set; then : if test "${enable_kernel+set}" = set; then :
enableval=$enable_kernel; minimum_kernel=$enableval enableval=$enable_kernel; minimum_kernel=$enableval
@@ -5120,6 +5132,7 @@ else
fi fi
if test "x$maintainer" = "xyes"; then
for ac_prog in autoconf for ac_prog in autoconf
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5185,6 +5198,7 @@ esac
if test "x$AUTOCONF" = xno; then if test "x$AUTOCONF" = xno; then
aux_missing="$aux_missing autoconf" aux_missing="$aux_missing autoconf"
fi fi
fi
test -n "$critic_missing" && as_fn_error $? " test -n "$critic_missing" && as_fn_error $? "
*** These critical programs are missing or too old:$critic_missing *** These critical programs are missing or too old:$critic_missing

8
configure.ac
View File

@@ -231,6 +231,12 @@ AC_ARG_ENABLE([force-install],
[force_install=yes]) [force_install=yes])
AC_SUBST(force_install) AC_SUBST(force_install)
AC_ARG_ENABLE([maintainer-mode],
AC_HELP_STRING([--enable-maintainer-mode],
[enable make rules and dependencies not useful (and sometimes confusing) to the casual installer]),
[maintainer=$enableval],
[maintainer=no])
dnl On some platforms we allow dropping compatibility with all kernel dnl On some platforms we allow dropping compatibility with all kernel
dnl versions. dnl versions.
AC_ARG_ENABLE([kernel], AC_ARG_ENABLE([kernel],
@@ -1004,6 +1010,7 @@ AC_CHECK_PROG_VER(AWK, gawk, --version,
AC_CHECK_TOOL(NM, nm, false) AC_CHECK_TOOL(NM, nm, false)
if test "x$maintainer" = "xyes"; then
AC_CHECK_PROGS(AUTOCONF, autoconf, no) AC_CHECK_PROGS(AUTOCONF, autoconf, no)
case "x$AUTOCONF" in case "x$AUTOCONF" in
xno|x|x:) AUTOCONF=no ;; xno|x|x:) AUTOCONF=no ;;
@@ -1021,6 +1028,7 @@ esac
if test "x$AUTOCONF" = xno; then if test "x$AUTOCONF" = xno; then
aux_missing="$aux_missing autoconf" aux_missing="$aux_missing autoconf"
fi fi
fi
test -n "$critic_missing" && AC_MSG_ERROR([ test -n "$critic_missing" && AC_MSG_ERROR([
*** These critical programs are missing or too old:$critic_missing *** These critical programs are missing or too old:$critic_missing