From: Bruno Haible <bruno@clisp.org>
Date: Sat, 10 May 2008 12:42:52 +0000 (+0000)
Subject: Update after linebreak module was split.
X-Git-Tag: v0.18~430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da93a247cd59369f60d68d3dbecfa4d588e93916;p=thirdparty%2Fgettext.git

Update after linebreak module was split.
---

diff --git a/ChangeLog b/ChangeLog
index 0e5084c3b..0f6cfb5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-10  Bruno Haible  <bruno@clisp.org>
+
+	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Replace linebreak with
+	unilbrk/ulc-width-linebreaks.
+	(GNULIB_MODULES_LIBGETTEXTPO): Likewise. 
+
 2008-04-20  Bruno Haible  <bruno@clisp.org>
 
 	* m4/libtool.m4: Update from libtool-2.2.2, with modifications:
diff --git a/autogen.sh b/autogen.sh
index 85edb2a7e..62d946ee8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,13 +4,13 @@
 # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
 # with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.60..2.61 and automake-1.10 in the PATH.
+# This script requires autoconf-2.60..2.62 and automake-1.10 in the PATH.
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
 #     in a gnulib checkout, or
 #   - the cvs program in the PATH and an internet connection.
 
-# Copyright (C) 2003-2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ while :; do
   esac
 done
 
-if test $skip_gnulib = false; then
+if ! $skip_gnulib; then
   if test -z "$GNULIB_TOOL"; then
     # Check out gnulib in a subdirectory 'gnulib'.
     GNULIB_CVS_ROOT=':pserver:anonymous@pserver.git.sv.gnu.org:/gnulib.git'
@@ -137,7 +137,6 @@ if test $skip_gnulib = false; then
       iconv
       javacomp
       javaexec
-      linebreak
       localcharset
       locale
       localename
@@ -167,6 +166,7 @@ if test $skip_gnulib = false; then
       sys_time
       term-styled-ostream
       ucs4-utf8
+      unilbrk/ulc-width-linebreaks
       uniname/uniname
       unistd
       uniwidth/width
@@ -224,13 +224,13 @@ if test $skip_gnulib = false; then
       gettext-h
       hash
       iconv
-      linebreak
       minmax
       ostream
       progname
       relocatable-lib
       stdbool
       ucs4-utf8
+      unilbrk/ulc-width-linebreaks
       uniwidth/width
       unlocked-io
       utf8-ucs4