diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-02-11 22:40:48 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-02-11 22:41:47 +0200 |
commit | 06bbe2bcfd87eab1217d37925ffcc6639b346809 (patch) | |
tree | 60786aab7c7fb6544bc2637ae4c57594ca73bab7 | |
parent | 52e413c6cd26f0ef8c3563d233fcd9f73f2f3829 (diff) | |
download | cpio-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.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 11 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | lib/Makefile.am | 10 |
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 @@ | |||
19 | 19 | ||
20 | ACLOCAL_AMFLAGS = -I m4 -I am | 20 | ACLOCAL_AMFLAGS = -I m4 -I am |
21 | 21 | ||
22 | AUTOMAKE_OPTIONS = gnits 1.8 dist-bzip2 std-options | ||
23 | |||
24 | SUBDIRS = doc headers gnu lib rmt src po tests | 22 | SUBDIRS = doc headers gnu lib rmt src po tests |
25 | 23 | ||
26 | AM_DISTCHECK_CONFIGURE_FLAGS = --enable-mt | 24 | AM_DISTCHECK_CONFIGURE_FLAGS = --enable-mt |
@@ -1,11 +1,11 @@ | |||
1 | GNU cpio NEWS -- history of user-visible changes. 2009-07-31 | 1 | GNU cpio NEWS -- history of user-visible changes. 2010-02-11 |
2 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software | 2 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, |
3 | Foundation, Inc. | 3 | 2010 Free Software Foundation, Inc. |
4 | See the end of file for copying conditions. | 4 | See the end of file for copying conditions. |
5 | 5 | ||
6 | Please send cpio bug reports to <bug-cpio@gnu.org>. | 6 | Please send cpio bug reports to <bug-cpio@gnu.org>. |
7 | 7 | ||
8 | Version 2.10.90 (Git) | 8 | Version 2.10.91 (Git) |
9 | 9 | ||
10 | * Fix mt build. | 10 | * Fix mt build. |
11 | * In copy-in mode, if directory attributes do not permit writing to it, | 11 | * 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. | |||
163 | ---------------------------------------------------------------------- | 163 | ---------------------------------------------------------------------- |
164 | Copyright information: | 164 | Copyright information: |
165 | 165 | ||
166 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. | 166 | Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, |
167 | 2010 Free Software Foundation, Inc. | ||
167 | 168 | ||
168 | Permission is granted to anyone to make or distribute verbatim copies | 169 | Permission is granted to anyone to make or distribute verbatim copies |
169 | of this document as received, in any medium, provided that the | 170 | 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 | |||
17 | dnl along with this program; if not, write to the Free Software Foundation, | 17 | dnl along with this program; if not, write to the Free Software Foundation, |
18 | dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | 19 | ||
20 | AC_INIT([GNU cpio], [2.10.90], [bug-cpio@gnu.org]) | 20 | AC_INIT([GNU cpio], [2.10.91], [bug-cpio@gnu.org]) |
21 | AC_CONFIG_SRCDIR(src/cpio.h) | 21 | AC_CONFIG_SRCDIR(src/cpio.h) |
22 | AC_CONFIG_AUX_DIR([build-aux]) | 22 | AC_CONFIG_AUX_DIR([build-aux]) |
23 | AM_INIT_AUTOMAKE | ||
24 | AC_CONFIG_HEADERS([config.h]) | 23 | AC_CONFIG_HEADERS([config.h]) |
24 | AC_PREREQ([2.63]) | ||
25 | AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 dist-shar std-options silent-rules]) | ||
25 | 26 | ||
26 | AC_PREREQ([2.59]) | 27 | # Enable silent rules by default: |
28 | AM_SILENT_RULES([yes]) | ||
27 | 29 | ||
28 | dnl Check for programs | 30 | dnl Check for programs |
29 | AC_PROG_CC | 31 | AC_PROG_CC |
@@ -84,6 +86,8 @@ AM_ICONV | |||
84 | AM_GNU_GETTEXT([external], [need-formatstring-macros]) | 86 | AM_GNU_GETTEXT([external], [need-formatstring-macros]) |
85 | AM_GNU_GETTEXT_VERSION(0.17) | 87 | AM_GNU_GETTEXT_VERSION(0.17) |
86 | 88 | ||
89 | LIBS="$LIBS $LIB_CLOCK_GETTIME" | ||
90 | |||
87 | # Initialize the test suite. | 91 | # Initialize the test suite. |
88 | AC_CONFIG_TESTDIR(tests) | 92 | AC_CONFIG_TESTDIR(tests) |
89 | AC_CONFIG_FILES([tests/Makefile tests/atlocal]) # FIXME: tests/preset? | 93 | 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 @@ | |||
19 | 19 | ||
20 | noinst_LIBRARIES=libpax.a | 20 | noinst_LIBRARIES=libpax.a |
21 | rmt-command.h : Makefile | 21 | rmt-command.h : Makefile |
22 | rm -f $@-t $@ | 22 | $(AM_V_GEN)rm -f $@-t $@ |
23 | echo "#ifndef DEFAULT_RMT_COMMAND" >> $@-t | 23 | $(AM_V_at)echo "#ifndef DEFAULT_RMT_COMMAND" >> $@-t |
24 | echo "# define DEFAULT_RMT_COMMAND \"$(DEFAULT_RMT_DIR)/`echo rmt | sed '$(transform)'`$(EXEEXT)\"" >> $@-t | 24 | $(AM_V_at)echo "# define DEFAULT_RMT_COMMAND \"$(DEFAULT_RMT_DIR)/`echo rmt | sed '$(transform)'`$(EXEEXT)\"" >> $@-t |
25 | echo "#endif" >> $@-t | 25 | $(AM_V_at)echo "#endif" >> $@-t |
26 | mv $@-t $@ | 26 | $(AM_V_at)mv $@-t $@ |
27 | BUILT_SOURCES = rmt-command.h | 27 | BUILT_SOURCES = rmt-command.h |
28 | CLEANFILES = rmt-command.h rmt-command.h-t | 28 | CLEANFILES = rmt-command.h rmt-command.h-t |
29 | INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu | 29 | INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu |