aclocal.m4: (AM_WITH_NLS): Don't look at ALL_LINGUAS.
* aclocal.m4: (AM_WITH_NLS): Don't look at ALL_LINGUAS. (AM_GNU_GETTEXT): Set CATALOGS to a list of .gmo files corresponding to the complete set of .po and .gmo files in the source directory's po subdir, modified by LINGUAS. Don't look at ALL_LINGUAS. * configure.in: Don't set ALL_LINGUAS. * configure: Regenerate. * Makefile.in (.po.gmo): Don't move into source directory. (.po.pox): Clarify comments. (install-po): Look for .gmo files in both srcdir and objdir; don't fail if a file is totally missing. (distclean): rmdir ada subdirectory too. From-SVN: r46800
This commit is contained in:
parent
f3afc192ae
commit
9f6682b722
@ -1,3 +1,19 @@
|
||||
2001-11-05 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* aclocal.m4: (AM_WITH_NLS): Don't look at ALL_LINGUAS.
|
||||
(AM_GNU_GETTEXT): Set CATALOGS to a list of .gmo files
|
||||
corresponding to the complete set of .po and .gmo files in
|
||||
the source directory's po subdir, modified by LINGUAS. Don't
|
||||
look at ALL_LINGUAS.
|
||||
* configure.in: Don't set ALL_LINGUAS.
|
||||
* configure: Regenerate.
|
||||
|
||||
* Makefile.in (.po.gmo): Don't move into source directory.
|
||||
(.po.pox): Clarify comments.
|
||||
(install-po): Look for .gmo files in both srcdir and objdir;
|
||||
don't fail if a file is totally missing.
|
||||
(distclean): rmdir ada subdirectory too.
|
||||
|
||||
2001-11-05 Geoffrey Keating <geoffk@redhat.com>
|
||||
|
||||
* config/rs6000/rs6000.c (rs6000_select_section): Handle
|
||||
@ -63,11 +79,11 @@ Mon Nov 5 16:15:25 CET 2001 Jan Hubicka <jh@suse.cz>
|
||||
* m68k/apollo68.h (ASM_RETURN_CASE_JUMP): Add missing semi-colon.
|
||||
* m88k/dgux.h (SELECT_RTX_SECTION): Add missing argument in call
|
||||
to symbolic_operand.
|
||||
|
||||
|
||||
* config.gcc (m680[02]0-*-*): Rename case from m68000-*-*.
|
||||
(i960-*-*): Set tmake_file.
|
||||
(sparc86x-*-elf*): Fix typo in header name.
|
||||
|
||||
|
||||
* sched-rgn.c (schedule_insns): Delete unused variable.
|
||||
|
||||
2001-11-04 Neil Booth <neil@cat.daikokuya.demon.co.uk>
|
||||
@ -237,8 +253,8 @@ Sun Nov 4 11:53:31 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
|
||||
|
||||
2001-11-03 Aldy Hernandez <aldyh@redhat.com>
|
||||
|
||||
* machmode.def: Add documentation for the seventh argument in
|
||||
vector modes.
|
||||
* machmode.def: Add documentation for the seventh argument in
|
||||
vector modes.
|
||||
|
||||
2001-11-04 Hans-Peter Nilsson <hp@bitrange.com>
|
||||
|
||||
@ -348,10 +364,10 @@ Sat Nov 3 10:37:56 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
|
||||
|
||||
2001-11-02 Aldy Hernandez <aldyh@redhat.com>
|
||||
|
||||
* expmed.c (store_bit_field): Use simplify_gen_subreg to make
|
||||
SUBREG so we avoid SUBREGing memory.
|
||||
* expmed.c (store_bit_field): Use simplify_gen_subreg to make
|
||||
SUBREG so we avoid SUBREGing memory.
|
||||
|
||||
* expmed.c (store_bit_field): Same.
|
||||
* expmed.c (store_bit_field): Same.
|
||||
|
||||
2001-11-02 DJ Delorie <dj@redhat.com>
|
||||
|
||||
@ -363,7 +379,7 @@ Sat Nov 3 10:37:56 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
|
||||
* builtins.c (apply_args_size): Handle vector arguments.
|
||||
(apply_result_size): Same.
|
||||
|
||||
* machmode.def: Set WIDER mode field for all vector entries.
|
||||
* machmode.def: Set WIDER mode field for all vector entries.
|
||||
|
||||
2001-11-02 Graham Stott <grahams@redhat.com>
|
||||
|
||||
@ -371,10 +387,10 @@ Sat Nov 3 10:37:56 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
|
||||
|
||||
2001-11-01 Eric Christopher <echristo@redhat.com>
|
||||
|
||||
* config.gcc: Revert part of earlier patch.
|
||||
* config/mips/linux.h: Ditto.
|
||||
* config.gcc: Revert part of earlier patch.
|
||||
* config/mips/linux.h: Ditto.
|
||||
* df.c: Include tm_p.h to avoid warnings.
|
||||
* config/mips/mips.h (ABI_GAS_ASM_SPEC): Add defaults. Adjust
|
||||
* config/mips/mips.h (ABI_GAS_ASM_SPEC): Add defaults. Adjust
|
||||
#if/#endif.
|
||||
* config/mips/mips.c: Define mips_abi regardless.
|
||||
(mips_output_function_prologues): Add long casts for .frame
|
||||
|
@ -2449,7 +2449,7 @@ distclean: clean $(INTL_DISTCLEAN) lang.distclean
|
||||
-rm -f mklibgcc libgcc.map gccbug .gdbinit configargs.h
|
||||
-rm -f gcov.pod
|
||||
-rm -f fixinc/Makefile
|
||||
-rmdir cp f java objc fixinc intl po 2>/dev/null
|
||||
-rmdir ada cp f java objc fixinc intl po 2>/dev/null
|
||||
|
||||
# Delete anything likely to be found in the source directory
|
||||
# that shouldn't be in the distribution.
|
||||
@ -3363,29 +3363,35 @@ build-po: $(CATALOGS)
|
||||
# by people who are interested in updating .po files.
|
||||
update-po: $(CATALOGS:.gmo=.pox)
|
||||
|
||||
# Update files in $(srcdir) atomically.
|
||||
# N.B. We do not attempt to copy these into $(srcdir). The snapshot
|
||||
# script does that.
|
||||
.po.gmo:
|
||||
test -d po || mkdir po
|
||||
$(GMSGFMT) --statistics $< -o $@
|
||||
$(SHELL) $(srcdir)/move-if-change $@ $(srcdir)/$@
|
||||
|
||||
# This rule does _not_ copy into $(srcdir). User must do this
|
||||
# by hand. (User is a translation maintainer and is expected to
|
||||
# go through the new .po by hand anyway.)
|
||||
# The new .po has to be gone over by hand, so we deposit it into
|
||||
# build/po with a different extension.
|
||||
.po.pox:
|
||||
test -d po || mkdir po
|
||||
$(MSGMERGE) $< $(srcdir)/po/$(PACKAGE).pot -o $@
|
||||
|
||||
# This rule has to look for .gmo modules in both srcdir and
|
||||
# the cwd, and has to check that we actually have a catalog
|
||||
# for each language, in case they weren't built or included
|
||||
# with the distribution.
|
||||
install-po:
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
|
||||
for cat in $(CATALOGS); do \
|
||||
cat=`basename $$cat`; \
|
||||
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
|
||||
lang=`basename $$cat | sed 's/\.gmo$$//'`; \
|
||||
if [ -f $$cat ]; then :; \
|
||||
elif [ -f $(srcdir)/$$cat ]; then cat=$(srcdir)/$$cat; \
|
||||
else continue; \
|
||||
fi; \
|
||||
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
||||
echo $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir || exit 1; \
|
||||
echo $(INSTALL_DATA) $(srcdir)/po/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
$(INSTALL_DATA) $(srcdir)/po/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
||||
done
|
||||
|
||||
# Rule for regenerating the message template (gcc.pot).
|
||||
|
77
gcc/aclocal.m4
vendored
77
gcc/aclocal.m4
vendored
@ -1593,24 +1593,16 @@ changequote([,])dnl
|
||||
INTLBISON=:
|
||||
fi
|
||||
|
||||
dnl These rules are solely for the distribution goal. While doing this
|
||||
dnl we only have to keep exactly one list of the available catalogs
|
||||
dnl in configure.in.
|
||||
for lang in $ALL_LINGUAS; do
|
||||
GMOFILES="$GMOFILES $lang.gmo"
|
||||
POFILES="$POFILES $lang.po"
|
||||
done
|
||||
dnl GCC LOCAL: GMOFILES/POFILES removed as unnecessary.
|
||||
|
||||
dnl Make all variables we use known to autoconf.
|
||||
AC_SUBST(BUILD_INCLUDED_LIBINTL)
|
||||
AC_SUBST(USE_INCLUDED_LIBINTL)
|
||||
AC_SUBST(CATALOGS)
|
||||
AC_SUBST(CATOBJEXT)
|
||||
AC_SUBST(GMOFILES)
|
||||
AC_SUBST(INTLLIBS)
|
||||
AC_SUBST(INTLDEPS)
|
||||
AC_SUBST(INTLOBJS)
|
||||
AC_SUBST(POFILES)
|
||||
AC_SUBST(POSUB)
|
||||
dnl GCC LOCAL: Make USE_INCLUDED_LIBINTL visible to C code.
|
||||
if test $USE_INCLUDED_LIBINTL = yes; then
|
||||
@ -1664,37 +1656,42 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
|
||||
AM_LC_MESSAGES
|
||||
AM_WITH_NLS([$1],[$2],[$3])
|
||||
|
||||
if test "x$CATOBJEXT" != "x"; then
|
||||
if test "x$ALL_LINGUAS" = "x"; then
|
||||
LINGUAS=
|
||||
else
|
||||
AC_MSG_CHECKING(for catalogs to be installed)
|
||||
NEW_LINGUAS=
|
||||
for presentlang in $ALL_LINGUAS; do
|
||||
useit=no
|
||||
for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
|
||||
# Use the presentlang catalog if desiredlang is
|
||||
# a. equal to presentlang, or
|
||||
# b. a variant of presentlang (because in this case,
|
||||
# presentlang can be used as a fallback for messages
|
||||
# which are not translated in the desiredlang catalog).
|
||||
case "$desiredlang" in
|
||||
"$presentlang"*) useit=yes;;
|
||||
esac
|
||||
done
|
||||
if test $useit = yes; then
|
||||
NEW_LINGUAS="$NEW_LINGUAS $presentlang"
|
||||
fi
|
||||
done
|
||||
LINGUAS=$NEW_LINGUAS
|
||||
AC_MSG_RESULT($LINGUAS)
|
||||
fi
|
||||
|
||||
dnl Construct list of names of catalog files to be constructed.
|
||||
dnl GCC LOCAL: Tweak for non-recursive po directory build.
|
||||
if test -n "$LINGUAS"; then
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS po/$lang$CATOBJEXT"; done
|
||||
fi
|
||||
dnl GCC LOCAL: The LINGUAS/ALL_LINGUAS/CATALOGS mess that was here
|
||||
dnl has been torn out and replaced with this more sensible scheme.
|
||||
if test "x$CATOBJEXT" != x; then
|
||||
AC_MSG_CHECKING(for catalogs to be installed)
|
||||
# Look for .po and .gmo files in the source directory.
|
||||
CATALOGS=
|
||||
XLINGUAS=
|
||||
for cat in $srcdir/po/*$CATOBJEXT $srcdir/po/*.po; do
|
||||
# If there aren't any .gmo files the shell will give us the
|
||||
# literal string "../path/to/srcdir/po/*.gmo" which has to be
|
||||
# weeded out.
|
||||
case "$cat" in *\**)
|
||||
continue;;
|
||||
esac
|
||||
# The quadruple backslash is collapsed to a double backslash
|
||||
# by the backticks, then collapsed again by the double quotes,
|
||||
# leaving us with one backslash in the sed expression (right
|
||||
# before the dot that mustn't act as a wildcard). The dot to
|
||||
# be escaped in the second expression is hiding inside CATOBJEXT.
|
||||
cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!$CATOBJEXT!"`
|
||||
lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\$CATOBJEXT!!"`
|
||||
# The user is allowed to set LINGUAS to a list of languages to
|
||||
# install catalogs for. If it's empty that means "all of them."
|
||||
if test "x$LINGUAS" = x; then
|
||||
CATALOGS="$CATALOGS $cat"
|
||||
XLINGUAS="$XLINGUAS $lang"
|
||||
else
|
||||
case "$LINGUAS" in *$lang*)
|
||||
CATALOGS="$CATALOGS $cat"
|
||||
XLINGUAS="$XLINGUAS $lang"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
LINGUAS="$XLINGUAS"
|
||||
AC_MSG_RESULT($LINGUAS)
|
||||
fi
|
||||
|
||||
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
||||
|
265
gcc/configure
vendored
265
gcc/configure
vendored
@ -5269,8 +5269,6 @@ EOF
|
||||
|
||||
|
||||
|
||||
ALL_LINGUAS="sv"
|
||||
|
||||
# Enable NLS support by default
|
||||
# Check whether --enable-nls or --disable-nls was given.
|
||||
if test "${enable_nls+set}" = set; then
|
||||
@ -5292,14 +5290,14 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for library containing strerror""... $ac_c" 1>&6
|
||||
echo "configure:5296: checking for library containing strerror" >&5
|
||||
echo "configure:5294: checking for library containing strerror" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_search_strerror'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_func_search_save_LIBS="$LIBS"
|
||||
ac_cv_search_strerror="no"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5303 "configure"
|
||||
#line 5301 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -5310,7 +5308,7 @@ int main() {
|
||||
strerror()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_strerror="none required"
|
||||
else
|
||||
@ -5321,7 +5319,7 @@ rm -f conftest*
|
||||
test "$ac_cv_search_strerror" = "no" && for i in cposix; do
|
||||
LIBS="-l$i $ac_func_search_save_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5325 "configure"
|
||||
#line 5323 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -5332,7 +5330,7 @@ int main() {
|
||||
strerror()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_strerror="-l$i"
|
||||
break
|
||||
@ -5355,12 +5353,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for working const""... $ac_c" 1>&6
|
||||
echo "configure:5359: checking for working const" >&5
|
||||
echo "configure:5357: checking for working const" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5364 "configure"
|
||||
#line 5362 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
@ -5409,7 +5407,7 @@ ccp = (char const *const *) p;
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:5411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_const=yes
|
||||
else
|
||||
@ -5430,12 +5428,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for off_t""... $ac_c" 1>&6
|
||||
echo "configure:5434: checking for off_t" >&5
|
||||
echo "configure:5432: checking for off_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5439 "configure"
|
||||
#line 5437 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
@ -5463,12 +5461,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for size_t""... $ac_c" 1>&6
|
||||
echo "configure:5467: checking for size_t" >&5
|
||||
echo "configure:5465: checking for size_t" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5472 "configure"
|
||||
#line 5470 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#if STDC_HEADERS
|
||||
@ -5498,19 +5496,19 @@ fi
|
||||
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
||||
# for constant arguments. Useless!
|
||||
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
|
||||
echo "configure:5502: checking for working alloca.h" >&5
|
||||
echo "configure:5500: checking for working alloca.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5507 "configure"
|
||||
#line 5505 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <alloca.h>
|
||||
int main() {
|
||||
char *p = alloca(2 * sizeof(int));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_header_alloca_h=yes
|
||||
else
|
||||
@ -5531,12 +5529,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
||||
echo "configure:5535: checking for alloca" >&5
|
||||
echo "configure:5533: checking for alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5540 "configure"
|
||||
#line 5538 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
@ -5564,7 +5562,7 @@ int main() {
|
||||
char *p = (char *) alloca(1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_func_alloca_works=yes
|
||||
else
|
||||
@ -5596,12 +5594,12 @@ EOF
|
||||
|
||||
|
||||
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
||||
echo "configure:5600: checking whether alloca needs Cray hooks" >&5
|
||||
echo "configure:5598: checking whether alloca needs Cray hooks" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5605 "configure"
|
||||
#line 5603 "configure"
|
||||
#include "confdefs.h"
|
||||
#if defined(CRAY) && ! defined(CRAY2)
|
||||
webecray
|
||||
@ -5626,12 +5624,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
|
||||
if test $ac_cv_os_cray = yes; then
|
||||
for ac_func in _getb67 GETB67 getb67; do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:5630: checking for $ac_func" >&5
|
||||
echo "configure:5628: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5635 "configure"
|
||||
#line 5633 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -5654,7 +5652,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@ -5681,7 +5679,7 @@ done
|
||||
fi
|
||||
|
||||
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
||||
echo "configure:5685: checking stack direction for C alloca" >&5
|
||||
echo "configure:5683: checking stack direction for C alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -5689,7 +5687,7 @@ else
|
||||
ac_cv_c_stack_direction=0
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5693 "configure"
|
||||
#line 5691 "configure"
|
||||
#include "confdefs.h"
|
||||
find_stack_direction ()
|
||||
{
|
||||
@ -5708,7 +5706,7 @@ main ()
|
||||
exit (find_stack_direction() < 0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_c_stack_direction=1
|
||||
else
|
||||
@ -5731,12 +5729,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
|
||||
echo "configure:5735: checking whether we are using the GNU C Library 2.1 or newer" >&5
|
||||
echo "configure:5733: checking whether we are using the GNU C Library 2.1 or newer" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5740 "configure"
|
||||
#line 5738 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <features.h>
|
||||
@ -5772,17 +5770,17 @@ stdlib.h string.h unistd.h sys/param.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:5776: checking for $ac_hdr" >&5
|
||||
echo "configure:5774: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5781 "configure"
|
||||
#line 5779 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:5786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:5784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -5813,12 +5811,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
|
||||
strdup strtoul tsearch __argz_count __argz_stringify __argz_next
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:5817: checking for $ac_func" >&5
|
||||
echo "configure:5815: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5822 "configure"
|
||||
#line 5820 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -5841,7 +5839,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@ -5881,7 +5879,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for iconv""... $ac_c" 1>&6
|
||||
echo "configure:5885: checking for iconv" >&5
|
||||
echo "configure:5883: checking for iconv" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -5889,7 +5887,7 @@ else
|
||||
am_cv_func_iconv="no, consider installing GNU libiconv"
|
||||
am_cv_lib_iconv=no
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5893 "configure"
|
||||
#line 5891 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <iconv.h>
|
||||
@ -5899,7 +5897,7 @@ iconv_t cd = iconv_open("","");
|
||||
iconv_close(cd);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
am_cv_func_iconv=yes
|
||||
else
|
||||
@ -5911,7 +5909,7 @@ rm -f conftest*
|
||||
am_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -liconv"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5915 "configure"
|
||||
#line 5913 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <iconv.h>
|
||||
@ -5921,7 +5919,7 @@ iconv_t cd = iconv_open("","");
|
||||
iconv_close(cd);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
am_cv_lib_iconv=yes
|
||||
am_cv_func_iconv=yes
|
||||
@ -5942,13 +5940,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
|
||||
EOF
|
||||
|
||||
echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
|
||||
echo "configure:5946: checking for iconv declaration" >&5
|
||||
echo "configure:5944: checking for iconv declaration" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5952 "configure"
|
||||
#line 5950 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
@ -5967,7 +5965,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:5969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
am_cv_proto_iconv_arg1=""
|
||||
else
|
||||
@ -5996,19 +5994,19 @@ EOF
|
||||
|
||||
|
||||
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
|
||||
echo "configure:6000: checking for nl_langinfo and CODESET" >&5
|
||||
echo "configure:5998: checking for nl_langinfo and CODESET" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6005 "configure"
|
||||
#line 6003 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <langinfo.h>
|
||||
int main() {
|
||||
char* cs = nl_langinfo(CODESET);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
am_cv_langinfo_codeset=yes
|
||||
else
|
||||
@ -6031,19 +6029,19 @@ EOF
|
||||
|
||||
if test $ac_cv_header_locale_h = yes; then
|
||||
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
|
||||
echo "configure:6035: checking for LC_MESSAGES" >&5
|
||||
echo "configure:6033: checking for LC_MESSAGES" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6040 "configure"
|
||||
#line 6038 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <locale.h>
|
||||
int main() {
|
||||
return LC_MESSAGES
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
am_cv_val_LC_MESSAGES=yes
|
||||
else
|
||||
@ -6064,7 +6062,7 @@ EOF
|
||||
fi
|
||||
fi
|
||||
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
|
||||
echo "configure:6068: checking whether NLS is requested" >&5
|
||||
echo "configure:6066: checking whether NLS is requested" >&5
|
||||
# Check whether --enable-nls or --disable-nls was given.
|
||||
if test "${enable_nls+set}" = set; then
|
||||
enableval="$enable_nls"
|
||||
@ -6087,7 +6085,7 @@ fi
|
||||
EOF
|
||||
|
||||
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
|
||||
echo "configure:6091: checking whether included gettext is requested" >&5
|
||||
echo "configure:6089: checking whether included gettext is requested" >&5
|
||||
# Check whether --with-included-gettext or --without-included-gettext was given.
|
||||
if test "${with_included_gettext+set}" = set; then
|
||||
withval="$with_included_gettext"
|
||||
@ -6107,17 +6105,17 @@ fi
|
||||
|
||||
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
|
||||
echo "configure:6111: checking for libintl.h" >&5
|
||||
echo "configure:6109: checking for libintl.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6116 "configure"
|
||||
#line 6114 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <libintl.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:6121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:6119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -6138,12 +6136,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
EOF
|
||||
|
||||
echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
|
||||
echo "configure:6142: checking for GNU gettext in libc" >&5
|
||||
echo "configure:6140: checking for GNU gettext in libc" >&5
|
||||
if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6147 "configure"
|
||||
#line 6145 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <libintl.h>
|
||||
extern int _nl_msg_cat_cntr;
|
||||
@ -6152,7 +6150,7 @@ bindtextdomain ("", "");
|
||||
return (int) gettext ("") + _nl_msg_cat_cntr
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
gt_cv_func_gnugettext1_libc=yes
|
||||
else
|
||||
@ -6168,14 +6166,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
|
||||
|
||||
if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
|
||||
echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
|
||||
echo "configure:6172: checking for GNU gettext in libintl" >&5
|
||||
echo "configure:6170: checking for GNU gettext in libintl" >&5
|
||||
if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
gt_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -lintl $LIBICONV"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6179 "configure"
|
||||
#line 6177 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <libintl.h>
|
||||
extern int _nl_msg_cat_cntr;
|
||||
@ -6184,7 +6182,7 @@ bindtextdomain ("", "");
|
||||
return (int) gettext ("") + _nl_msg_cat_cntr
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
gt_cv_func_gnugettext1_libintl=yes
|
||||
else
|
||||
@ -6217,12 +6215,12 @@ EOF
|
||||
for ac_func in dcgettext
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:6221: checking for $ac_func" >&5
|
||||
echo "configure:6219: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6226 "configure"
|
||||
#line 6224 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -6245,7 +6243,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@ -6274,7 +6272,7 @@ done
|
||||
# Extract the first word of "msgfmt", so it can be a program name with args.
|
||||
set dummy msgfmt; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:6278: checking for $ac_word" >&5
|
||||
echo "configure:6276: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6308,7 +6306,7 @@ fi
|
||||
# Extract the first word of "gmsgfmt", so it can be a program name with args.
|
||||
set dummy gmsgfmt; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:6312: checking for $ac_word" >&5
|
||||
echo "configure:6310: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6345,7 +6343,7 @@ fi
|
||||
# Extract the first word of "xgettext", so it can be a program name with args.
|
||||
set dummy xgettext; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:6349: checking for $ac_word" >&5
|
||||
echo "configure:6347: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6395,7 +6393,7 @@ fi
|
||||
# Extract the first word of "msgfmt", so it can be a program name with args.
|
||||
set dummy msgfmt; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:6399: checking for $ac_word" >&5
|
||||
echo "configure:6397: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6429,7 +6427,7 @@ fi
|
||||
# Extract the first word of "gmsgfmt", so it can be a program name with args.
|
||||
set dummy gmsgfmt; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:6433: checking for $ac_word" >&5
|
||||
echo "configure:6431: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6465,7 +6463,7 @@ fi
|
||||
# Extract the first word of "xgettext", so it can be a program name with args.
|
||||
set dummy xgettext; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:6469: checking for $ac_word" >&5
|
||||
echo "configure:6467: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6537,7 +6535,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:6541: checking for $ac_word" >&5
|
||||
echo "configure:6539: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -6570,7 +6568,7 @@ done
|
||||
ac_verc_fail=yes
|
||||
else
|
||||
echo $ac_n "checking version of bison""... $ac_c" 1>&6
|
||||
echo "configure:6574: checking version of bison" >&5
|
||||
echo "configure:6572: checking version of bison" >&5
|
||||
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
||||
case $ac_prog_version in
|
||||
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
||||
@ -6584,11 +6582,7 @@ echo "configure:6574: checking version of bison" >&5
|
||||
INTLBISON=:
|
||||
fi
|
||||
|
||||
for lang in $ALL_LINGUAS; do
|
||||
GMOFILES="$GMOFILES $lang.gmo"
|
||||
POFILES="$POFILES $lang.po"
|
||||
done
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -6597,8 +6591,6 @@ echo "configure:6574: checking version of bison" >&5
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test $USE_INCLUDED_LIBINTL = yes; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define USE_INCLUDED_LIBINTL 1
|
||||
@ -6619,36 +6611,41 @@ EOF
|
||||
|
||||
|
||||
|
||||
if test "x$CATOBJEXT" != "x"; then
|
||||
if test "x$ALL_LINGUAS" = "x"; then
|
||||
LINGUAS=
|
||||
else
|
||||
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
|
||||
echo "configure:6628: checking for catalogs to be installed" >&5
|
||||
NEW_LINGUAS=
|
||||
for presentlang in $ALL_LINGUAS; do
|
||||
useit=no
|
||||
for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
|
||||
# Use the presentlang catalog if desiredlang is
|
||||
# a. equal to presentlang, or
|
||||
# b. a variant of presentlang (because in this case,
|
||||
# presentlang can be used as a fallback for messages
|
||||
# which are not translated in the desiredlang catalog).
|
||||
case "$desiredlang" in
|
||||
"$presentlang"*) useit=yes;;
|
||||
esac
|
||||
done
|
||||
if test $useit = yes; then
|
||||
NEW_LINGUAS="$NEW_LINGUAS $presentlang"
|
||||
fi
|
||||
done
|
||||
LINGUAS=$NEW_LINGUAS
|
||||
echo "$ac_t""$LINGUAS" 1>&6
|
||||
fi
|
||||
|
||||
if test -n "$LINGUAS"; then
|
||||
for lang in $LINGUAS; do CATALOGS="$CATALOGS po/$lang$CATOBJEXT"; done
|
||||
fi
|
||||
if test "x$CATOBJEXT" != x; then
|
||||
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
|
||||
echo "configure:6617: checking for catalogs to be installed" >&5
|
||||
# Look for .po and .gmo files in the source directory.
|
||||
CATALOGS=
|
||||
XLINGUAS=
|
||||
for cat in $srcdir/po/*$CATOBJEXT $srcdir/po/*.po; do
|
||||
# If there aren't any .gmo files the shell will give us the
|
||||
# literal string "../path/to/srcdir/po/*.gmo" which has to be
|
||||
# weeded out.
|
||||
case "$cat" in *\**)
|
||||
continue;;
|
||||
esac
|
||||
# The quadruple backslash is collapsed to a double backslash
|
||||
# by the backticks, then collapsed again by the double quotes,
|
||||
# leaving us with one backslash in the sed expression (right
|
||||
# before the dot that mustn't act as a wildcard). The dot to
|
||||
# be escaped in the second expression is hiding inside CATOBJEXT.
|
||||
cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!$CATOBJEXT!"`
|
||||
lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\$CATOBJEXT!!"`
|
||||
# The user is allowed to set LINGUAS to a list of languages to
|
||||
# install catalogs for. If it's empty that means "all of them."
|
||||
if test "x$LINGUAS" = x; then
|
||||
CATALOGS="$CATALOGS $cat"
|
||||
XLINGUAS="$XLINGUAS $lang"
|
||||
else
|
||||
case "$LINGUAS" in *$lang*)
|
||||
CATALOGS="$CATALOGS $cat"
|
||||
XLINGUAS="$XLINGUAS $lang"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
LINGUAS="$XLINGUAS"
|
||||
echo "$ac_t""$LINGUAS" 1>&6
|
||||
fi
|
||||
|
||||
MKINSTALLDIRS=
|
||||
@ -6674,7 +6671,7 @@ fi
|
||||
case $host_os in
|
||||
win32 | pe | cygwin* | mingw32* | uwin*)
|
||||
echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
|
||||
echo "configure:6678: checking whether windows registry support is requested" >&5
|
||||
echo "configure:6675: checking whether windows registry support is requested" >&5
|
||||
if test "x$enable_win32_registry" != xno; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define ENABLE_WIN32_REGISTRY 1
|
||||
@ -6683,14 +6680,14 @@ EOF
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6
|
||||
echo "configure:6687: checking for library containing RegOpenKeyExA" >&5
|
||||
echo "configure:6684: checking for library containing RegOpenKeyExA" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_func_search_save_LIBS="$LIBS"
|
||||
ac_cv_search_RegOpenKeyExA="no"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6694 "configure"
|
||||
#line 6691 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -6701,7 +6698,7 @@ int main() {
|
||||
RegOpenKeyExA()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_RegOpenKeyExA="none required"
|
||||
else
|
||||
@ -6712,7 +6709,7 @@ rm -f conftest*
|
||||
test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do
|
||||
LIBS="-l$i $ac_func_search_save_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6716 "configure"
|
||||
#line 6713 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -6723,7 +6720,7 @@ int main() {
|
||||
RegOpenKeyExA()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_search_RegOpenKeyExA="-l$i"
|
||||
break
|
||||
@ -6765,7 +6762,7 @@ esac
|
||||
|
||||
if test "x$enable_win32_registry" != xno; then
|
||||
echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
|
||||
echo "configure:6769: checking registry key on windows hosts" >&5
|
||||
echo "configure:6766: checking registry key on windows hosts" >&5
|
||||
cat >> confdefs.h <<EOF
|
||||
#define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
|
||||
EOF
|
||||
@ -6948,7 +6945,7 @@ fi
|
||||
|
||||
# Figure out what assembler we will be using.
|
||||
echo $ac_n "checking what assembler to use""... $ac_c" 1>&6
|
||||
echo "configure:6952: checking what assembler to use" >&5
|
||||
echo "configure:6949: checking what assembler to use" >&5
|
||||
gcc_cv_as=
|
||||
gcc_cv_gas_major_version=
|
||||
gcc_cv_gas_minor_version=
|
||||
@ -7034,7 +7031,7 @@ fi
|
||||
|
||||
# Figure out what nm we will be using.
|
||||
echo $ac_n "checking what nm to use""... $ac_c" 1>&6
|
||||
echo "configure:7038: checking what nm to use" >&5
|
||||
echo "configure:7035: checking what nm to use" >&5
|
||||
if test -x nm$host_exeext; then
|
||||
gcc_cv_nm=./nm$host_exeext
|
||||
elif test x$host = x$target; then
|
||||
@ -7045,7 +7042,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6
|
||||
|
||||
# Figure out what assembler alignment features are present.
|
||||
echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
|
||||
echo "configure:7049: checking assembler alignment features" >&5
|
||||
echo "configure:7046: checking assembler alignment features" >&5
|
||||
gcc_cv_as_alignment_features=none
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
# Gas version 2.6 and later support for .balign and .p2align.
|
||||
@ -7093,7 +7090,7 @@ fi
|
||||
echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
|
||||
echo "configure:7097: checking assembler subsection support" >&5
|
||||
echo "configure:7094: checking assembler subsection support" >&5
|
||||
gcc_cv_as_subsections=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
@ -7133,7 +7130,7 @@ fi
|
||||
echo "$ac_t""$gcc_cv_as_subsections" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
|
||||
echo "configure:7137: checking assembler weak support" >&5
|
||||
echo "configure:7134: checking assembler weak support" >&5
|
||||
gcc_cv_as_weak=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then
|
||||
@ -7156,7 +7153,7 @@ fi
|
||||
echo "$ac_t""$gcc_cv_as_weak" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
|
||||
echo "configure:7160: checking assembler hidden support" >&5
|
||||
echo "configure:7157: checking assembler hidden support" >&5
|
||||
gcc_cv_as_hidden=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
@ -7180,7 +7177,7 @@ fi
|
||||
echo "$ac_t""$gcc_cv_as_hidden" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6
|
||||
echo "configure:7184: checking assembler leb128 support" >&5
|
||||
echo "configure:7181: checking assembler leb128 support" >&5
|
||||
gcc_cv_as_leb128=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
@ -7225,7 +7222,7 @@ fi
|
||||
echo "$ac_t""$gcc_cv_as_leb128" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6
|
||||
echo "configure:7229: checking assembler eh_frame optimization" >&5
|
||||
echo "configure:7226: checking assembler eh_frame optimization" >&5
|
||||
gcc_cv_as_eh_frame=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
@ -7306,7 +7303,7 @@ fi
|
||||
echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6
|
||||
echo "configure:7310: checking assembler section merging support" >&5
|
||||
echo "configure:7307: checking assembler section merging support" >&5
|
||||
gcc_cv_as_shf_merge=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
|
||||
@ -7331,7 +7328,7 @@ echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6
|
||||
case "$target" in
|
||||
sparc*-*-*)
|
||||
echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
|
||||
echo "configure:7335: checking assembler .register pseudo-op support" >&5
|
||||
echo "configure:7332: checking assembler .register pseudo-op support" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -7359,7 +7356,7 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
|
||||
echo "configure:7363: checking assembler supports -relax" >&5
|
||||
echo "configure:7360: checking assembler supports -relax" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -7389,7 +7386,7 @@ EOF
|
||||
case "$tm_file" in
|
||||
*64*)
|
||||
echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
|
||||
echo "configure:7393: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
|
||||
echo "configure:7390: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -7434,7 +7431,7 @@ EOF
|
||||
|
||||
if test "x$gcc_cv_as_flags64" != xno; then
|
||||
echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
|
||||
echo "configure:7438: checking for assembler offsetable %lo() support" >&5
|
||||
echo "configure:7435: checking for assembler offsetable %lo() support" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -7474,7 +7471,7 @@ EOF
|
||||
|
||||
i[34567]86-*-* | x86_64-*-*)
|
||||
echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
|
||||
echo "configure:7478: checking assembler instructions" >&5
|
||||
echo "configure:7475: checking assembler instructions" >&5
|
||||
gcc_cv_as_instructions=
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
|
||||
if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then
|
||||
@ -7501,7 +7498,7 @@ EOF
|
||||
echo "$ac_t""$gcc_cv_as_instructions" 1>&6
|
||||
|
||||
echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6
|
||||
echo "configure:7505: checking assembler GOTOFF in data directives" >&5
|
||||
echo "configure:7502: checking assembler GOTOFF in data directives" >&5
|
||||
gcc_cv_as_gotoff_in_data=no
|
||||
if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x
|
||||
then
|
||||
@ -7531,7 +7528,7 @@ EOF
|
||||
esac
|
||||
|
||||
echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6
|
||||
echo "configure:7535: checking assembler dwarf2 debug_line support" >&5
|
||||
echo "configure:7532: checking assembler dwarf2 debug_line support" >&5
|
||||
gcc_cv_as_dwarf2_debug_line=no
|
||||
# ??? Not all targets support dwarf2 debug_line, even within a version
|
||||
# of gas. Moreover, we need to emit a valid instruction to trigger any
|
||||
@ -7723,7 +7720,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:7727: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:7724: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
@ -8264,11 +8261,9 @@ s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
|
||||
s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
|
||||
s%@CATALOGS@%$CATALOGS%g
|
||||
s%@CATOBJEXT@%$CATOBJEXT%g
|
||||
s%@GMOFILES@%$GMOFILES%g
|
||||
s%@INTLLIBS@%$INTLLIBS%g
|
||||
s%@INTLDEPS@%$INTLDEPS%g
|
||||
s%@INTLOBJS@%$INTLOBJS%g
|
||||
s%@POFILES@%$POFILES%g
|
||||
s%@POSUB@%$POSUB%g
|
||||
s%@DATADIRNAME@%$DATADIRNAME%g
|
||||
s%@INSTOBJEXT@%$INSTOBJEXT%g
|
||||
|
@ -907,8 +907,6 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION",
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION)
|
||||
|
||||
ALL_LINGUAS="sv"
|
||||
|
||||
# Enable NLS support by default
|
||||
AC_ARG_ENABLE(nls,
|
||||
[ --enable-nls use Native Language Support (default)],
|
||||
|
Loading…
Reference in New Issue
Block a user