[rtems-buildsys commit] Revert to automake-1.11.3 (automake-1.11. 5 is broken).

Ralf Corsepius ralf at rtems.org
Mon Jun 25 16:05:19 UTC 2012


Module:    rtems-buildsys
Branch:    master
Commit:    ed6c1855d19af5f9fc9b1c649bd4a507c4858164
Changeset: http://git.rtems.org/rtems-buildsys/commit/?id=ed6c1855d19af5f9fc9b1c649bd4a507c4858164

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Jun 25 17:56:38 2012 +0200

Revert to automake-1.11.3 (automake-1.11.5 is broken).

---

 rtems-mock/Makefile.in  |   95 ++++++++--------------------------------------
 rtems-mock/aclocal.m4   |    6 +-
 rtems-mock/configure    |   20 +++++-----
 rtems-mock/configure.ac |    2 +-
 4 files changed, 31 insertions(+), 92 deletions(-)

diff --git a/rtems-mock/Makefile.in b/rtems-mock/Makefile.in
index 3144579..ad06b41 100644
--- a/rtems-mock/Makefile.in
+++ b/rtems-mock/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,23 +18,6 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -106,11 +89,6 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(faileddir)" \
 SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DATA = $(failed_DATA) $(mockcfg_DATA) $(nobase_mockdata_DATA) \
 	$(pkgcfg_DATA) $(pkglocalstate_DATA) $(repotools_sysconf_DATA) \
 	$(result_DATA) $(tobuild_DATA)
@@ -620,11 +598,8 @@ rtems-mock.spec: $(top_builddir)/config.status $(srcdir)/rtems-mock.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -655,11 +630,8 @@ uninstall-binSCRIPTS:
 	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 install-failedDATA: $(failed_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(faileddir)" || $(MKDIR_P) "$(DESTDIR)$(faileddir)"
 	@list='$(failed_DATA)'; test -n "$(faileddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(faileddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(faileddir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -676,11 +648,8 @@ uninstall-failedDATA:
 	dir='$(DESTDIR)$(faileddir)'; $(am__uninstall_files_from_dir)
 install-mockcfgDATA: $(mockcfg_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(mockcfgdir)" || $(MKDIR_P) "$(DESTDIR)$(mockcfgdir)"
 	@list='$(mockcfg_DATA)'; test -n "$(mockcfgdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(mockcfgdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(mockcfgdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -697,18 +666,15 @@ uninstall-mockcfgDATA:
 	dir='$(DESTDIR)$(mockcfgdir)'; $(am__uninstall_files_from_dir)
 install-nobase_mockdataDATA: $(nobase_mockdata_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(mockdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mockdatadir)"
 	@list='$(nobase_mockdata_DATA)'; test -n "$(mockdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(mockdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(mockdatadir)" || exit 1; \
-	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(mockdatadir)/$$dir'"; \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(mockdatadir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(mockdatadir)/$$dir"; }; \
 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(mockdatadir)/$$dir'"; \
 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(mockdatadir)/$$dir" || exit $$?; }; \
@@ -721,11 +687,8 @@ uninstall-nobase_mockdataDATA:
 	dir='$(DESTDIR)$(mockdatadir)'; $(am__uninstall_files_from_dir)
 install-pkgcfgDATA: $(pkgcfg_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkgcfgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgcfgdir)"
 	@list='$(pkgcfg_DATA)'; test -n "$(pkgcfgdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgcfgdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgcfgdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -742,11 +705,8 @@ uninstall-pkgcfgDATA:
 	dir='$(DESTDIR)$(pkgcfgdir)'; $(am__uninstall_files_from_dir)
 install-pkglocalstateDATA: $(pkglocalstate_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkglocalstatedir)" || $(MKDIR_P) "$(DESTDIR)$(pkglocalstatedir)"
 	@list='$(pkglocalstate_DATA)'; test -n "$(pkglocalstatedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglocalstatedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkglocalstatedir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -763,11 +723,8 @@ uninstall-pkglocalstateDATA:
 	dir='$(DESTDIR)$(pkglocalstatedir)'; $(am__uninstall_files_from_dir)
 install-repotools_sysconfDATA: $(repotools_sysconf_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(repotools_sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(repotools_sysconfdir)"
 	@list='$(repotools_sysconf_DATA)'; test -n "$(repotools_sysconfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(repotools_sysconfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(repotools_sysconfdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -784,11 +741,8 @@ uninstall-repotools_sysconfDATA:
 	dir='$(DESTDIR)$(repotools_sysconfdir)'; $(am__uninstall_files_from_dir)
 install-resultDATA: $(result_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(resultdir)" || $(MKDIR_P) "$(DESTDIR)$(resultdir)"
 	@list='$(result_DATA)'; test -n "$(resultdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(resultdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(resultdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -805,11 +759,8 @@ uninstall-resultDATA:
 	dir='$(DESTDIR)$(resultdir)'; $(am__uninstall_files_from_dir)
 install-tobuildDATA: $(tobuild_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(tobuilddir)" || $(MKDIR_P) "$(DESTDIR)$(tobuilddir)"
 	@list='$(tobuild_DATA)'; test -n "$(tobuilddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(tobuilddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(tobuilddir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -826,18 +777,15 @@ uninstall-tobuildDATA:
 	dir='$(DESTDIR)$(tobuilddir)'; $(am__uninstall_files_from_dir)
 install-nobase_makeHEADERS: $(nobase_make_HEADERS)
 	@$(NORMAL_INSTALL)
+	test -z "$(makedir)" || $(MKDIR_P) "$(DESTDIR)$(makedir)"
 	@list='$(nobase_make_HEADERS)'; test -n "$(makedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(makedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(makedir)" || exit 1; \
-	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(makedir)/$$dir'"; \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(makedir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(makedir)/$$dir"; }; \
 	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(makedir)/$$dir'"; \
 	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(makedir)/$$dir" || exit $$?; }; \
@@ -850,18 +798,15 @@ uninstall-nobase_makeHEADERS:
 	dir='$(DESTDIR)$(makedir)'; $(am__uninstall_files_from_dir)
 install-nobase_mockdataHEADERS: $(nobase_mockdata_HEADERS)
 	@$(NORMAL_INSTALL)
+	test -z "$(mockdatadir)" || $(MKDIR_P) "$(DESTDIR)$(mockdatadir)"
 	@list='$(nobase_mockdata_HEADERS)'; test -n "$(mockdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(mockdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(mockdatadir)" || exit 1; \
-	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(mockdatadir)/$$dir'"; \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(mockdatadir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(mockdatadir)/$$dir"; }; \
 	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(mockdatadir)/$$dir'"; \
 	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(mockdatadir)/$$dir" || exit $$?; }; \
@@ -874,11 +819,8 @@ uninstall-nobase_mockdataHEADERS:
 	dir='$(DESTDIR)$(mockdatadir)'; $(am__uninstall_files_from_dir)
 install-pkg_perlmockHEADERS: $(pkg_perlmock_HEADERS)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkg_perlmockdir)" || $(MKDIR_P) "$(DESTDIR)$(pkg_perlmockdir)"
 	@list='$(pkg_perlmock_HEADERS)'; test -n "$(pkg_perlmockdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkg_perlmockdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkg_perlmockdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -895,11 +837,8 @@ uninstall-pkg_perlmockHEADERS:
 	dir='$(DESTDIR)$(pkg_perlmockdir)'; $(am__uninstall_files_from_dir)
 install-pkg_perlrpmsHEADERS: $(pkg_perlrpms_HEADERS)
 	@$(NORMAL_INSTALL)
+	test -z "$(pkg_perlrpmsdir)" || $(MKDIR_P) "$(DESTDIR)$(pkg_perlrpmsdir)"
 	@list='$(pkg_perlrpms_HEADERS)'; test -n "$(pkg_perlrpmsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkg_perlrpmsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkg_perlrpmsdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff --git a/rtems-mock/aclocal.m4 b/rtems-mock/aclocal.m4
index 970af73..7ad230a 100644
--- a/rtems-mock/aclocal.m4
+++ b/rtems-mock/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.5], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.5])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/rtems-mock/configure b/rtems-mock/configure
index fc84e46..6b5597f 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.69 for rtems-mock 1.20120625.0.
+# Generated by GNU Autoconf 2.69 for rtems-mock 1.20120625.1.
 #
 # Report bugs to <ralf.corsepius at rtems.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rtems-mock'
 PACKAGE_TARNAME='rtems-mock'
