summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2010-02-11 20:40:48 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2010-02-11 20:41:47 (GMT)
commit06bbe2bcfd87eab1217d37925ffcc6639b346809 (patch) (side-by-side diff)
tree60786aab7c7fb6544bc2637ae4c57594ca73bab7
parent52e413c6cd26f0ef8c3563d233fcd9f73f2f3829 (diff)
downloadcpio-06bbe2bcfd87eab1217d37925ffcc6639b346809.tar.gz
cpio-06bbe2bcfd87eab1217d37925ffcc6639b346809.tar.bz2
Improve configuration suite.
* configure.ac: Raise version number to 2.10.91. Require autotools 2.63/1.11.1. Create shar archive. Enable silent rules by default. * Makefile.am (AUTOMAKE_OPTIONS): Remove. * lib/Makefile.am (rmt-command.h): Silent rule. * NEWS: Update.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am2
-rw-r--r--NEWS11
-rw-r--r--configure.ac10
-rw-r--r--lib/Makefile.am10
4 files changed, 18 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index aa7ed3e..55e7add 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,6 @@
ACLOCAL_AMFLAGS = -I m4 -I am
-AUTOMAKE_OPTIONS = gnits 1.8 dist-bzip2 std-options
-
SUBDIRS = doc headers gnu lib rmt src po tests
AM_DISTCHECK_CONFIGURE_FLAGS = --enable-mt
diff --git a/NEWS b/NEWS
index 0b3a709..3f209e0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-GNU cpio NEWS -- history of user-visible changes. 2009-07-31
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software
-Foundation, Inc.
+GNU cpio NEWS -- history of user-visible changes. 2010-02-11
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009,
+2010 Free Software Foundation, Inc.
See the end of file for copying conditions.
Please send cpio bug reports to <bug-cpio@gnu.org>.
-Version 2.10.90 (Git)
+Version 2.10.91 (Git)
* Fix mt build.
* In copy-in mode, if directory attributes do not permit writing to it,
@@ -163,7 +163,8 @@ multiple links and of multi-volume archives on floppy disks.
----------------------------------------------------------------------
Copyright information:
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009,
+2010 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/configure.ac b/configure.ac
index 665591c..273db94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,13 +17,15 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software Foundation,
dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-AC_INIT([GNU cpio], [2.10.90], [bug-cpio@gnu.org])
+AC_INIT([GNU cpio], [2.10.91], [bug-cpio@gnu.org])
AC_CONFIG_SRCDIR(src/cpio.h)
AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
+AC_PREREQ([2.63])
+AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 dist-shar std-options silent-rules])
-AC_PREREQ([2.59])
+# Enable silent rules by default:
+AM_SILENT_RULES([yes])
dnl Check for programs
AC_PROG_CC
@@ -84,6 +86,8 @@ AM_ICONV
AM_GNU_GETTEXT([external], [need-formatstring-macros])
AM_GNU_GETTEXT_VERSION(0.17)
+LIBS="$LIBS $LIB_CLOCK_GETTIME"
+
# Initialize the test suite.
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile tests/atlocal]) # FIXME: tests/preset?
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e2fc4a6..d9a42a0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,11 +19,11 @@
noinst_LIBRARIES=libpax.a
rmt-command.h : Makefile
- rm -f $@-t $@
- echo "#ifndef DEFAULT_RMT_COMMAND" >> $@-t
- echo "# define DEFAULT_RMT_COMMAND \"$(DEFAULT_RMT_DIR)/`echo rmt | sed '$(transform)'`$(EXEEXT)\"" >> $@-t
- echo "#endif" >> $@-t
- mv $@-t $@
+ $(AM_V_GEN)rm -f $@-t $@
+ $(AM_V_at)echo "#ifndef DEFAULT_RMT_COMMAND" >> $@-t
+ $(AM_V_at)echo "# define DEFAULT_RMT_COMMAND \"$(DEFAULT_RMT_DIR)/`echo rmt | sed '$(transform)'`$(EXEEXT)\"" >> $@-t
+ $(AM_V_at)echo "#endif" >> $@-t
+ $(AM_V_at)mv $@-t $@
BUILT_SOURCES = rmt-command.h
CLEANFILES = rmt-command.h rmt-command.h-t
INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu

Return to:

Send suggestions and report system problems to the System administrator.