[rtems-buildsys commit] Add AM_MAINTAINER_MODE.
Ralf Corsepius
ralf at rtems.org
Tue May 1 06:51:07 UTC 2012
Module: rtems-buildsys
Branch: master
Commit: d3410c0d17efba5b98b7fd46422910c5da29f223
Changeset: http://git.rtems.org/rtems-buildsys/commit/?id=d3410c0d17efba5b98b7fd46422910c5da29f223
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Tue May 1 08:53:27 2012 +0200
Add AM_MAINTAINER_MODE.
Bump version
---
rtems-mock/Makefile.in | 7 ++--
rtems-mock/aclocal.m4 | 76 +++++++++++++++++++++++++++++++++++++++++++++++
rtems-mock/configure | 53 ++++++++++++++++++++++++++------
rtems-mock/configure.ac | 3 +-
4 files changed, 125 insertions(+), 14 deletions(-)
diff --git a/rtems-mock/Makefile.in b/rtems-mock/Makefile.in
index 353124d..70deb23 100644
--- a/rtems-mock/Makefile.in
+++ b/rtems-mock/Makefile.in
@@ -136,6 +136,7 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MOCK = @MOCK@
@@ -590,7 +591,7 @@ all: all-am
.SUFFIXES:
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/etc/mock/makefile.am $(srcdir)/make/makefile.am $(srcdir)/buildgroups/makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/etc/mock/makefile.am $(srcdir)/make/makefile.am $(srcdir)/buildgroups/makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -618,9 +619,9 @@ $(srcdir)/etc/mock/makefile.am $(srcdir)/make/makefile.am $(srcdir)/buildgroups/
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
rtems-mock.spec: $(top_builddir)/config.status $(srcdir)/rtems-mock.spec.in
diff --git a/rtems-mock/aclocal.m4 b/rtems-mock/aclocal.m4
index f281ef2..4c88ed9 100644
--- a/rtems-mock/aclocal.m4
+++ b/rtems-mock/aclocal.m4
@@ -114,6 +114,42 @@ AC_PREREQ([2.50])dnl
am_aux_dir=`cd $ac_aux_dir && pwd`
])
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -298,6 +334,46 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well. Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+ [enable], [m4_define([am_maintainer_other], [disable])],
+ [disable], [m4_define([am_maintainer_other], [enable])],
+ [m4_define([am_maintainer_other], [enable])
+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+ AC_ARG_ENABLE([maintainer-mode],
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST([MAINT])dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
diff --git a/rtems-mock/configure b/rtems-mock/configure
index d742fc9..4dcc5f0 100755
--- a/rtems-mock/configure
+++ b/rtems-mock/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for rtems-mock 1.20120430.2.
+# Generated by GNU Autoconf 2.68 for rtems-mock 1.20120501.0.
#
# Report bugs to <ralf.corsepius at rtems.org>.
#
@@ -559,8 +559,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rtems-mock'
PACKAGE_TARNAME='rtems-mock'
-PACKAGE_VERSION='1.20120430.2'
-PACKAGE_STRING='rtems-mock 1.20120430.2'
+PACKAGE_VERSION='1.20120501.0'
+PACKAGE_STRING='rtems-mock 1.20120501.0'
PACKAGE_BUGREPORT='ralf.corsepius at rtems.org'
PACKAGE_URL=''
@@ -578,6 +578,9 @@ CREATEREPO
MOCK
PERL
LN_S
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
am__untar
am__tar
AMTAR
@@ -642,6 +645,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_maintainer_mode
enable_repogroup
enable_ftphome
enable_cachedir
@@ -1191,7 +1195,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rtems-mock 1.20120430.2 to adapt to many kinds of systems.
+\`configure' configures rtems-mock 1.20120501.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1257,7 +1261,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rtems-mock 1.20120430.2:";;
+ short | recursive ) echo "Configuration of rtems-mock 1.20120501.0:";;
esac
cat <<\_ACEOF
@@ -1265,6 +1269,8 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
--enable-repogroup=<group>
group to use for files in repo
--enable-ftphome base directory for ftp
@@ -1333,7 +1339,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rtems-mock configure 1.20120430.2
+rtems-mock configure 1.20120501.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1350,7 +1356,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rtems-mock $as_me 1.20120430.2, which was
+It was created by rtems-mock $as_me 1.20120501.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2165,7 +2171,7 @@ fi
# Define the identity of the package.
PACKAGE='rtems-mock'
- VERSION='1.20120430.2'
+ VERSION='1.20120501.0'
cat >>confdefs.h <<_ACEOF
@@ -2287,6 +2293,29 @@ $as_echo "$am_cv_prog_tar_pax" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
# Checks for programs.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
@@ -2784,6 +2813,10 @@ LTLIBOBJS=$ac_ltlibobjs
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -3193,7 +3226,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rtems-mock $as_me 1.20120430.2, which was
+This file was extended by rtems-mock $as_me 1.20120501.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3246,7 +3279,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rtems-mock config.status 1.20120430.2
+rtems-mock config.status 1.20120501.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/rtems-mock/configure.ac b/rtems-mock/configure.ac
index 5fe25dc..6e08aa9 100644
--- a/rtems-mock/configure.ac
+++ b/rtems-mock/configure.ac
@@ -2,8 +2,9 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.68)
-AC_INIT([rtems-mock],[1.20120430.2],[ralf.corsepius at rtems.org],[rtems-mock])
+AC_INIT([rtems-mock],[1.20120501.0],[ralf.corsepius at rtems.org],[rtems-mock])
AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2 dist-xz tar-pax 1.11.3 foreign])
+AM_MAINTAINER_MODE
# Checks for programs.
More information about the vc
mailing list