diff options
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 56 |
1 files changed, 33 insertions, 23 deletions
@@ -4,7 +4,7 @@ # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files # with new versions of autoconf or automake. # -# This script requires autoconf-2.63 and automake-1.11 in the PATH. +# This script requires autoconf-2.63..2.69 and automake-1.11..1.12 in the PATH. # It also requires either # - the GNULIB_TOOL environment variable pointing to the gnulib-tool script # in a gnulib checkout, or @@ -12,7 +12,7 @@ # It also requires # - the gperf program. -# Copyright (C) 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 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 @@ -71,12 +71,6 @@ if test $skip_gnulib = false; then fi # Skip the gnulib-tool step if gnulib-tool was not found. if test -n "$GNULIB_TOOL"; then - if test -f m4/gnulib-cache.m4; then - mv -f m4/gnulib-cache.m4 m4/gnulib-cache.m4~ - fi - if test -f lib/Makefile.gnulib; then - mv -f lib/Makefile.gnulib lib/Makefile.gnulib~ - fi GNULIB_MODULES=' unitypes unistr/base @@ -284,10 +278,10 @@ if test $skip_gnulib = false; then uniname/base uniname/uniname unictype/base - unictype/bidicategory-all + unictype/bidiclass-all unictype/block-all unictype/category-all - unictype/combining-class + unictype/combining-class-all unictype/ctype-alnum unictype/ctype-alpha unictype/ctype-blank @@ -302,6 +296,8 @@ if test $skip_gnulib = false; then unictype/ctype-xdigit unictype/decimal-digit unictype/digit + unictype/joininggroup-all + unictype/joiningtype-all unictype/mirror unictype/numeric unictype/property-all @@ -318,6 +314,19 @@ if test $skip_gnulib = false; then uniwidth/u32-strwidth uniwidth/u32-width uniwidth/width + unigbrk/base + unigbrk/u8-grapheme-breaks + unigbrk/u8-grapheme-next + unigbrk/u8-grapheme-prev + unigbrk/u16-grapheme-breaks + unigbrk/u16-grapheme-next + unigbrk/u16-grapheme-prev + unigbrk/u32-grapheme-breaks + unigbrk/u32-grapheme-next + unigbrk/u32-grapheme-prev + unigbrk/uc-gbrk-prop + unigbrk/uc-is-grapheme-break + unigbrk/ulc-grapheme-breaks uniwbrk/base uniwbrk/u8-wordbreaks uniwbrk/u16-wordbreaks @@ -418,25 +427,26 @@ 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.h \ - > lib/unistr.h.tmp \ - && mv lib/unistr.h.tmp lib/unistr.h + < lib/unistr.in.h \ + > lib/unistr.in.h.tmp \ + && mv lib/unistr.in.h.tmp lib/unistr.in.h # Change lib/unictype.h and lib/uninorm.h for shared libraries on Woe32 systems. sed -e 's/extern const uc_general_category_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_/' \ -e 's/extern const uc_property_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_/' \ - < lib/unictype.h \ - > lib/unictype.h.tmp \ - && mv lib/unictype.h.tmp lib/unictype.h + < lib/unictype.in.h \ + > lib/unictype.in.h.tmp \ + && mv lib/unictype.in.h.tmp lib/unictype.in.h sed -e 's/extern const struct unicode_normalization_form /extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form /' \ - < lib/uninorm.h \ - > lib/uninorm.h.tmp \ - && mv lib/uninorm.h.tmp lib/uninorm.h + < lib/uninorm.in.h \ + > lib/uninorm.in.h.tmp \ + && mv lib/uninorm.in.h.tmp lib/uninorm.in.h sed -e 's/extern const casing_/extern LIBUNISTRING_DLL_VARIABLE const casing_/' \ - < lib/unicase.h \ - > lib/unicase.h.tmp \ - && mv lib/unicase.h.tmp lib/unicase.h + < lib/unicase.in.h \ + > lib/unicase.in.h.tmp \ + && mv lib/unicase.in.h.tmp lib/unicase.in.h $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess $GNULIB_TOOL --copy-file build-aux/config.sub; chmod a+x build-aux/config.sub # If we got no texinfo.tex so far, take the snapshot from gnulib. |