From 893e69ece42c7e2a52607005f782c6f4a4c9af52 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 15 Sep 2010 03:23:49 +0200 Subject: Update after gnulib changed. --- ChangeLog | 5 +++++ autogen.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8bedf04..367dcfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-09-14 Bruno Haible + + Update after gnulib changed. + * autogen.sh: Update creation of lib/unistr.in.h. + 2010-09-04 Bruno Haible Simplify use of gnulib-tool now that gnulib-tool --import works better. diff --git a/autogen.sh b/autogen.sh index bcc3451..2ac312b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -412,7 +412,8 @@ if test $skip_gnulib = false; then --with-tests --lgpl --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local \ --import $GNULIB_MODULES # Change lib/unistr.h to be usable standalone. - sed -e 's/ifdef GNULIB_[A-Za-z0-9_]*/if 1/' -e 's/defined GNULIB_[A-Za-z0-9_]*/1/g' \ + sed -e 's/if GNULIB_[A-Za-z0-9_]* || .*/if 1/g' \ + -e 's/if GNULIB_[A-Za-z0-9_]*/if 1/g' \ -e 's/HAVE_INLINE/UNISTRING_HAVE_INLINE/g' \ < lib/unistr.in.h \ > lib/unistr.in.h.tmp \ -- cgit v1.2.1