diff --git a/Makefile.am b/Makefile.am index 7e6921b..4ec1099 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,8 @@ SUBDIRS = intl lib pcre po sed doc testsuite noinst_DATA = bootstrap.sh noinst_HEADERS = basicdefs.h -EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot config/texi2dvi config/help2man +EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot \ + autoboot build-aux/texi2dvi build-aux/help2man html: cd doc && make html diff --git a/bootstrap.sh b/bootstrap.sh index ebf7eab..297ea94 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,15 +23,22 @@ if test -f config.h; then :; else #define SED_FEATURE_VERSION "4.1" #define BOOTSTRAP 1 +#ifndef _GNU_SOURCE +#define _GNU_SOURCE 1 +#endif + /* Define if your compiler/headers don't support const. */ #undef const +#define __getopt_argv_const const -/* Undefine if headers have conflicting definition. */ -#define mbstate_t int +/* Define if headers have no definition. */ +/* #define mbstate_t int */ +#define HAVE_WCHAR_H 1 +#define HAVE_MBRTOWC 1 /* Toggle if you encounter errors in lib/mkstemp.c. */ -#define HAVE_UNISTD_H -#define HAVE_FCNTL_H +#define HAVE_UNISTD_H 1 +#define HAVE_FCNTL_H 1 #undef HAVE_SYS_FILE_H #undef HAVE_IO_H @@ -103,18 +110,30 @@ set -x -e rm -f lib/*.o sed/*.o sed/sed cd lib || exit 1 -${CC} -DHAVE_CONFIG_H -I.. -I. -c alloca.c +${CC} -DHAVE_CONFIG_H -I.. -I. -c acl.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c alloca.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c error.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c exitfail.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c getdelim.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c getline.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c getopt.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c getopt1.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c malloc.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c mbchar.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c memchr.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c memcmp.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c memmove.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c mkstemp.c || exit 1 -${CC} -DHAVE_CONFIG_H -I.. -I. -c strverscmp.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c obstack.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c quote.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c quotearg.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c strerror.c || exit 1 -${CC} -DHAVE_CONFIG_H -I.. -I. -c utils.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c strncasecmp.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c strnlen1.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c strverscmp.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c tempname.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c xalloc-die.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c xmalloc.c || exit 1 cd ../pcre || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -c regdebug.c || exit 1 @@ -134,5 +153,6 @@ ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c compile.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c execute.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c mbcs.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c regexp.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c utils.c || exit 1 ${CC} -o sed *.o ../lib/*.o ../pcre/*.o || exit 1 diff --git a/bootstrap.sh.in b/bootstrap.sh.in index 5061cf6..a06aa05 100755 --- a/bootstrap.sh.in +++ b/bootstrap.sh.in @@ -23,15 +23,22 @@ if test -f config.h; then :; else #define SED_FEATURE_VERSION "@SED_FEATURE_VERSION@" #define BOOTSTRAP 1 +#ifndef _GNU_SOURCE +#define _GNU_SOURCE 1 +#endif + /* Define if your compiler/headers don't support const. */ #undef const +#define __getopt_argv_const const -/* Undefine if headers have conflicting definition. */ -#define mbstate_t int +/* Define if headers have no definition. */ +/* #define mbstate_t int */ +#define HAVE_WCHAR_H 1 +#define HAVE_MBRTOWC 1 /* Toggle if you encounter errors in lib/mkstemp.c. */ -#define HAVE_UNISTD_H -#define HAVE_FCNTL_H +#define HAVE_UNISTD_H 1 +#define HAVE_FCNTL_H 1 #undef HAVE_SYS_FILE_H #undef HAVE_IO_H @@ -103,18 +110,30 @@ set -x -e rm -f lib/*.o sed/*.o sed/sed cd lib || exit 1 -${CC} -DHAVE_CONFIG_H -I.. -I. -c alloca.c +${CC} -DHAVE_CONFIG_H -I.. -I. -c acl.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c alloca.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c error.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c exitfail.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c getdelim.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c getline.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c getopt.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c getopt1.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c malloc.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c mbchar.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c memchr.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c memcmp.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c memmove.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c mkstemp.c || exit 1 -${CC} -DHAVE_CONFIG_H -I.. -I. -c strverscmp.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c obstack.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c quote.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c quotearg.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -c strerror.c || exit 1 -${CC} -DHAVE_CONFIG_H -I.. -I. -c utils.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c strncasecmp.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c strnlen1.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c strverscmp.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c tempname.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c xalloc-die.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -c xmalloc.c || exit 1 cd ../pcre || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -c regdebug.c || exit 1 @@ -134,5 +153,6 @@ ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c compile.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c execute.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c mbcs.c || exit 1 ${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c regexp.c || exit 1 +${CC} -DHAVE_CONFIG_H -I.. -I. -I../lib -I ../pcre -c utils.c || exit 1 ${CC} -o sed *.o ../lib/*.o ../pcre/*.o || exit 1 diff --git a/configure.ac b/configure.ac index 196b3ed..3ec8e4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. -AC_INIT(sed, 3.62, bonzini@gnu.org, ssed) +AC_INIT(sed, 3.63, bonzini@gnu.org, ssed) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) -AC_PREREQ(2.59) +AC_PREREQ(2.60) AM_INIT_AUTOMAKE -SED_FEATURE_VERSION=4.1 +SED_FEATURE_VERSION=4.2 AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", [Define to the version of GNU sed whose features are supported by this sed.]) AC_SUBST(SED_FEATURE_VERSION) diff --git a/po/it.po b/po/it.po index 18dd01e..9b61ba7 100644 --- a/po/it.po +++ b/po/it.po @@ -388,7 +388,7 @@ msgstr "" "file]...\n" "\n" -#: sed/sed.c:107 +#: sed/sed.c:109 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -397,7 +397,7 @@ msgstr "" " -n, --quiet, --silent\n" " sopprime la stampa automatica del pattern space\n" -#: sed/sed.c:109 +#: sed/sed.c:111 #, c-format msgid "" " -e script, --expression=script\n" @@ -406,7 +406,7 @@ msgstr "" " -e script, --expression=script\n" " aggiunge lo script ai comandi da eseguire\n" -#: sed/sed.c:111 +#: sed/sed.c:113 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -438,7 +438,7 @@ msgstr "" " apre i file in modo binario (lasciando le sequenze CR" "+LF se è immutate)\n" -#: sed/sed.c:119 +#: sed/sed.c:121 #, c-format msgid "" " -l N, --line-length=N\n" diff --git a/sed/Makefile.am b/sed/Makefile.am index 4102e90..872dd57 100644 --- a/sed/Makefile.am +++ b/sed/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = sed localedir = $(datadir)/locale sed_SOURCES = sed.c compile.c execute.c regexp.c fmt.c mbcs.c utils.c -noinst_HEADERS = sed.h +noinst_HEADERS = sed.h utils.h AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/pcre \ -I$(top_srcdir) -I$(top_builddir)/lib \