From 3f650a93eb0a88b934f4c9aab78be44385ab58cb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 15 Dec 2006 12:36:56 +0000 Subject: moopp requires GNU sed. --- gnulib-local/ChangeLog | 17 +++++++++++++++++ gnulib-local/build-aux/moopp | 29 +++++++++++++++++++++++------ gnulib-local/modules/fd-ostream | 5 +++-- gnulib-local/modules/file-ostream | 5 +++-- gnulib-local/modules/html-ostream | 5 +++-- gnulib-local/modules/html-styled-ostream | 5 +++-- gnulib-local/modules/iconv-ostream | 5 +++-- gnulib-local/modules/memory-ostream | 5 +++-- gnulib-local/modules/ostream | 5 +++-- gnulib-local/modules/styled-ostream | 5 +++-- gnulib-local/modules/term-ostream | 5 +++-- gnulib-local/modules/term-styled-ostream | 5 +++-- 12 files changed, 70 insertions(+), 26 deletions(-) (limited to 'gnulib-local') diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 7ddc864..cddc34a 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,5 +1,22 @@ 2006-12-13 Bruno Haible + * build-aux/moopp: Add check for GNU sed. Generate the 4 files in the + source directory, not in the current directory. + * modules/ostream (Makefile.am): Test for the .h file in the source + directory, not in the current directory. Augment MAINTAINERCLEANFILES + and EXTRA_DIST, not CLEANFILES. + * modules/fd-ostream (Makefile.am): Likewise. + * modules/file-ostream (Makefile.am): Likewise. + * modules/html-ostream (Makefile.am): Likewise. + * modules/iconv-ostream (Makefile.am): Likewise. + * modules/memory-ostream (Makefile.am): Likewise. + * modules/term-ostream (Makefile.am): Likewise. + * modules/styled-ostream (Makefile.am): Likewise. + * modules/html-styled-ostream (Makefile.am): Likewise. + * modules/term-styled-ostream (Makefile.am): Likewise. + +2006-12-13 Bruno Haible + Avoid crash on NetBSD. * lib/term-ostream.oo.c (term_ostream_create): Pass a non-NULL area pointer to tgetstr. diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp index d744f8b..151f90e 100755 --- a/gnulib-local/build-aux/moopp +++ b/gnulib-local/build-aux/moopp @@ -128,6 +128,14 @@ sed_remove_comments_ERE=" :e }" +# Check that 'sed' supports the kind of regular expressions used in +# sed_remove_comments. The use of \| meaning alternation of basic regular +# expressions is a GNU extension. +sed_test='s,^\(\(a\|X\)*\)//.*,\1,' +sed_result=`echo 'aaa//bcd' | sed -e "$sed_test"` +test "$sed_result" = 'aaa' \ + || func_fatal_error "The 'sed' program is not GNU sed. Try installing GNU sed." + # func_check_impl_syntax file # Check the syntax of the source implementation file. # Output: @@ -633,6 +641,13 @@ func_emit_source_c () } > "$newfile" } +# Generate the files in the source directory, not in the current directory. +# This is needed because they need to be distributed, since not all platforms +# have GNU 'sed' preinstalled. + +sed_butbase='s,[^/]*$,,' +destdir=`echo "$source_impl_file" | sed -e "$sed_butbase"` + # Generate the source.h file first. The Makefile.am snippets rely on the # fact that the other generated files have the same or a newer timestamp. # @@ -640,16 +655,18 @@ func_emit_source_c () # about the other generated files; they assume that when the source.c file # is finished, this command is complete. -new_source_header_file=`echo "$source_header_file_base" | sed -e 's,\.oo\.h$,.h,'` +new_source_header_file="${destdir}"`echo "$source_header_file_base" | sed -e 's,\.oo\.h$,.h,'` func_start_creation "$new_source_header_file" func_emit_source_h "$new_source_header_file" || func_fatal_error "failed" -func_start_creation "${main_classname}.priv.h" -func_emit_priv_h "${main_classname}.priv.h" || func_fatal_error "failed" +new_priv_header_file="${destdir}${main_classname}.priv.h" +func_start_creation "$new_priv_header_file" +func_emit_priv_h "$new_priv_header_file" || func_fatal_error "failed" -func_start_creation "${main_classname}.vt.h" -func_emit_vt_h "${main_classname}.vt.h" || func_fatal_error "failed" +new_vt_header_file="${destdir}${main_classname}.vt.h" +func_start_creation "$new_vt_header_file" +func_emit_vt_h "$new_vt_header_file" || func_fatal_error "failed" -new_source_impl_file=`echo "$source_impl_file_base" | sed -e 's,\.oo\.c$,.c,'` +new_source_impl_file="${destdir}"`echo "$source_impl_file_base" | sed -e 's,\.oo\.c$,.c,'` func_start_creation "$new_source_impl_file" func_emit_source_c "$new_source_impl_file" || func_fatal_error "failed" diff --git a/gnulib-local/modules/fd-ostream b/gnulib-local/modules/fd-ostream index 2c1325e..7553900 100644 --- a/gnulib-local/modules/fd-ostream +++ b/gnulib-local/modules/fd-ostream @@ -30,11 +30,12 @@ fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h : fd-ostream.h result=$$?; rm -rf fd-ostream.lock; exit $$result; \ else \ while test -d fd-ostream.lock; do sleep 1; done; \ - test -f fd-ostream.h; \ + test -f $(srcdir)/fd-ostream.h; \ fi; \ } BUILT_SOURCES += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h -CLEANFILES += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h +MAINTAINERCLEANFILES += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h +EXTRA_DIST += fd-ostream.h fd-ostream.c fd_ostream.priv.h fd_ostream.vt.h Include: "fd-ostream.h" diff --git a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream index a7627dd..25dd964 100644 --- a/gnulib-local/modules/file-ostream +++ b/gnulib-local/modules/file-ostream @@ -26,11 +26,12 @@ file-ostream.c file_ostream.priv.h file_ostream.vt.h : file-ostream.h result=$$?; rm -rf file-ostream.lock; exit $$result; \ else \ while test -d file-ostream.lock; do sleep 1; done; \ - test -f file-ostream.h; \ + test -f $(srcdir)/file-ostream.h; \ fi; \ } BUILT_SOURCES += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h -CLEANFILES += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h +MAINTAINERCLEANFILES += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h +EXTRA_DIST += file-ostream.h file-ostream.c file_ostream.priv.h file_ostream.vt.h Include: "file-ostream.h" diff --git a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream index e1c588c..9ece644 100644 --- a/gnulib-local/modules/html-ostream +++ b/gnulib-local/modules/html-ostream @@ -29,11 +29,12 @@ html-ostream.c html_ostream.priv.h html_ostream.vt.h : html-ostream.h result=$$?; rm -rf html-ostream.lock; exit $$result; \ else \ while test -d html-ostream.lock; do sleep 1; done; \ - test -f html-ostream.h; \ + test -f $(srcdir)/html-ostream.h; \ fi; \ } BUILT_SOURCES += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h -CLEANFILES += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h +MAINTAINERCLEANFILES += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h +EXTRA_DIST += html-ostream.h html-ostream.c html_ostream.priv.h html_ostream.vt.h Include: "html-ostream.h" diff --git a/gnulib-local/modules/html-styled-ostream b/gnulib-local/modules/html-styled-ostream index 3771442..b889a47 100644 --- a/gnulib-local/modules/html-styled-ostream +++ b/gnulib-local/modules/html-styled-ostream @@ -33,11 +33,12 @@ html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h : html result=$$?; rm -rf html-styled-ostream.lock; exit $$result; \ else \ while test -d html-styled-ostream.lock; do sleep 1; done; \ - test -f html-styled-ostream.h; \ + test -f $(srcdir)/html-styled-ostream.h; \ fi; \ } BUILT_SOURCES += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h -CLEANFILES += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h +MAINTAINERCLEANFILES += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h +EXTRA_DIST += html-styled-ostream.h html-styled-ostream.c html_styled_ostream.priv.h html_styled_ostream.vt.h Include: "html-styled-ostream.h" diff --git a/gnulib-local/modules/iconv-ostream b/gnulib-local/modules/iconv-ostream index 311320b..887b053 100644 --- a/gnulib-local/modules/iconv-ostream +++ b/gnulib-local/modules/iconv-ostream @@ -31,11 +31,12 @@ iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h : iconv-ostream.h result=$$?; rm -rf iconv-ostream.lock; exit $$result; \ else \ while test -d iconv-ostream.lock; do sleep 1; done; \ - test -f iconv-ostream.h; \ + test -f $(srcdir)/iconv-ostream.h; \ fi; \ } BUILT_SOURCES += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h -CLEANFILES += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h +MAINTAINERCLEANFILES += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h +EXTRA_DIST += iconv-ostream.h iconv-ostream.c iconv_ostream.priv.h iconv_ostream.vt.h Include: "iconv-ostream.h" diff --git a/gnulib-local/modules/memory-ostream b/gnulib-local/modules/memory-ostream index cfa98e1..171831f 100644 --- a/gnulib-local/modules/memory-ostream +++ b/gnulib-local/modules/memory-ostream @@ -30,11 +30,12 @@ memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h : memory-ostream.h result=$$?; rm -rf memory-ostream.lock; exit $$result; \ else \ while test -d memory-ostream.lock; do sleep 1; done; \ - test -f memory-ostream.h; \ + test -f $(srcdir)/memory-ostream.h; \ fi; \ } BUILT_SOURCES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h -CLEANFILES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h +MAINTAINERCLEANFILES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h +EXTRA_DIST += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h Include: "memory-ostream.h" diff --git a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream index 06611b7..6792ef0 100644 --- a/gnulib-local/modules/ostream +++ b/gnulib-local/modules/ostream @@ -25,11 +25,12 @@ ostream.c ostream.priv.h ostream.vt.h : ostream.h result=$$?; rm -rf ostream.lock; exit $$result; \ else \ while test -d ostream.lock; do sleep 1; done; \ - test -f ostream.h; \ + test -f $(srcdir)/ostream.h; \ fi; \ } BUILT_SOURCES += ostream.h ostream.c ostream.priv.h ostream.vt.h -CLEANFILES += ostream.h ostream.c ostream.priv.h ostream.vt.h +MAINTAINERCLEANFILES += ostream.h ostream.c ostream.priv.h ostream.vt.h +EXTRA_DIST += ostream.h ostream.c ostream.priv.h ostream.vt.h Include: "ostream.h" diff --git a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream index 5cfcb49..b4116d6 100644 --- a/gnulib-local/modules/styled-ostream +++ b/gnulib-local/modules/styled-ostream @@ -25,11 +25,12 @@ styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h : styled-ostream.h result=$$?; rm -rf styled-ostream.lock; exit $$result; \ else \ while test -d styled-ostream.lock; do sleep 1; done; \ - test -f styled-ostream.h; \ + test -f $(srcdir)/styled-ostream.h; \ fi; \ } BUILT_SOURCES += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h -CLEANFILES += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h +MAINTAINERCLEANFILES += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h +EXTRA_DIST += styled-ostream.h styled-ostream.c styled_ostream.priv.h styled_ostream.vt.h Include: "styled-ostream.h" diff --git a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream index 4b49174..fac7556 100644 --- a/gnulib-local/modules/term-ostream +++ b/gnulib-local/modules/term-ostream @@ -36,11 +36,12 @@ term-ostream.c term_ostream.priv.h term_ostream.vt.h : term-ostream.h result=$$?; rm -rf term-ostream.lock; exit $$result; \ else \ while test -d term-ostream.lock; do sleep 1; done; \ - test -f term-ostream.h; \ + test -f $(srcdir)/term-ostream.h; \ fi; \ } BUILT_SOURCES += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h -CLEANFILES += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h +MAINTAINERCLEANFILES += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h +EXTRA_DIST += term-ostream.h term-ostream.c term_ostream.priv.h term_ostream.vt.h Include: "term-ostream.h" diff --git a/gnulib-local/modules/term-styled-ostream b/gnulib-local/modules/term-styled-ostream index 9c980ff..7a77f17 100644 --- a/gnulib-local/modules/term-styled-ostream +++ b/gnulib-local/modules/term-styled-ostream @@ -30,11 +30,12 @@ term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h : term result=$$?; rm -rf term-styled-ostream.lock; exit $$result; \ else \ while test -d term-styled-ostream.lock; do sleep 1; done; \ - test -f term-styled-ostream.h; \ + test -f $(srcdir)/term-styled-ostream.h; \ fi; \ } BUILT_SOURCES += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h -CLEANFILES += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h +MAINTAINERCLEANFILES += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h +EXTRA_DIST += term-styled-ostream.h term-styled-ostream.c term_styled_ostream.priv.h term_styled_ostream.vt.h Include: "term-styled-ostream.h" -- cgit v1.1