-PACKAGE_VERSION='1.20120625.0'
-PACKAGE_STRING='rtems-mock 1.20120625.0'
+PACKAGE_VERSION='1.20120625.1'
+PACKAGE_STRING='rtems-mock 1.20120625.1'
 PACKAGE_BUGREPORT='ralf.corsepius at rtems.org'
 PACKAGE_URL=''
 
@@ -1213,7 +1213,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.20120625.0 to adapt to many kinds of systems.
+\`configure' configures rtems-mock 1.20120625.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1279,7 +1279,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rtems-mock 1.20120625.0:";;
+     short | recursive ) echo "Configuration of rtems-mock 1.20120625.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1357,7 +1357,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rtems-mock configure 1.20120625.0
+rtems-mock configure 1.20120625.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1374,7 +1374,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.20120625.0, which was
+It was created by rtems-mock $as_me 1.20120625.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2189,7 +2189,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rtems-mock'
- VERSION='1.20120625.0'
+ VERSION='1.20120625.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3232,7 +3232,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.20120625.0, which was
+This file was extended by rtems-mock $as_me 1.20120625.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3285,7 +3285,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.20120625.0
+rtems-mock config.status 1.20120625.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/rtems-mock/configure.ac b/rtems-mock/configure.ac
index 46c42c2..7118d05 100644
--- a/rtems-mock/configure.ac
+++ b/rtems-mock/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.68)
-AC_INIT([rtems-mock],[1.20120625.0],[ralf.corsepius at rtems.org],[rtems-mock])
+AC_INIT([rtems-mock],[1.20120625.1],[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
 




More information about the vc mailing list