From: Bruno Haible Date: Sun, 11 Nov 2018 12:48:44 +0000 (+0100) Subject: gettextize: Remove --intl option. X-Git-Tag: v0.20~233 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaad7d8c953ae6bb050679e0d79da5505503dca7;p=thirdparty%2Fgettext.git gettextize: Remove --intl option. * gettext-tools/misc/gettextize.in (func_usage): Don't mention --intl option. Signal an error if the --intl option is specified. Simplify main code accordingly. * gettext-tools/doc/gettextize.texi: Remove --intl option description. * gettext-tools/doc/gettext.texi (Prerequisites): Remove mention of intl/ directory. (configure.ac): Suggest to use AM_GNU_GETTEXT([external]) always. Remove mention of intl/ directory. (config.guess): Suggest them always. (aclocal): Shrink the list of .m4 files. (acconfig): Remove subsection. (config.h.in): Remove mention of intl/ directory. (Makefile, src/Makefile, lib/gettext.h): Likewise. (AM_GNU_GETTEXT): First argument must be 'external'. Remove third argument. (AM_GNU_GETTEXT_INTL_SUBDIR): Remove subsection. (Language Implementors): Remove mention of intl/ directory. Mention that Solaris 11 gettext works like GNU gettext. (Maintainers for other Languages): Remove mention of intl/ directory. * gettext-tools/doc/autopoint.texi: Update explanation of name. * NEWS: Mention the change. --- diff --git a/NEWS b/NEWS index ed54883ea..079cc076f 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,10 @@ for use by msgfmt only. This option saves processing time, in particular by omitting fuzzy matching that is not useful in this situation. - The .pot file in a 'po' directory is now erased by "make maintainer-clean". + - The --intl option of the gettextize program (deprecated since 2010) is + no longer available. Instead of including the intl sources in your package, + we suggest making the libintl library an optional prerequisite of your + package. This will simplify the build system of your package. * Programming languages support: - C, C++: diff --git a/gettext-tools/doc/autopoint.texi b/gettext-tools/doc/autopoint.texi index 264bd7880..d41a2c3c2 100644 --- a/gettext-tools/doc/autopoint.texi +++ b/gettext-tools/doc/autopoint.texi @@ -65,5 +65,5 @@ package's @file{configure} script and by @code{autoheader} to create the package's @file{config.h.in} include file template. The name @samp{autopoint} is an abbreviation of @samp{auto-po-intl-m4}; -the tool copies or updates mostly files in the @file{po}, @file{intl}, -@file{m4} directories. +in earlier versions, the tool copied or updated mostly files in the @file{po}, +@file{intl}, @file{m4} directories. diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 1859db751..23187cb46 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -355,7 +355,6 @@ Files You Must Create or Alter * config.guess:: @file{config.guess}, @file{config.sub} at top level * mkinstalldirs:: @file{mkinstalldirs} at top level * aclocal:: @file{aclocal.m4} at top level -* acconfig:: @file{acconfig.h} at top level * config.h.in:: @file{config.h.in} at top level * Makefile:: @file{Makefile.in} at top level * src/Makefile:: @file{Makefile.in} in @file{src/} @@ -366,7 +365,6 @@ Autoconf macros for use in @file{configure.ac} * AM_GNU_GETTEXT:: AM_GNU_GETTEXT in @file{gettext.m4} * AM_GNU_GETTEXT_VERSION:: AM_GNU_GETTEXT_VERSION in @file{gettext.m4} * AM_GNU_GETTEXT_NEED:: AM_GNU_GETTEXT_NEED in @file{gettext.m4} -* AM_GNU_GETTEXT_INTL_SUBDIR:: AM_GNU_GETTEXT_INTL_SUBDIR in @file{intldir.m4} * AM_PO_SUBDIRS:: AM_PO_SUBDIRS in @file{po.m4} * AM_XGETTEXT_OPTION:: AM_XGETTEXT_OPTION in @file{po.m4} * AM_ICONV:: AM_ICONV in @file{iconv.m4} @@ -7667,9 +7665,8 @@ GNU @code{m4} must be fully installed before GNU Autoconf is even To further ease the task of a package maintainer the @code{automake} package was designed and implemented. GNU @code{gettext} now uses this -tool and the @file{Makefile}s in the @file{intl/} and @file{po/} -therefore know about all the goals necessary for using @code{automake} -and @file{libintl} in one project. +tool and the @file{Makefile} in the @file{po/} directory therefore +knows about all the goals necessary for using @code{automake}. Those four packages are only needed by you, as a maintainer; the installers of your own package and end users do not really need any of @@ -7762,7 +7759,6 @@ using GNU gettext functionality. * config.guess:: @file{config.guess}, @file{config.sub} at top level * mkinstalldirs:: @file{mkinstalldirs} at top level * aclocal:: @file{aclocal.m4} at top level -* acconfig:: @file{acconfig.h} at top level * config.h.in:: @file{config.h.in} at top level * Makefile:: @file{Makefile.in} at top level * src/Makefile:: @file{Makefile.in} in @file{src/} @@ -7938,71 +7934,37 @@ Here is the main @code{m4} macro for triggering internationalization support. Just add this line to @file{configure.ac}: @example -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) @end example @noindent This call is purposely simple, even if it generates a lot of configure time checking and actions. -If you have suppressed the @file{intl/} subdirectory by calling -@code{gettextize} without @samp{--intl} option, this call should read - -@example -AM_GNU_GETTEXT([external]) -@end example - @item Have output files created. The @code{AC_OUTPUT} directive, at the end of your @file{configure.ac} file, needs to be modified in two ways: @example -AC_OUTPUT([@var{existing configuration files} intl/Makefile po/Makefile.in], +AC_OUTPUT([@var{existing configuration files} po/Makefile.in], [@var{existing additional actions}]) @end example The modification to the first argument to @code{AC_OUTPUT} asks -for substitution in the @file{intl/} and @file{po/} directories. +for substitution in the @file{po/} directory. Note the @samp{.in} suffix used for @file{po/} only. This is because the distributed file is really @file{po/Makefile.in.in}. -If you have suppressed the @file{intl/} subdirectory by calling -@code{gettextize} without @samp{--intl} option, then you don't need to -add @code{intl/Makefile} to the @code{AC_OUTPUT} line. - @end enumerate -If, after doing the recommended modifications, a command like -@samp{aclocal -I m4} or @samp{autoconf} or @samp{autoreconf} fails with -a trace similar to this: - -@smallexample -configure.ac:44: warning: AC_COMPILE_IFELSE was called before AC_GNU_SOURCE -../../lib/autoconf/specific.m4:335: AC_GNU_SOURCE is expanded from... -m4/lock.m4:224: gl_LOCK is expanded from... -m4/gettext.m4:571: gt_INTL_SUBDIR_CORE is expanded from... -m4/gettext.m4:472: AM_INTL_SUBDIR is expanded from... -m4/gettext.m4:347: AM_GNU_GETTEXT is expanded from... -configure.ac:44: the top level -configure.ac:44: warning: AC_RUN_IFELSE was called before AC_GNU_SOURCE -@end smallexample - -@noindent -you need to add an explicit invocation of @samp{AC_GNU_SOURCE} in the -@file{configure.ac} file - after @samp{AC_PROG_CC} but before -@samp{AM_GNU_GETTEXT}, most likely very close to the @samp{AC_PROG_CC} -invocation. This is necessary because of ordering restrictions imposed -by GNU autoconf. - @node config.guess @subsection @file{config.guess}, @file{config.sub} at top level -If you haven't suppressed the @file{intl/} subdirectory, -you need to add the GNU @file{config.guess} and @file{config.sub} files -to your distribution. They are needed because the @file{intl/} directory -has platform dependent support for determining the locale's character -encoding and therefore needs to identify the platform. +You need to add the GNU @file{config.guess} and @file{config.sub} files +to your distribution. They are needed because the @code{AM_ICONV} macro +contains knowledge about specific platforms and therefore needs to +identify the platform. You can obtain the newest version of @file{config.guess} and @file{config.sub} from the @samp{config} project at @@ -8040,21 +8002,10 @@ automake 1.9. @cindex @file{aclocal.m4} file If you do not have an @file{aclocal.m4} file in your distribution, -the simplest is to concatenate the files @file{codeset.m4}, @file{fcntl-o.m4}, -@file{gettext.m4}, @file{glibc2.m4}, @file{glibc21.m4}, @file{iconv.m4}, -@file{intdiv0.m4}, @file{intl.m4}, @file{intldir.m4}, @file{intlmacosx.m4}, -@file{intl-thread-locale.m4}, @file{intmax.m4}, @file{inttypes_h.m4}, -@file{inttypes-pri.m4}, @file{lcmessage.m4}, @file{lib-ld.m4}, -@file{lib-link.m4}, @file{lib-prefix.m4}, @file{lock.m4}, @file{longlong.m4}, -@file{nls.m4}, @file{po.m4}, @file{printf-posix.m4}, @file{progtest.m4}, -@file{size_max.m4}, @file{stdint_h.m4}, @file{threadlib.m4}, -@file{uintmax_t.m4}, @file{visibility.m4}, @file{wchar_t.m4}, @file{wint_t.m4}, -@file{xsize.m4} -from GNU @code{gettext}'s -@file{m4/} directory into a single file. If you have suppressed the -@file{intl/} directory, only @file{gettext.m4}, @file{intlmacosx.m4}, -@file{iconv.m4}, @file{lib-ld.m4}, @file{lib-link.m4}, @file{lib-prefix.m4}, -@file{nls.m4}, @file{po.m4}, @file{progtest.m4} need to be concatenated. +the simplest is to concatenate the files @file{gettext.m4}, +@file{intlmacosx.m4}, @file{iconv.m4}, @file{lib-ld.m4}, @file{lib-link.m4}, +@file{lib-prefix.m4}, @file{nls.m4}, @file{po.m4}, @file{progtest.m4} +from GNU @code{gettext}'s @file{m4/} directory into a single file. If you are not using GNU @code{automake} 1.8 or newer, you will need to add a file @file{mkdirp.m4} from a newer automake distribution to the @@ -8097,17 +8048,6 @@ might be integrated in the standard Autoconf set, because this piece of @code{m4} code will be the same for all projects using GNU @code{gettext}. -@node acconfig -@subsection @file{acconfig.h} at top level -@cindex @file{acconfig.h} file - -Earlier GNU @code{gettext} releases required to put definitions for -@code{ENABLE_NLS}, @code{HAVE_GETTEXT} and @code{HAVE_LC_MESSAGES}, -@code{HAVE_STPCPY}, @code{PACKAGE} and @code{VERSION} into an -@file{acconfig.h} file. This is not needed any more; you can remove -them from your @file{acconfig.h} file unless your package uses them -independently from the @file{intl/} directory. - @node config.h.in @subsection @file{config.h.in} at top level @cindex @file{config.h.in} file @@ -8116,25 +8056,11 @@ The include file template that holds the C macros to be defined by @code{configure} is usually called @file{config.h.in} and may be maintained either manually or automatically. -If @code{gettextize} has created an @file{intl/} directory, this file -must be called @file{config.h.in} and must be at the top level. If, -however, you have suppressed the @file{intl/} directory by calling -@code{gettextize} without @samp{--intl} option, then you can choose the -name of this file and its location freely. - If it is maintained automatically, by use of the @samp{autoheader} program, you need to do nothing about it. This is the case in particular if you are using GNU @code{automake}. -If it is maintained manually, and if @code{gettextize} has created an -@file{intl/} directory, you should switch to using @samp{autoheader}. -The list of C macros to be added for the sake of the @file{intl/} -directory is just too long to be maintained manually; it also changes -between different versions of GNU @code{gettext}. - -If it is maintained manually, and if on the other hand you have -suppressed the @file{intl/} directory by calling @code{gettextize} -without @samp{--intl} option, then you can get away by adding the +If it is maintained manually, you can get away by adding the following lines to @file{config.h.in}: @example @@ -8165,7 +8091,7 @@ distributed. @item Wherever you process subdirectories in your @file{Makefile.in}, be sure -you also process the subdirectories @samp{intl} and @samp{po}. Special +you also process the subdirectory @samp{po}. Special rules in the @file{Makefiles} take care for the case where no internationalization is wanted. @@ -8179,19 +8105,13 @@ example, we also define @code{SUBDIRS} in @code{Makefile.in} for it to be further used in the @samp{dist:} goal. @example -SUBDIRS = doc intl lib src po +SUBDIRS = doc lib src po @end example -Note that you must arrange for @samp{make} to descend into the -@code{intl} directory before descending into other directories containing -code which make use of the @code{libintl.h} header file. For this -reason, here we mention @code{intl} before @code{lib} and @code{src}. - @item -A delicate point is the @samp{dist:} goal, as both -@file{intl/Makefile} and @file{po/Makefile} will later assume that the -proper directory has been set up from the main @file{Makefile}. Here is -an example at what the @samp{dist:} goal might look like: +A delicate point is the @samp{dist:} goal, as @file{po/Makefile} will later +assume that the proper directory has been set up from the main @file{Makefile}. +Here is an example at what the @samp{dist:} goal might look like: @example distdir = $(PACKAGE)-$(VERSION) @@ -8300,12 +8220,6 @@ translated, too. Taking care of this, the support library (say LIBS = ../lib/libsupport.a @@LIBINTL@@ @@LIBS@@ @end example -@item -You should also ensure that directory @file{intl/} will be searched for -C preprocessor include files in all circumstances. So, you have to -manage so both @samp{-I../intl} and @samp{-I$(top_srcdir)/intl} will -be given to the C compiler. - @item Your @samp{dist:} goal has to conform with others. Here is a reasonable definition for it: @@ -8369,16 +8283,6 @@ for all programs together. Remember that when you use @code{libtool} to link a program, you need to use @@LTLIBINTL@@ instead of @@LIBINTL@@ for that program. -@item -If you have an @file{intl/} directory, whose contents is created by -@code{gettextize}, then to ensure that it will be searched for -C preprocessor include files in all circumstances, add something like -this to @file{Makefile.am}: - -@example -AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl -@end example - @end enumerate @node lib/gettext.h @@ -8399,9 +8303,8 @@ in order to get some specific C compiler warnings about code quality with some older versions of GCC (older than 3.0). @item -When the package does not include the @code{intl/} subdirectory, and the -libintl.h header (with its associated libintl library, if any) is not -already installed on the system, it is preferable that the package builds +When the libintl.h header (with its associated libintl library, if any) is +not already installed on the system, it is preferable that the package builds without internationalization support, rather than to give a compilation error. @end itemize @@ -8455,7 +8358,6 @@ The primary macro is, of course, @code{AM_GNU_GETTEXT}. * AM_GNU_GETTEXT:: AM_GNU_GETTEXT in @file{gettext.m4} * AM_GNU_GETTEXT_VERSION:: AM_GNU_GETTEXT_VERSION in @file{gettext.m4} * AM_GNU_GETTEXT_NEED:: AM_GNU_GETTEXT_NEED in @file{gettext.m4} -* AM_GNU_GETTEXT_INTL_SUBDIR:: AM_GNU_GETTEXT_INTL_SUBDIR in @file{intldir.m4} * AM_PO_SUBDIRS:: AM_PO_SUBDIRS in @file{po.m4} * AM_XGETTEXT_OPTION:: AM_XGETTEXT_OPTION in @file{po.m4} * AM_ICONV:: AM_ICONV in @file{iconv.m4} @@ -8467,30 +8369,22 @@ The primary macro is, of course, @code{AM_GNU_GETTEXT}. @amindex AM_GNU_GETTEXT The @code{AM_GNU_GETTEXT} macro tests for the presence of the GNU gettext function family in either the C library or a separate @code{libintl} -library (shared or static libraries are both supported) or in the package's -@file{intl/} directory. It also invokes @code{AM_PO_SUBDIRS}, thus preparing -the @file{po/} directories of the package for building. +library (shared or static libraries are both supported). It also invokes +@code{AM_PO_SUBDIRS}, thus preparing the @file{po/} directories of the +package for building. @code{AM_GNU_GETTEXT} accepts up to three optional arguments. The general syntax is @example -AM_GNU_GETTEXT([@var{intlsymbol}], [@var{needsymbol}], [@var{intldir}]) +AM_GNU_GETTEXT([@var{intlsymbol}], [@var{needsymbol}]) @end example @c We don't document @var{intlsymbol} = @samp{use-libtool} here, because @c it is of no use for packages other than GNU gettext itself. (Such packages @c are not allowed to install the shared libintl. But if they use libtool, @c then it is in order to install shared libraries that depend on libintl.) -@var{intlsymbol} can be @samp{external} or @samp{no-libtool}. The default -(if it is not specified or empty) is @samp{no-libtool}. @var{intlsymbol} -should be @samp{external} for packages with no @file{intl/} directory. -For packages with an @file{intl/} directory, you can either use an -@var{intlsymbol} equal to @samp{no-libtool}, or you can use @samp{external} -and override by using the macro @code{AM_GNU_GETTEXT_INTL_SUBDIR} elsewhere. -The two ways to specify the existence of an @file{intl/} directory are -equivalent. At build time, a static library -@code{$(top_builddir)/intl/libintl.a} will then be created. +@var{intlsymbol} should always be @samp{external}. If @var{needsymbol} is specified and is @samp{need-ngettext}, then GNU gettext implementations (in libc or libintl) without the @code{ngettext()} @@ -8504,9 +8398,6 @@ invoke the @code{AM_GNU_GETTEXT_NEED} macro several times. The hierarchy among the various alternatives is as follows: @samp{need-formatstring-macros} implies @samp{need-ngettext}. -@var{intldir} is used to find the intl libraries. If empty, the value -@samp{$(top_builddir)/intl/} is used. - The @code{AM_GNU_GETTEXT} macro determines whether GNU gettext is available and should be used. If so, it sets the @code{USE_NLS} variable to @samp{yes}; it defines @code{ENABLE_NLS} to 1 in the autoconf @@ -8585,21 +8476,6 @@ account. The @code{AM_GNU_GETTEXT_NEED} invocations can occur before or after the @code{AM_GNU_GETTEXT} invocation; the order doesn't matter. -@node AM_GNU_GETTEXT_INTL_SUBDIR -@subsection AM_GNU_GETTEXT_INTL_SUBDIR in @file{intldir.m4} - -@amindex AM_GNU_GETTEXT_INTL_SUBDIR -The @code{AM_GNU_GETTEXT_INTL_SUBDIR} macro specifies that the -@code{AM_GNU_GETTEXT} macro, although invoked with the first argument -@samp{external}, should also prepare for building the @file{intl/} -subdirectory. - -The @code{AM_GNU_GETTEXT_INTL_SUBDIR} invocation can occur before or after -the @code{AM_GNU_GETTEXT} invocation; the order doesn't matter. - -The use of this macro requires GNU automake 1.10 or newer and -GNU autoconf 2.61 or newer. - @node AM_PO_SUBDIRS @subsection AM_PO_SUBDIRS in @file{po.m4} @@ -9021,24 +8897,17 @@ contact the GNU @code{gettext} maintainers, so they can add support for your language to @file{po-mode.el}. @end enumerate -On the implementation side, three approaches are possible, with +On the implementation side, two approaches are possible, with different effects on portability and copyright: @itemize @bullet -@item -You may integrate the GNU @code{gettext}'s @file{intl/} directory in -your package, as described in @ref{Maintainers}. This allows you to -have internationalization on all kinds of platforms. Note that when you -then distribute your package, it legally falls under the GNU General -Public License, and the GNU project will be glad about your contribution -to the Free Software pool. - @item You may link against GNU @code{gettext} functions if they are found in the C library. For example, an autoconf test for @code{gettext()} and @code{ngettext()} will detect this situation. For the moment, this test -will succeed on GNU systems and not on other platforms. No severe -copyright restrictions apply. +will succeed on GNU systems and on Solaris 11 platforms. No severe +copyright restrictions apply, except if you want to distribute statically +linked binaries. @item You may emulate or reimplement the GNU @code{gettext} functionality. @@ -9394,16 +9263,9 @@ object. @section The Maintainer's View For the maintainer, the general procedure differs from the C language -case in two ways. +case: @itemize @bullet -@item -For those languages that don't use GNU gettext, the @file{intl/} directory -is not needed and can be omitted. This means that the maintainer calls the -@code{gettextize} program without the @samp{--intl} option, and that he -invokes the @code{AM_GNU_GETTEXT} autoconf macro via -@samp{AM_GNU_GETTEXT([external])}. - @item If only a single programming language is used, the @code{XGETTEXT_OPTIONS} variable in @file{po/Makevars} (@pxref{po/Makevars}) should be adjusted to diff --git a/gettext-tools/doc/gettextize.texi b/gettext-tools/doc/gettextize.texi index 8254b114e..3a0d53ae8 100644 --- a/gettext-tools/doc/gettextize.texi +++ b/gettext-tools/doc/gettextize.texi @@ -49,15 +49,6 @@ and accepts the following options: @opindex --force@r{, @code{gettextize} option} Force replacement of files which already exist. -@item --intl -@opindex --intl@r{, @code{gettextize} option} -Install the libintl sources in a subdirectory named @file{intl/}. -This libintl will be used to provide internationalization on systems -that don't have GNU libintl installed. If this option is omitted, -the call to @code{AM_GNU_GETTEXT} in @file{configure.ac} should read: -@samp{AM_GNU_GETTEXT([external])}, and internationalization will not -be enabled on systems lacking GNU gettext. - @item --po-dir=@var{dir} @opindex --po-dir@r{, @code{gettextize} option} Specify a directory containing PO files. Such a directory contains the @@ -129,13 +120,6 @@ the auxiliary files will be overwritten. If @samp{--po-dir} has been specified, this holds for every directory specified through @samp{--po-dir}, instead of @file{po/}. -@item -Only if @samp{--intl} has been specified: -A @file{intl/} directory is created and filled with most of the files -originally in the @file{intl/} directory of the GNU @code{gettext} -distribution. Also, if option @code{--force} (@code{-f}) is given, -the @file{intl/} directory is emptied first. - @item The file @file{config.rpath} is copied into the directory containing configuration support files. It is needed by the @code{AM_GNU_GETTEXT} @@ -161,19 +145,16 @@ in each affected directory, as well as the top level @file{configure.ac} or @file{configure.in} file. It is interesting to understand that most new files for supporting -GNU @code{gettext} facilities in one package go in @file{intl/}, -@file{po/} and @file{m4/} subdirectories. One distinction between -@file{intl/} and the two other directories is that @file{intl/} is -meant to be completely identical in all packages using GNU @code{gettext}, -while the other directories will mostly contain package dependent -files. +GNU @code{gettext} facilities in one package go in @file{po/} and +@file{m4/} subdirectories. Still, these directories will mostly +contain package dependent files. The @code{gettextize} program makes backup files for all files it replaces or changes, and also write ChangeLog entries about these changes. This way, the careful maintainer can check after running @code{gettextize} whether its changes are acceptable to him, and possibly adjust them. An exception to this rule is the @file{intl/} -directory, which is added or replaced or removed as a whole. +directory, which is removed as a whole if it still existed. It is important to understand that @code{gettextize} can not do the entire job of adapting a package for using GNU @code{gettext}. The diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index c1086284e..997df0e4f 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -192,7 +192,6 @@ Options: --help print this help and exit --version print version information and exit -f, --force force writing of new files even if old exist - --intl install libintl in a subdirectory (deprecated) --po-dir=DIR specify directory with PO files --no-changelog don't update or create ChangeLog files --symlink make symbolic links instead of copying files @@ -299,7 +298,7 @@ unset CLICOLOR_FORCE GREP_OPTIONS # Warn about deprecated options. if test -n "$intldir"; then - echo "gettextize: warning: the option '--intl' is deprecated and will be removed" 1>&2 + func_fatal_error "The option '--intl' is no longer available." fi # Command-line argument processing. @@ -613,10 +612,7 @@ func_m4ChangeLog_finish () } using_m4ChangeLog=yes -if test ! -f "$srcdir/intl/Makefile.in" && test -n "$intldir"; then - added_acoutput="$added_acoutput intl/Makefile" -fi -if test -f "$srcdir/intl/Makefile.in" && test -z "$intldir"; then +if test -f "$srcdir/intl/Makefile.in"; then removed_acoutput="$removed_acoutput intl/Makefile" fi if test -d "$srcdir/intl"; then @@ -633,19 +629,7 @@ if test -d "$srcdir/intl"; then else echo "Wipe out intl/ subdirectory" fi - if test -z "$intldir"; then - removed_directory=intl - fi -else - if test -n "$intldir"; then - if $doit; then - echo "Creating intl/ subdirectory" - mkdir "$srcdir/intl" || func_fatal_error "failed to create intl/ subdirectory" - else - echo "Create intl/ subdirectory" - fi - added_directories="$added_directories intl" - fi + removed_directory=intl fi $do_changelog && func_ChangeLog_init @@ -686,44 +670,24 @@ for file in *; do esac done -# Copy files to intl/ subdirectory. -if test -n "$intldir"; then - cd intl - for file in *; do - if test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then - if test $file != plural.c; then - func_linkorcopy $file "$gettext_datadir/intl/$file" intl/$file - else - # plural.c is a generated file; it must be copied and touched. - func_copy $file intl/$file - if $doit; then - (sleep 2; touch "$srcdir/intl/$file") & - fi - fi - fi - done - cd .. -else - echo "Not copying intl/ directory." - # Tell the user what to put into configure.ac, if it is not already there. - external= - # Need to use func_trace_sed instead of $func_trace, since - # AM_GNU_GETTEXT is not a standard Autoconf trace. - xargs=`func_trace_sed AM_GNU_GETTEXT "$srcdir/$configure_in"` - save_IFS="$IFS"; IFS=: - for arg in $xargs; do - if test 'external' = "$arg"; then - external=yes - break - fi - done - IFS="$save_IFS" - if test -z "$external"; then - please="$please +# Tell the user what to put into configure.ac, if it is not already there. +external= +# Need to use func_trace_sed instead of $func_trace, since +# AM_GNU_GETTEXT is not a standard Autoconf trace. +xargs=`func_trace_sed AM_GNU_GETTEXT "$srcdir/$configure_in"` +save_IFS="$IFS"; IFS=: +for arg in $xargs; do + if test 'external' = "$arg"; then + external=yes + break + fi +done +IFS="$save_IFS" +if test -z "$external"; then + please="$please Please use AM_GNU_GETTEXT([external]) in order to cause autoconfiguration to look for an external libintl. " - fi fi # Copy files to po/ subdirectory. @@ -837,7 +801,7 @@ m4filelist=' # might give an error. (aclocal < 1.9 didn't know which macros are really # needed, it looked which macros are potentially needed.) min_automake_version=1.9 -if test -n "$intldir" || test -z "$have_automake19"; then +if test -z "$have_automake19"; then # Add intldir.m4, intl.m4 and its dependencies. m4filelist=$m4filelist' codeset.m4