From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7919) id CC61C38582A1; Wed, 15 Nov 2023 13:47:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CC61C38582A1 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sam James To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] Finalized intl-update patches (deux) X-Act-Checkin: binutils-gdb X-Git-Author: Sam James X-Git-Refname: refs/heads/master X-Git-Oldrev: 56172576da018d55fc03b25ba73e17cc6625dc36 X-Git-Newrev: 9e11e7460da19bbb8ca1332f616545e79d917bde Message-Id: <20231115134710.CC61C38582A1@sourceware.org> Date: Wed, 15 Nov 2023 13:47:10 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Nov 2023 13:47:10 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D9e11e7460da1= 9bbb8ca1332f616545e79d917bde commit 9e11e7460da19bbb8ca1332f616545e79d917bde Author: Sam James Date: Wed Nov 15 13:42:48 2023 +0000 Finalized intl-update patches (deux) =20 Doing this on behalf of Arsen as obvious. =20 * gdb: Regenerate. * gdbserver: Regenerate. * gprofng: Regenerate. Diff: --- gdb/aclocal.m4 | 10 +- gdbserver/aclocal.m4 | 6 + gdbserver/config.in | 18 + gdbserver/configure | 2278 ++++++++++++++++++++++++++++++++++= +--- gprofng/libcollector/Makefile.in | 10 +- gprofng/libcollector/aclocal.m4 | 8 +- 6 files changed, 2134 insertions(+), 196 deletions(-) diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index 05b492625df..99714239668 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -199,11 +199,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) =20 -m4_include([../libtool.m4]) -m4_include([../ltoptions.m4]) -m4_include([../ltsugar.m4]) -m4_include([../ltversion.m4]) -m4_include([../lt~obsolete.m4]) m4_include([../config/acx.m4]) m4_include([../config/ax_pthread.m4]) m4_include([../config/bfd64.m4]) @@ -222,4 +217,9 @@ m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) m4_include([../config/tcl.m4]) +m4_include([../libtool.m4]) +m4_include([../ltoptions.m4]) +m4_include([../ltsugar.m4]) +m4_include([../ltversion.m4]) +m4_include([../lt~obsolete.m4]) m4_include([acinclude.m4]) diff --git a/gdbserver/aclocal.m4 b/gdbserver/aclocal.m4 index bceb92fdb5d..db9266266be 100644 --- a/gdbserver/aclocal.m4 +++ b/gdbserver/aclocal.m4 @@ -203,9 +203,15 @@ m4_include([../config/acx.m4]) m4_include([../config/ax_pthread.m4]) m4_include([../config/depstand.m4]) m4_include([../config/gettext-sister.m4]) +m4_include([../config/gettext.m4]) +m4_include([../config/iconv.m4]) +m4_include([../config/intlmacosx.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/lib-ld.m4]) m4_include([../config/lib-link.m4]) m4_include([../config/lib-prefix.m4]) +m4_include([../config/nls.m4]) m4_include([../config/override.m4]) +m4_include([../config/po.m4]) +m4_include([../config/progtest.m4]) m4_include([acinclude.m4]) diff --git a/gdbserver/config.in b/gdbserver/config.in index ab507aa6f6a..ca4b9f4d6f2 100644 --- a/gdbserver/config.in +++ b/gdbserver/config.in @@ -28,9 +28,21 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H =20 +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue= in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* define if the compiler supports basic C++17 syntax */ #undef HAVE_CXX17 =20 +/* Define if the GNU dcgettext() function is already present or preinstall= ed. + */ +#undef HAVE_DCGETTEXT + /* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to = 0 if you don't. */ #undef HAVE_DECL_ADDR_NO_RANDOMIZE @@ -125,9 +137,15 @@ /* Define to 1 if you have the `getrusage' function. */ #undef HAVE_GETRUSAGE =20 +/* Define if the GNU gettext() function is already present or preinstalled= . */ +#undef HAVE_GETTEXT + /* Define if has gregset_t. */ #undef HAVE_GREGSET_T =20 +/* Define if you have the iconv() function and it works. */ +#undef HAVE_ICONV + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H =20 diff --git a/gdbserver/configure b/gdbserver/configure index c6b8d7803c4..dc2ecd884a8 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -620,6 +620,7 @@ ac_includes_default=3D"\ #endif" =20 ac_header_list=3D +gt_needs=3D ac_subst_vars=3D'LTLIBOBJS LIBOBJS GNULIB_STDINT_H @@ -644,13 +645,22 @@ GENCAT INSTOBJEXT DATADIRNAME CATALOGS -POSUB -GMSGFMT -XGETTEXT INCINTL LIBINTL_DEP +POSUB +LTLIBINTL LIBINTL +INTLLIBS +LTLIBICONV +LIBICONV +INTL_MACOSX_LIBS +MSGMERGE +XGETTEXT +GMSGFMT +MSGFMT USE_NLS +MKINSTALLDIRS +SET_MAKE DEPDIR am__leading_dot host_noncanonical @@ -759,6 +769,11 @@ with_xxhash with_libxxhash_prefix with_libxxhash_type enable_unit_tests +enable_nls +with_libiconv_prefix +with_libiconv_type +with_libintl_prefix +with_libintl_type with_ust with_ust_include with_ust_lib @@ -1408,6 +1423,7 @@ Optional Features: --disable-rpath do not hardcode runtime library paths --enable-unit-tests Enable the inclusion of unit tests when compiling GDB + --disable-nls do not use Native Language Support --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is us= ed --enable-gdb-build-warnings @@ -1428,6 +1444,12 @@ Optional Packages: --with-libxxhash-prefix[=3DDIR] search for libxxhash in DIR/include and= DIR/lib --without-libxxhash-prefix don't search for libxxhash in includedir = and libdir --with-libxxhash-type=3DTYPE type of library to search for (auto/sta= tic/shared) + --with-libiconv-prefix[=3DDIR] search for libiconv in DIR/include and D= IR/lib + --without-libiconv-prefix don't search for libiconv in includedir an= d libdir + --with-libiconv-type=3DTYPE type of library to search for (auto/stat= ic/shared) + --with-libintl-prefix[=3DDIR] search for libintl in DIR/include and DIR= /lib + --without-libintl-prefix don't search for libintl in includedir and = libdir + --with-libintl-type=3DTYPE type of library to search for (auto/stati= c/shared) --with-ust=3DPATH Specify prefix directory for the installed UST p= ackage Equivalent to --with-ust-include=3DPATH/include plus --with-ust-lib=3DPATH/lib @@ -2655,6 +2677,7 @@ fi as_fn_append ac_header_list " stdlib.h" as_fn_append ac_header_list " unistd.h" as_fn_append ac_header_list " sys/param.h" +gt_needs=3D"$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=3Dfalse @@ -11118,219 +11141,2001 @@ ac_config_commands=3D"$ac_config_commands depd= ir" =20 =20 =20 -# If we haven't got the data from the intl directory, -# assume NLS is disabled. -USE_NLS=3Dno -LIBINTL=3D -LIBINTL_DEP=3D -INCINTL=3D -XGETTEXT=3D -GMSGFMT=3D -POSUB=3D - -if test -f ../intl/config.intl; then - . ../intl/config.intl -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested= " >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } -if test x"$USE_NLS" !=3D xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} set= s \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=3D`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 else + cat >conftest.make <<\_ACEOF +SHELL =3D /bin/sh +all: + @echo '@@@%%%=3D$(MAKE)=3D@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse u= s. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=3D?*=3D@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=3Dyes;; + *) + eval ac_cv_prog_make_${ac_make}_set=3Dno;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set =3D yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - -$as_echo "#define ENABLE_NLS 1" >>confdefs.h + SET_MAKE=3D +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE=3D"MAKE=3D${MAKE-make}" +fi =20 =20 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be ins= talled" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - # Look for .po and .gmo files in the source directory. - CATALOGS=3D - XLINGUAS=3D - for cat in $srcdir/po/*.gmo $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;; + MKINSTALLDIRS=3D + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS=3D"$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS=3D"\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; 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). - cat=3D`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"` - lang=3D`echo $cat | sed -e "s!\\\\.gmo!!"` - # 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" =3D x; then - CATALOGS=3D"$CATALOGS $cat" - XLINGUAS=3D"$XLINGUAS $lang" - else - case "$LINGUAS" in *$lang*) - CATALOGS=3D"$CATALOGS $cat" - XLINGUAS=3D"$XLINGUAS $lang" - ;; - esac - fi - done - LINGUAS=3D"$XLINGUAS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - - - DATADIRNAME=3Dshare - - INSTOBJEXT=3D.mo + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS=3D"\$(top_srcdir)/mkinstalldirs" + fi =20 - GENCAT=3Dgencat =20 - CATOBJEXT=3D.gmo =20 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is request= ed" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" =3D set; then : + enableval=3D$enable_nls; USE_NLS=3D$enableval +else + USE_NLS=3Dyes fi =20 -# Create sub-directories for objects and dependencies. -CONFIG_SRC_SUBDIR=3D"arch gdbsupport nat target" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } =20 =20 -ac_config_commands=3D"$ac_config_commands gdbdepdir" =20 =20 -depcc=3D"$CC" am_compiler_list=3D =20 -am_depcomp=3D$ac_aux_dir/depcomp -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $dep= cc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub =20 - am_cv_CC_dependencies_compiler_type=3Dnone - if test "$am_compiler_list" =3D ""; then - am_compiler_list=3D`sed -n 's/^\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" !=3D set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH=3D"/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=3D';' + else + PATH_SEPARATOR=3D: fi - for depmode in $am_compiler_list; do - if test $depmode =3D none; then break; fi - - $as_echo "$as_me:$LINENO: trying $depmode" >&5 - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "include sub/conftest.Po" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - depcmd=3D"depmode=3D$depmode \ - source=3Dsub/conftest.c object=3Dsub/conftest.${OBJEXT-o} \ - depfile=3Dsub/conftest.Po tmpdepfile=3Dsub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest= .c" - echo "| $depcmd" | sed -e 's/ */ /g' >&5 - if env $depcmd > conftest.err 2>&1 && - grep sub/conftst6.h sub/conftest.Po >>conftest.err 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po >>conftest.err 2>&1 && - ${MAKE-make} -s -f confmf >>conftest.err 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument req= uired - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=3D$depmode - $as_echo "$as_me:$LINENO: success" >&5 - break - fi - fi - $as_echo "$as_me:$LINENO: failure, diagnostics are:" >&5 - sed -e 's/^/| /' < conftest.err >&5 - done + rm -f conf$$.sh +fi =20 - cd .. - rm -rf conftest.dir +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executabili= ty. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p=3D"test -x" else - am_cv_CC_dependencies_compiler_type=3Dnone + ac_executable_p=3D"test -f" fi +rm -f conf$$.file =20 +# Extract the first word of "msgfmt", so it can be a program name with arg= s. +set dummy msgfmt; ac_word=3D$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$MSGFMT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT=3D"$MSGFMT" # Let the user override the test with a = path. + ;; + *) + ac_save_IFS=3D"$IFS"; IFS=3D$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=3D"$ac_save_IFS" + test -z "$ac_dir" && ac_dir=3D. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep us= age >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT=3D"$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS=3D"$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=3D":" + ;; +esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_co= mpiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -if test x${am_cv_CC_dependencies_compiler_type-none} =3D xnone -then as_fn_error $? "no usable dependency style found" "$LINENO" 5 -else CCDEPMODE=3Ddepmode=3D$am_cv_CC_dependencies_compiler_type - +MSGFMT=3D"$ac_cv_path_MSGFMT" +if test "$MSGFMT" !=3D ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi =20 + # Extract the first word of "gmsgfmt", so it can be a program name with = args. +set dummy gmsgfmt; ac_word=3D$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT=3D"$GMSGFMT" # Let the user override the test with a = path. + ;; + *) + as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=3D$as_save_IFS + test -z "$as_dir" && as_dir=3D. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT=3D"$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_= ext" >&5 + break 2 + fi +done + done +IFS=3D$as_save_IFS =20 -for ac_header in termios.h sys/reg.h string.h sys/procfs.h linux/elf.h = fcntl.h signal.h sys/file.h sys/ioctl.h netinet/in.h sys/socket.h net= db.h netinet/tcp.h arpa/inet.h ws2tcpip.h -do : - as_ac_Header=3D`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_i= ncludes_default" -if eval test \"x\$"$as_ac_Header"\" =3D x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT=3D"$MSGFMT" + ;; +esac +fi +GMSGFMT=3D$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi =20 -done - -for ac_header in vfork.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" = "$ac_includes_default" -if test "x$ac_cv_header_vfork_h" =3D xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VFORK_H 1 -_ACEOF =20 -fi =20 -done =20 -for ac_func in fork vfork -do : - as_ac_var=3D`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" =3D x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" !=3D set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH=3D"/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=3D';' + else + PATH_SEPARATOR=3D: + fi + rm -f conf$$.sh +fi =20 +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executabili= ty. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p=3D"test -x" +else + ac_executable_p=3D"test -f" fi -done +rm -f conf$$.file =20 -if test "x$ac_cv_func_fork" =3D xyes; then +# Extract the first word of "xgettext", so it can be a program name with a= rgs. +set dummy xgettext; ac_word=3D$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XGETTEXT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT=3D"$XGETTEXT" # Let the user override the test wit= h a path. + ;; + *) + ac_save_IFS=3D"$IFS"; IFS=3D$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=3D"$ac_save_IFS" + test -z "$ac_dir" && ac_dir=3D. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --omit-header --copyright-holder=3D --msgid-= bugs-address=3D /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder=3D --msgid-bugs= -address=3D /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1;= else exit 0; fi); then + ac_cv_path_XGETTEXT=3D"$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS=3D"$ac_save_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=3D":" + ;; +esac +fi +XGETTEXT=3D"$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" !=3D ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + rm -f messages.po + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" !=3D set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH=3D"/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=3D';' + else + PATH_SEPARATOR=3D: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executabili= ty. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p=3D"test -x" +else + ac_executable_p=3D"test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with a= rgs. +set dummy msgmerge; ac_word=3D$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGMERGE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE=3D"$MSGMERGE" # Let the user override the test wit= h a path. + ;; + *) + ac_save_IFS=3D"$IFS"; IFS=3D$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=3D"$ac_save_IFS" + test -z "$ac_dir" && ac_dir=3D. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2= >&1; then + ac_cv_path_MSGMERGE=3D"$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS=3D"$ac_save_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=3D":" + ;; +esac +fi +MSGMERGE=3D"$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" !=3D ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$GMSGFMT" !=3D ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/= dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=3D`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT prog= ram is not GNU msgfmt; ignore it" >&5 +$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; } + GMSGFMT=3D":" + fi + fi + + if test "$XGETTEXT" !=3D ":"; then + if $XGETTEXT --omit-header --copyright-holder=3D --msgid-bugs-= address=3D /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder=3D --msgid-bugs-addr= ess=3D /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else= exit 0; fi); then + : ; + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext prog= ram is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=3D":" + fi + rm -f messages.po + fi + + ac_config_commands=3D"$ac_config_commands default-1" + + + + + + + + + use_additional=3Dyes + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + + eval additional_includedir=3D\"$includedir\" + eval additional_libdir=3D\"$libdir\" + + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + +# Check whether --with-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" =3D set; then : + withval=3D$with_libiconv_prefix; + if test "X$withval" =3D "Xno"; then + use_additional=3Dno + else + if test "X$withval" =3D "X"; then + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + + eval additional_includedir=3D\"$includedir\" + eval additional_libdir=3D\"$libdir\" + + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + else + additional_includedir=3D"$withval/include" + additional_libdir=3D"$withval/lib" + fi + fi + +fi + + +# Check whether --with-libiconv-type was given. +if test "${with_libiconv_type+set}" =3D set; then : + withval=3D$with_libiconv_type; with_libiconv_type=3D$withval +else + with_libiconv_type=3Dauto +fi + + lib_type=3D`eval echo \$with_libiconv_type` + + LIBICONV=3D + LTLIBICONV=3D + INCICONV=3D + rpathdirs=3D + ltrpathdirs=3D + names_already_handled=3D + names_next_round=3D'iconv ' + while test -n "$names_next_round"; do + names_this_round=3D"$names_next_round" + names_next_round=3D + for name in $names_this_round; do + already_handled=3D + for n in $names_already_handled; do + if test "$n" =3D "$name"; then + already_handled=3Dyes + break + fi + done + if test -z "$already_handled"; then + names_already_handled=3D"$names_already_handled $name" + uppername=3D`echo "$name" | sed -e 'y|abcdefghijkl= mnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=3D\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" =3D yes; then + eval value=3D\"\$LIB$uppername\" + test -z "$value" || LIBICONV=3D"${LIBICONV}${LIBICONV:+ }$valu= e" + eval value=3D\"\$LTLIB$uppername\" + test -z "$value" || LTLIBICONV=3D"${LTLIBICONV}${LTLIBICONV:+ = }$value" + else + : + fi + else + found_dir=3D + found_la=3D + found_so=3D + found_a=3D + if test $use_additional =3D yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name= .$shlibext" && test x$lib_type !=3D xstatic; then + found_dir=3D"$additional_libdir" + found_so=3D"$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la=3D"$additional_libdir/lib$name.la" + fi + elif test x$lib_type !=3D xshared; then + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir=3D"$additional_libdir" + found_a=3D"$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la=3D"$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" =3D "X"; then + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + case "$x" in + -L*) + dir=3D`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibe= xt" && test x$lib_type !=3D xstatic; then + found_dir=3D"$dir" + found_so=3D"$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la=3D"$dir/lib$name.la" + fi + elif test x$lib_type !=3D xshared; then + if test -f "$dir/lib$name.$libext"; then + found_dir=3D"$dir" + found_a=3D"$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la=3D"$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" !=3D "X"; then + break + fi + done + fi + if test "X$found_dir" !=3D "X"; then + LTLIBICONV=3D"${LTLIBICONV}${LTLIBICONV:+ }-L$foun= d_dir -l$name" + if test "X$found_so" !=3D "X"; then + if test "$enable_r= path" =3D no || test "X$found_dir" =3D "X/usr/lib"; then + LIBICONV=3D"${LIBICONV}${LIBICONV:+ }$foun= d_so" + else + = haveit=3D + for x in $ltrpathdirs; do + if test "X$x" =3D "X$found_dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs=3D"$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" =3D yes; then + LIBICONV=3D"${LIBICO= NV}${LIBICONV:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardco= de_minus_L" =3D no; then + LIBICONV=3D"${= LIBICONV}${LIBICONV:+ }$found_so" + haveit=3D + for x in $rpathdirs; do + if test "X$x" =3D "X$found_dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + rpathdirs=3D"$rpathdirs $found_dir" + fi + else + = haveit=3D + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-L$found_dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + LIBICONV=3D"${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" !=3D no; then + = LIBICONV=3D"${LIBICONV}${LIBICONV:+ }$found_so" + else + = = LIBICONV=3D"${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" !=3D "X"; then + LIBICONV=3D"${LIBICONV}${LIBICONV:+ }$foun= d_a" + else + LIBICONV=3D"${LIBICONV}${L= IBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir=3D + case "$found_dir" in + */lib | */lib/) + basedir=3D`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib= /*$,,'` + additional_includedir=3D"$basedir/include" + ;; + esac + if test "X$additional_includedir" !=3D "X"; then + = if test "X$additional_includedir" != =3D "X/usr/include"; then + haveit=3D + if test "X$additional_includedir" =3D "X/usr/local/include= "; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=3Dyes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCICONV; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-I$additional_includedir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV=3D"${INCICONV}${INCIC= ONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir=3D"$li= bdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir=3D"$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=3D`echo "X$dep" | sed -e 's/^X-L//'` + = = if test "X$additional_libdir" !=3D "X/usr/lib"; then + haveit=3D + if test "X$additional_libdir" =3D "X/usr/local/lib";= then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=3Dyes;; + esac + fi + fi + if test -z "$haveit"; then + haveit=3D + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-L$additional_libdir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBICONV=3D"${LIBI= CONV}${LIBICONV:+ }-L$additional_libdir" + fi + fi + haveit=3D + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-L$additional_libdir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBICONV=3D"${LT= LIBICONV}${LTLIBICONV:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=3D`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" !=3D no; then + haveit=3D + for x in $rpathdirs; do + if test "X$x" =3D "X$dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + rpathdirs=3D"$rpathdirs $dir" + fi + haveit=3D + for x in $ltrpathdirs; do + if test "X$x" =3D "X$dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs=3D"$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round=3D"$names_next_ro= und "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + = names_next_round=3D"$names_next_round "`echo "X$dep" | sed -e 's,^X.*= /,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV=3D"${LIBICONV}${LIBICONV:= + }$dep" + LTLIBICONV=3D"${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + if test "x$lib= _type" =3D "xauto" || test "x$lib_type" =3D "xshared"; then + LIBICONV=3D"${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV=3D"${LTLIBICONV}${LTLIBICONV:+ }-l$name" + else + LIBICONV=3D"${LIBICONV}${LIBICONV:+ }-l:lib$name.$libext" + LTLIBICONV=3D"${LTLIBICONV}${LTLIBICONV:+ }-l:lib$name.$libe= xt" + fi + fi + fi + fi + done + done + if test "X$rpathdirs" !=3D "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs=3D + for found_dir in $rpathdirs; do + alldirs=3D"${alldirs}${alldirs:+$hardcode_libdir_separator}$found_= dir" + done + acl_save_libdir=3D"$libdir" + libdir=3D"$alldirs" + eval flag=3D\"$hardcode_libdir_flag_spec\" + libdir=3D"$acl_save_libdir" + LIBICONV=3D"${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir=3D"$libdir" + libdir=3D"$found_dir" + eval flag=3D\"$hardcode_libdir_flag_spec\" + libdir=3D"$acl_save_libdir" + LIBICONV=3D"${LIBICONV}${LIBICONV:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" !=3D "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV=3D"${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done + fi + + + + + +if test -f ../gettext/uninstalled-config.sh; then + relative_builddir=3D'$(top_builddir)/../gettext' + . ../gettext/uninstalled-config.sh +else + # The sister gettext directory doesn't exist and won't collect informati= on on + # using gettext for us. Call a bundled AM_GNU_GETTEXT. + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCop= yAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS=3D"$LIBS" + LIBS=3D"$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=3Dyes +else + gt_cv_func_CFPreferencesCopyAppValue=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=3D"$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferences= CopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue =3D yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for = CFLocaleCopyPreferredLanguages" >&5 +$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; } +if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS=3D"$LIBS" + LIBS=3D"$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyPreferredLanguages(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyPreferredLanguages=3Dyes +else + gt_cv_func_CFLocaleCopyPreferredLanguages=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=3D"$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyP= referredLanguages" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } + if test $gt_cv_func_CFLocaleCopyPreferredLanguages =3D yes; then + +$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS=3D + if test $gt_cv_func_CFPreferencesCopyAppValue =3D yes \ + || test $gt_cv_func_CFLocaleCopyPreferredLanguages =3D yes; then + INTL_MACOSX_LIBS=3D"-Wl,-framework -Wl,CoreFoundation = -Wl,-framework -Wl,CoreServices" + fi + + + + + + + LIBINTL=3D + LTLIBINTL=3D + POSUB=3D + + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3D3 ;; + *" need-ngettext "*) gt_api_version=3D2 ;; + *) gt_api_version=3D1 ;; + esac + gt_func_gnugettext_libc=3D"gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl=3D"gt_cv_func_gnugettext${gt_api_version}_lib= intl" + + if test "$USE_NLS" =3D "yes"; then + gt_use_preinstalled_gnugettext=3Dno + + + if test $gt_api_version -ge 3; then + gt_revision_test_code=3D' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) =3D=3D 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >=3D 1) - 1]; +' + else + gt_revision_test_code=3D + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=3D' + * ngettext ("", "", 0)' + else + gt_expression_test_code=3D + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext = in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval \${$gt_func_gnugettext_libc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bi= ndings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRE= SSION + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libc=3Dyes" +else + eval "$gt_func_gnugettext_libc=3Dno" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=3D\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if { eval "gt_val=3D\$$gt_func_gnugettext_libc"; test "$gt_val" != =3D "yes"; }; then + + + + + + am_save_CPPFLAGS=3D"$CPPFLAGS" + + for element in $INCICONV; do + haveit=3D + for x in $CPPFLAGS; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X$element"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS=3D"${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_cv_func_iconv=3D"no, consider installing GNU libiconv" + am_cv_lib_iconv=3Dno + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main () +{ +iconv_t cd =3D iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_func_iconv=3Dyes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" !=3D yes; then + am_save_LIBS=3D"$LIBS" + LIBS=3D"$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main () +{ +iconv_t cd =3D iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_lib_iconv=3Dyes + am_cv_func_iconv=3Dyes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=3D"$am_save_LIBS" + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" =3D yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >= &5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS=3D"$LIBS" + if test $am_cv_lib_iconv =3D yes; then + LIBS=3D"$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=3Dno + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" =3D yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works=3D"guessing no" ;; + *) am_cv_func_iconv_works=3D"guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () +{ +int result =3D 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + */ + { + iconv_t cd_utf8_to_88591 =3D iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 !=3D (iconv_t)(-1)) + { + static ICONV_CONST char input[] =3D "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr =3D input; + size_t inbytesleft =3D strlen (input); + char *outptr =3D buf; + size_t outbytesleft =3D sizeof (buf); + size_t res =3D iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res =3D=3D 0) + result |=3D 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 =3D iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 !=3D (iconv_t)(-1)) + { + static ICONV_CONST char input[] =3D "\263"; + char buf[10]; + ICONV_CONST char *inptr =3D input; + size_t inbytesleft =3D strlen (input); + char *outptr =3D buf; + size_t outbytesleft =3D sizeof (buf); + size_t res =3D iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res =3D=3D 0) + result |=3D 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 =3D iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 !=3D (iconv_t)(-1)) + { + static ICONV_CONST char input[] =3D "\304"; + static char buf[2] =3D { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr =3D input; + size_t inbytesleft =3D 1; + char *outptr =3D buf; + size_t outbytesleft =3D 1; + size_t res =3D iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res !=3D (size_t)(-1) || outptr - buf > 1 || buf[1] !=3D (char= )0xAD) + result |=3D 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 =3D iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 !=3D (iconv_t)(-1)) + { + static ICONV_CONST char input[] =3D "\304rger mit b\366sen B\374bc= hen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr =3D input; + size_t inbytesleft =3D strlen (input); + char *outptr =3D buf; + size_t outbytesleft =3D sizeof (buf); + size_t res =3D iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |=3D 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 =3D iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 =3D iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 =3D iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 =3D iconv_open ("utf8", "eucJP"); + if (cd1 =3D=3D (iconv_t)(-1) && cd2 =3D=3D (iconv_t)(-1) + && cd3 =3D=3D (iconv_t)(-1) && cd4 =3D=3D (iconv_t)(-1)) + result |=3D 16; + if (cd1 !=3D (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 !=3D (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 !=3D (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 !=3D (iconv_t)(-1)) + iconv_close (cd4); + } + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=3Dyes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + test "$am_cv_func_iconv_works" =3D no || break + done + LIBS=3D"$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" = >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=3Dno am_cv_lib_iconv=3Dno ;; + *) am_func_iconv=3Dyes ;; + esac + else + am_func_iconv=3Dno am_cv_lib_iconv=3Dno + fi + if test "$am_func_iconv" =3D yes; then + +$as_echo "#define HAVE_ICONV 1" >>confdefs.h + + fi + if test "$am_cv_lib_iconv" =3D yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with lib= iconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS=3D"$am_save_CPPFLAGS" + LIBICONV=3D + LTLIBICONV=3D + fi + + + + + + + use_additional=3Dyes + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + + eval additional_includedir=3D\"$includedir\" + eval additional_libdir=3D\"$libdir\" + + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + +# Check whether --with-libintl-prefix was given. +if test "${with_libintl_prefix+set}" =3D set; then : + withval=3D$with_libintl_prefix; + if test "X$withval" =3D "Xno"; then + use_additional=3Dno + else + if test "X$withval" =3D "X"; then + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + + eval additional_includedir=3D\"$includedir\" + eval additional_libdir=3D\"$libdir\" + + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + else + additional_includedir=3D"$withval/include" + additional_libdir=3D"$withval/lib" + fi + fi + +fi + + +# Check whether --with-libintl-type was given. +if test "${with_libintl_type+set}" =3D set; then : + withval=3D$with_libintl_type; with_libintl_type=3D$withval +else + with_libintl_type=3Dauto +fi + + lib_type=3D`eval echo \$with_libintl_type` + + LIBINTL=3D + LTLIBINTL=3D + INCINTL=3D + rpathdirs=3D + ltrpathdirs=3D + names_already_handled=3D + names_next_round=3D'intl ' + while test -n "$names_next_round"; do + names_this_round=3D"$names_next_round" + names_next_round=3D + for name in $names_this_round; do + already_handled=3D + for n in $names_already_handled; do + if test "$n" =3D "$name"; then + already_handled=3Dyes + break + fi + done + if test -z "$already_handled"; then + names_already_handled=3D"$names_already_handled $name" + uppername=3D`echo "$name" | sed -e 'y|abcdefghijkl= mnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=3D\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" =3D yes; then + eval value=3D\"\$LIB$uppername\" + test -z "$value" || LIBINTL=3D"${LIBINTL}${LIBINTL:+ }$value" + eval value=3D\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL=3D"${LTLIBINTL}${LTLIBINTL:+ }$v= alue" + else + : + fi + else + found_dir=3D + found_la=3D + found_so=3D + found_a=3D + if test $use_additional =3D yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name= .$shlibext" && test x$lib_type !=3D xstatic; then + found_dir=3D"$additional_libdir" + found_so=3D"$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la=3D"$additional_libdir/lib$name.la" + fi + elif test x$lib_type !=3D xshared; then + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir=3D"$additional_libdir" + found_a=3D"$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la=3D"$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" =3D "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + case "$x" in + -L*) + dir=3D`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibe= xt" && test x$lib_type !=3D xstatic; then + found_dir=3D"$dir" + found_so=3D"$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la=3D"$dir/lib$name.la" + fi + elif test x$lib_type !=3D xshared; then + if test -f "$dir/lib$name.$libext"; then + found_dir=3D"$dir" + found_a=3D"$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la=3D"$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" !=3D "X"; then + break + fi + done + fi + if test "X$found_dir" !=3D "X"; then + LTLIBINTL=3D"${LTLIBINTL}${LTLIBINTL:+ }-L$found_d= ir -l$name" + if test "X$found_so" !=3D "X"; then + if test "$enable_r= path" =3D no || test "X$found_dir" =3D "X/usr/lib"; then + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }$found_s= o" + else + = haveit=3D + for x in $ltrpathdirs; do + if test "X$x" =3D "X$found_dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs=3D"$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" =3D yes; then + LIBINTL=3D"${LIBINTL= }${LIBINTL:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardco= de_minus_L" =3D no; then + LIBINTL=3D"${L= IBINTL}${LIBINTL:+ }$found_so" + haveit=3D + for x in $rpathdirs; do + if test "X$x" =3D "X$found_dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + rpathdirs=3D"$rpathdirs $found_dir" + fi + else + = haveit=3D + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-L$found_dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" !=3D no; then + = LIBINTL=3D"${LIBINTL}${LIBINTL:+ }$found_so" + else + = = LIBINTL=3D"${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" !=3D "X"; then + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL=3D"${LIBINTL}${LIB= INTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir=3D + case "$found_dir" in + */lib | */lib/) + basedir=3D`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib= /*$,,'` + additional_includedir=3D"$basedir/include" + ;; + esac + if test "X$additional_includedir" !=3D "X"; then + = if test "X$additional_includedir" != =3D "X/usr/include"; then + haveit=3D + if test "X$additional_includedir" =3D "X/usr/local/include= "; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=3Dyes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-I$additional_includedir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL=3D"${INCINTL}${INCINTL= :+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir=3D"$li= bdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir=3D"$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=3D`echo "X$dep" | sed -e 's/^X-L//'` + = = if test "X$additional_libdir" !=3D "X/usr/lib"; then + haveit=3D + if test "X$additional_libdir" =3D "X/usr/local/lib";= then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=3Dyes;; + esac + fi + fi + if test -z "$haveit"; then + haveit=3D + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-L$additional_libdir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL=3D"${LIBIN= TL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit=3D + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X-L$additional_libdir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL=3D"${LTL= IBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=3D`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" !=3D no; then + haveit=3D + for x in $rpathdirs; do + if test "X$x" =3D "X$dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + rpathdirs=3D"$rpathdirs $dir" + fi + haveit=3D + for x in $ltrpathdirs; do + if test "X$x" =3D "X$dir"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs=3D"$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round=3D"$names_next_ro= und "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + = names_next_round=3D"$names_next_round "`echo "X$dep" | sed -e 's,^X.*= /,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }= $dep" + LTLIBINTL=3D"${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + if test "x$lib= _type" =3D "xauto" || test "x$lib_type" =3D "xshared"; then + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL=3D"${LTLIBINTL}${LTLIBINTL:+ }-l$name" + else + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }-l:lib$name.$libext" + LTLIBINTL=3D"${LTLIBINTL}${LTLIBINTL:+ }-l:lib$name.$libext" + fi + fi + fi + fi + done + done + if test "X$rpathdirs" !=3D "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs=3D + for found_dir in $rpathdirs; do + alldirs=3D"${alldirs}${alldirs:+$hardcode_libdir_separator}$found_= dir" + done + acl_save_libdir=3D"$libdir" + libdir=3D"$alldirs" + eval flag=3D\"$hardcode_libdir_flag_spec\" + libdir=3D"$acl_save_libdir" + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir=3D"$libdir" + libdir=3D"$found_dir" + eval flag=3D\"$hardcode_libdir_flag_spec\" + libdir=3D"$acl_save_libdir" + LIBINTL=3D"${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" !=3D "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL=3D"${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettex= t in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval \${$gt_func_gnugettext_libintl+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_CPPFLAGS=3D"$CPPFLAGS" + CPPFLAGS=3D"$CPPFLAGS $INCINTL" + gt_save_LIBS=3D"$LIBS" + LIBS=3D"$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_al= ias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRE= SSION + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libintl=3Dyes" +else + eval "$gt_func_gnugettext_libintl=3Dno" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if { eval "gt_val=3D\$$gt_func_gnugettext_libintl"= ; test "$gt_val" !=3D yes; } && test -n "$LIBICONV"; then + LIBS=3D"$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_al= ias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRE= SSION + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIBINTL=3D"$LIBINTL $LIBICONV" + LTLIBINTL=3D"$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=3Dyes" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + CPPFLAGS=3D"$gt_save_CPPFLAGS" + LIBS=3D"$gt_save_LIBS" +fi +eval ac_res=3D\$$gt_func_gnugettext_libintl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi + + if { eval "gt_val=3D\$$gt_func_gnu= gettext_libc"; test "$gt_val" =3D "yes"; } \ + || { { eval "gt_val=3D\$$gt_func_gnugettext_libintl"; test "$gt= _val" =3D "yes"; } \ + && test "$PACKAGE" !=3D gettext-runtime \ + && test "$PACKAGE" !=3D gettext-tools; }; then + gt_use_preinstalled_gnugettext=3Dyes + else + LIBINTL=3D + LTLIBINTL=3D + INCINTL=3D + fi + + + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ + || test "$nls_cv_use_gnu_gettext" =3D "yes"; then + LIBINTL=3D"$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL=3D"$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + + if test "$gt_use_preinstalled_gnugettext" =3D "yes" \ + || test "$nls_cv_use_gnu_gettext" =3D "yes"; then + +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + else + USE_NLS=3Dno + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + if test "$USE_NLS" =3D "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext fu= nction comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" =3D "yes"; then + if { eval "gt_val=3D\$$gt_func_gnugettext_libintl"; test "$gt_val" = =3D "yes"; }; then + gt_source=3D"external libintl" + else + gt_source=3D"libc" + fi + else + gt_source=3D"included intl directory" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } + fi + + if test "$USE_NLS" =3D "yes"; then + + if test "$gt_use_preinstalled_gnugettext" =3D "yes"; then + if { eval "gt_val=3D\$$gt_func_gnugettext_libintl"; test "$gt_val" = =3D "yes"; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with= libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } + + for element in $INCINTL; do + haveit=3D + for x in $CPPFLAGS; do + + acl_save_prefix=3D"$prefix" + prefix=3D"$acl_final_prefix" + acl_save_exec_prefix=3D"$exec_prefix" + exec_prefix=3D"$acl_final_exec_prefix" + eval x=3D\"$x\" + exec_prefix=3D"$acl_save_exec_prefix" + prefix=3D"$acl_save_prefix" + + if test "X$x" =3D "X$element"; then + haveit=3Dyes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS=3D"${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + fi + + +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h + + fi + + POSUB=3Dpo + fi + + + + INTLLIBS=3D"$LIBINTL" + + + + + + +fi + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested= " >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } +if test x"$USE_NLS" !=3D xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be ins= talled" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } + # Look for .po and .gmo files in the source directory. + CATALOGS=3D + XLINGUAS=3D + for cat in $srcdir/po/*.gmo $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). + cat=3D`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"` + lang=3D`echo $cat | sed -e "s!\\\\.gmo!!"` + # 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" =3D x; then + CATALOGS=3D"$CATALOGS $cat" + XLINGUAS=3D"$XLINGUAS $lang" + else + case "$LINGUAS" in *$lang*) + CATALOGS=3D"$CATALOGS $cat" + XLINGUAS=3D"$XLINGUAS $lang" + ;; + esac + fi + done + LINGUAS=3D"$XLINGUAS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } + + + DATADIRNAME=3Dshare + + INSTOBJEXT=3D.mo + + GENCAT=3Dgencat + + CATOBJEXT=3D.gmo + +fi + +# Create sub-directories for objects and dependencies. +CONFIG_SRC_SUBDIR=3D"arch gdbsupport nat target" + + +ac_config_commands=3D"$ac_config_commands gdbdepdir" + + +depcc=3D"$CC" am_compiler_list=3D + +am_depcomp=3D$ac_aux_dir/depcomp +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $dep= cc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=3Dnone + if test "$am_compiler_list" =3D ""; then + am_compiler_list=3D`sed -n 's/^\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + if test $depmode =3D none; then break; fi + + $as_echo "$as_me:$LINENO: trying $depmode" >&5 + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "include sub/conftest.Po" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + depcmd=3D"depmode=3D$depmode \ + source=3Dsub/conftest.c object=3Dsub/conftest.${OBJEXT-o} \ + depfile=3Dsub/conftest.Po tmpdepfile=3Dsub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest= .c" + echo "| $depcmd" | sed -e 's/ */ /g' >&5 + if env $depcmd > conftest.err 2>&1 && + grep sub/conftst6.h sub/conftest.Po >>conftest.err 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po >>conftest.err 2>&1 && + ${MAKE-make} -s -f confmf >>conftest.err 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument req= uired + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=3D$depmode + $as_echo "$as_me:$LINENO: success" >&5 + break + fi + fi + $as_echo "$as_me:$LINENO: failure, diagnostics are:" >&5 + sed -e 's/^/| /' < conftest.err >&5 + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=3Dnone +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_co= mpiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +if test x${am_cv_CC_dependencies_compiler_type-none} =3D xnone +then as_fn_error $? "no usable dependency style found" "$LINENO" 5 +else CCDEPMODE=3Ddepmode=3D$am_cv_CC_dependencies_compiler_type + +fi + + +for ac_header in termios.h sys/reg.h string.h sys/procfs.h linux/elf.h = fcntl.h signal.h sys/file.h sys/ioctl.h netinet/in.h sys/socket.h net= db.h netinet/tcp.h arpa/inet.h ws2tcpip.h +do : + as_ac_Header=3D`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_i= ncludes_default" +if eval test \"x\$"$as_ac_Header"\" =3D x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in vfork.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" = "$ac_includes_default" +if test "x$ac_cv_header_vfork_h" =3D xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VFORK_H 1 +_ACEOF + +fi + +done + +for ac_func in fork vfork +do : + as_ac_var=3D`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" =3D x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +if test "x$ac_cv_func_fork" =3D xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 $as_echo_n "checking for working fork... " >&6; } if ${ac_cv_func_fork_works+:} false; then : @@ -13619,6 +15424,13 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1 # INIT-COMMANDS # ac_aux_dir=3D$ac_aux_dir DEPDIR=3D$DEPDIR +# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''=3D"$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS=3D"${LINGUAS-%UNSET%}" + ac_aux_dir=3D$ac_aux_dir DEPDIR=3D$DEPDIR CONFIG_SRC_SUBDIR=3D"$CONFIG_SRC= _SUBDIR" =20 _ACEOF @@ -13631,6 +15443,7 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS=3D"$CONFIG_HEADERS config.h:config.in" ;; "depdir") CONFIG_COMMANDS=3D"$CONFIG_COMMANDS depdir" ;; + "default-1") CONFIG_COMMANDS=3D"$CONFIG_COMMANDS default-1" ;; "gdbdepdir") CONFIG_COMMANDS=3D"$CONFIG_COMMANDS gdbdepdir" ;; "Makefile") CONFIG_FILES=3D"$CONFIG_FILES Makefile" ;; =20 @@ -14190,6 +16003,107 @@ $as_echo "$as_me: executing $ac_file commands" >&= 6;} case $ac_file$ac_mode in "config.h":H) echo > stamp-h ;; "depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;; + "default-1":C) + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=3D`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=3D`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=3D/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=3D`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir=3D"$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=3D`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir=3D"$ac_given_srcdir" ;; + *) top_srcdir=3D"$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || = echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "= /^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\= 1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS=3D"POTFILES.in" + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES de= pend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in con= figure.ac is obsolete" || echo "setting ALL_LINGUAS in configure.ac is obso= lete" + fi + ALL_LINGUAS_=3D`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGU= AS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=3D$ALL_LINGUAS_' + POMAKEFILEDEPS=3D"$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.ac. + eval 'ALL_LINGUAS''=3D$OBSOLETE_ALL_LINGUAS' + fi + case "$ac_given_srcdir" in + .) srcdirpre=3D ;; + *) srcdirpre=3D'$(srcdir)/' ;; + esac + POFILES=3D + GMOFILES=3D + UPDATEPOFILES=3D + DUMMYPOFILES=3D + for lang in $ALL_LINGUAS; do + POFILES=3D"$POFILES $srcdirpre$lang.po" + GMOFILES=3D"$GMOFILES $srcdirpre$lang.gmo" + UPDATEPOFILES=3D"$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES=3D"$DUMMYPOFILES $lang.nop" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS=3D + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=3Dno + if test "%UNSET%" !=3D "$LINGUAS"; then + desiredlanguages=3D"$LINGUAS" + else + desiredlanguages=3D"$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; 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=3Dyes;; + esac + done + if test $useit =3D yes; then + INST_LINGUAS=3D"$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS=3D + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS=3D"$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || = echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =3D/r $ac_dir/POTFILES" -e "/^# Makevars/r $a= c_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILE= S@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES= @|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$PO= MAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done ;; "gdbdepdir":C) for subdir in ${CONFIG_SRC_SUBDIR} do diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefi= le.in index dc76a76bd67..53d77b7a38e 100644 --- a/gprofng/libcollector/Makefile.in +++ b/gprofng/libcollector/Makefile.in @@ -109,15 +109,15 @@ host_triplet =3D @host@ target_triplet =3D @target@ subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps =3D $(top_srcdir)/../../config/depstand.m4 \ - $(top_srcdir)/../../config/lead-dot.m4 \ - $(top_srcdir)/../../config/override.m4 \ - $(top_srcdir)/../../config/warnings.m4 \ - $(top_srcdir)/../../libtool.m4 \ +am__aclocal_m4_deps =3D $(top_srcdir)/../../libtool.m4 \ $(top_srcdir)/../../ltoptions.m4 \ $(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \ + $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ + $(top_srcdir)/../../config/override.m4 \ + $(top_srcdir)/../../config/warnings.m4 \ $(top_srcdir)/../../bfd/version.m4 $(top_srcdir)/configure.ac am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/gprofng/libcollector/aclocal.m4 b/gprofng/libcollector/aclocal= .m4 index 2d13dba8c20..c5a4a54ed82 100644 --- a/gprofng/libcollector/aclocal.m4 +++ b/gprofng/libcollector/aclocal.m4 @@ -1227,12 +1227,12 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR =20 -m4_include([../../config/depstand.m4]) -m4_include([../../config/lead-dot.m4]) -m4_include([../../config/override.m4]) -m4_include([../../config/warnings.m4]) m4_include([../../libtool.m4]) m4_include([../../ltoptions.m4]) m4_include([../../ltsugar.m4]) m4_include([../../ltversion.m4]) m4_include([../../lt~obsolete.m4]) +m4_include([../../config/depstand.m4]) +m4_include([../../config/lead-dot.m4]) +m4_include([../../config/override.m4]) +m4_include([../../config/warnings.m4])