Bug#230821: Patch
Frank Lichtenheld
Frank Lichtenheld <djpig@debian.org>, 230821@bugs.debian.org
Sat, 20 Mar 2004 00:08:39 +0100
--9amGYk9869ThD9tj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
tags 230821 patch
thanks
I prepared a patch for a NMU of this package. However, as I'm not very
confident in this libtools stuff and I had to add an additional
build-depends (seems related to intltool) after regenerating the files
I'm not sure if I should upload.
So only sending the patch for now.
Gruesse,
--
Frank Lichtenheld <djpig@debian.org>
www: http://www.djpig.de/
--9amGYk9869ThD9tj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="gcm.2_1_0+20031016_1-4_1.patch"
Content-Transfer-Encoding: quoted-printable
diff -Naur gcm-2.1.0+20031016.1.bak/Makefile.in gcm-2.1.0+20031016.1/Makefi=
le.in
--- gcm-2.1.0+20031016.1.bak/Makefile.in Wed Oct 15 18:51:26 2003
+++ gcm-2.1.0+20031016.1/Makefile.in Fri Mar 19 21:43:08 2004
@@ -86,6 +86,7 @@
INTLTOOL_DESKTOP_RULE =3D @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE =3D @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE =3D @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE =3D @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE =3D @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE =3D @INTLTOOL_OAF_RULE@
diff -Naur gcm-2.1.0+20031016.1.bak/aclocal.m4 gcm-2.1.0+20031016.1/aclocal=
.m4
--- gcm-2.1.0+20031016.1.bak/aclocal.m4 Wed Oct 15 18:51:15 2003
+++ gcm-2.1.0+20031016.1/aclocal.m4 Fri Mar 19 21:43:05 2004
@@ -10,7 +10,7 @@
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
=20
-# lib-prefix.m4 serial 3 (gettext-0.12.2)
+# lib-prefix.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -718,7 +718,7 @@
done
])
=20
-# lib-ld.m4 serial 2 (gettext-0.12)
+# lib-ld.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -734,11 +734,12 @@
AC_DEFUN([AC_LIB_PROG_LD_GNU],
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
[# I'd rather use --version here, but apparently some GNU ld's only accept=
-v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
- acl_cv_prog_gnu_ld=3Dyes
-else
- acl_cv_prog_gnu_ld=3Dno
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=3Dyes ;;
+*)
+ acl_cv_prog_gnu_ld=3Dno ;;
+esac])
with_gnu_ld=3D$acl_cv_prog_gnu_ld
])
=20
@@ -808,11 +809,12 @@
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some GNU ld's only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > =
/dev/null; then
- test "$with_gnu_ld" !=3D no && break
- else
- test "$with_gnu_ld" !=3D yes && break
- fi
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" !=3D no && break ;;
+ *)
+ test "$with_gnu_ld" !=3D yes && break ;;
+ esac
fi
done
IFS=3D"$ac_save_ifs"
@@ -1092,7 +1094,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
=20
# serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 74 $
+# Debian $Rev: 192 $
=20
=20
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1909,7 +1911,7 @@
lt_cv_dlopen_self=3Dyes
])
;;
- =20
+
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen=3D"shl_load"],
@@ -1998,13 +2000,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
- # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
- # that will create temporary files in the current directory regardless =
of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do para=
llel
- # builds.
- chmod -w .
-
lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -2149,7 +2144,7 @@
*)
AC_MSG_RESULT([no])
;;
- esac =20
+ esac
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
=20
@@ -2518,6 +2513,12 @@
# before this can be enabled.
hardcode_into_libs=3Dyes
=20
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ ld_extra=3D`$SED -e 's/[:,\t]/ /g;s/=3D[^=3D]*$//;s/=3D[^=3D ]* / /g' =
/etc/ld.so.conf`
+ sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -2527,6 +2528,18 @@
dynamic_linker=3D'GNU/Linux ld.so'
;;
=20
+knetbsd*-gnu)
+ version_type=3Dlinux
+ need_lib_prefix=3Dno
+ need_version=3Dno
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec=3D'${libname}${release}${shared_ext}$major'
+ shlibpath_var=3DLD_LIBRARY_PATH
+ shlibpath_overrides_runpath=3Dno
+ hardcode_into_libs=3Dyes
+ dynamic_linker=3D'GNU ld.so'
+ ;;
+
netbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
@@ -2536,7 +2549,7 @@
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker=3D'NetBSD (a.out) ld.so'
else
- library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec=3D'${libname}${release}${shared_ext}$major'
dynamic_linker=3D'NetBSD ld.elf_so'
fi
@@ -2565,7 +2578,7 @@
openbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
- need_version=3Dno
+ need_version=3Dyes
library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=3DLD_LIBRARY_PATH
@@ -3175,24 +3188,20 @@
lt_cv_file_magic_test_file=3D/shlib/libc.so
;;
=20
-cygwin* | mingw* | pw32*)
+cygwin*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method=3D'file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd=3D'win32_libid'
;;
=20
+mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # win32_libid shell function, so use a weaker test based on 'objdump'.
+ lt_cv_deplibs_check_method=3D'file_magic file format pei*-i386(.*archite=
cture: i386)?'
+ lt_cv_file_magic_cmd=3D'$OBJDUMP -f'
+ ;;
+
darwin* | rhapsody*)
- # this will be overwritten by pass_all, but leave it in just in case
- lt_cv_deplibs_check_method=3D'file_magic Mach-O dynamically linked share=
d library'
- lt_cv_file_magic_cmd=3D'/usr/bin/file -L'
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
- lt_cv_file_magic_test_file=3D`/System/Library/Frameworks/System.framew=
ork/System`
- ;;
- *) # Darwin 1.3 on
- lt_cv_file_magic_test_file=3D'/usr/lib/libSystem.dylib'
- ;;
- esac
lt_cv_deplibs_check_method=3Dpass_all
;;
=20
@@ -3235,41 +3244,21 @@
;;
=20
irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
- # this will be overridden with pass_all, but let us keep it just in ca=
se
- lt_cv_deplibs_check_method=3D"file_magic ELF 32-bit MSB dynamic lib MI=
PS - version 1"
- ;;
- *)
- case $LD in
- *-32|*"-32 ") libmagic=3D32-bit;;
- *-n32|*"-n32 ") libmagic=3DN32;;
- *-64|*"-64 ") libmagic=3D64-bit;;
- *) libmagic=3Dnever-match;;
- esac
- # this will be overridden with pass_all, but let us keep it just in ca=
se
- lt_cv_deplibs_check_method=3D"file_magic ELF ${libmagic} MSB mips-[[12=
34]] dynamic lib MIPS - version 1"
- ;;
+ case $LD in
+ *-32|*"-32 ") libmagic=3D32-bit;;
+ *-n32|*"-n32 ") libmagic=3DN32;;
+ *-64|*"-64 ") libmagic=3D64-bit;;
+ *) libmagic=3Dnever-match;;
esac
- lt_cv_file_magic_test_file=3D`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=3Dpass_all
;;
=20
# This must be Linux ELF.
linux*)
- # linux always uses pass_all now, this code is the old way (tm)
- case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390*=
| sh*)
- lt_cv_deplibs_check_method=3Dpass_all ;;
- *)
- # glibc up to 2.1.1 does not perform some relocations on ARM
- lt_cv_deplibs_check_method=3D'file_magic ELF [[0-9]][[0-9]]*-bit [[LM]=
]SB (shared object|dynamic lib )' ;;
- esac
lt_cv_deplibs_check_method=3Dpass_all
- lt_cv_file_magic_test_file=3D`echo /lib/libc.so* /lib/libc-*.so`
;;
=20
-netbsd*)
+netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method=3D'match_pattern /lib[[^/]]+(\.so\.[[0-9]]+=
\.[[0-9]]+|_pic\.a)$'
else
@@ -3298,9 +3287,6 @@
;;
=20
osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method=3D'file_magic COFF format alpha shared librar=
y'
- lt_cv_file_magic_test_file=3D/shlib/libc.so
lt_cv_deplibs_check_method=3Dpass_all
;;
=20
@@ -3310,7 +3296,6 @@
=20
solaris*)
lt_cv_deplibs_check_method=3Dpass_all
- lt_cv_file_magic_test_file=3D/lib/libc.so
;;
=20
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -3576,7 +3561,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to bu=
ild shared libraries])
- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_=
shlib, $1)[[[ ]]" >/dev/null; then :
+ if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_s=
hlib, $1)[[ ]]" >/dev/null; then :
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or C=
FLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=3Dno
@@ -3644,7 +3629,7 @@
;;
10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined dynamic_=
lookup'
- ;; =20
+ ;;
esac
fi
;;
@@ -3662,8 +3647,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=3Dyes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=3Dno
- fi =20
- ;; =20
+ fi
+ ;;
esac
AC_MSG_RESULT([$enable_shared])
=20
@@ -3981,7 +3966,7 @@
;;
10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined dynamic_=
lookup'
- ;; =20
+ ;;
esac
fi
;;
@@ -4267,7 +4252,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)=3D'$LD -Bshareable -o $lib $predep_=
objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=3D
@@ -4911,7 +4896,7 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
- fi =20
+ fi
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -4966,7 +4951,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ =20
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -5732,7 +5717,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=3D'-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=3D'-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=3D'-static'
- ;;=20
+ ;;
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
@@ -5757,7 +5742,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | knetbsd*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -6092,7 +6077,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=3Dunknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=3Dno
_LT_AC_TAGVAR(module_cmds, $1)=3D
- _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D =20
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D
_LT_AC_TAGVAR(always_export_symbols, $1)=3Dno
_LT_AC_TAGVAR(export_symbols_cmds, $1)=3D'$NM $libobjs $convenience | $g=
lobal_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *alw=
ays*
@@ -6197,7 +6182,7 @@
fi
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)=3D'$LD -Bshareable $libobjs $deplibs $lin=
ker_flags -o $lib'
wlarc=3D
@@ -6464,7 +6449,7 @@
;;
10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined dynamic_=
lookup'
- ;; =20
+ ;;
esac
fi
;;
@@ -6492,9 +6477,9 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=3Dunsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=3D'-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=3Dyes
- else =20
+ else
_LT_AC_TAGVAR(ld_shlibs, $1)=3Dno
- fi =20
+ fi
;;
=20
dgux*)
@@ -6614,7 +6599,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=3Dyes
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)=3D'$LD -Bshareable -o $lib $libobjs $depl=
ibs $linker_flags' # a.out
else
@@ -6844,7 +6829,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- =20
+
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=3Dconftest
lib=3Dconftest
@@ -7445,19 +7430,20 @@
AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
=20
+ll## intltool.m4 - Configure intltool for the target system. -*-Shell-scri=
pt-*-
=20
dnl AC_PROG_INTLTOOL([MINIMUM-VERSION])
# serial 1 AC_PROG_INTLTOOL
-AC_DEFUN(AC_PROG_INTLTOOL,
+AC_DEFUN([AC_PROG_INTLTOOL],
[
=20
if test -n "$1"; then
AC_MSG_CHECKING(for intltool >=3D $1)
=20
INTLTOOL_REQUIRED_VERSION_AS_INT=3D`echo $1 | awk -F. '{ printf "%d", =
$[1] * 100 + $[2]; }'`
- INTLTOOL_APPLIED_VERSION=3D`awk -F\" '/\\$VERSION / { printf $[2]; }' =
< ${srcdir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION=3D`awk -F\" '/\\$VERSION / { printf $[2]; }' =
< ${ac_aux_dir}/intltool-update.in`
changequote({{,}})
- INTLTOOL_APPLIED_VERSION_AS_INT=3D`awk -F\" '/\\$VERSION / { split(${{=
2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${src=
dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION_AS_INT=3D`awk -F\" '/\\$VERSION / { split(${{=
2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_=
aux_dir}/intltool-update.in`
changequote([,])
=20
if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VER=
SION_AS_INT"; then
@@ -7480,6 +7466,7 @@
INTLTOOL_UI_RULE=3D'%.ui: %.ui.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_XML_RULE=3D'%.xml: %.xml.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_XAM_RULE=3D'%.xam: %.xml.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_KBD_RULE=3D'%.kbd: %.kbd.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< [$]@ -x -u -m -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_CAVES_RULE=3D'%.caves: %.caves.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_SCHEMAS_RULE=3D'%.schemas: %.schemas.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_THEME_RULE=3D'%.theme: %.theme.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
@@ -7495,6 +7482,7 @@
AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
AC_SUBST(INTLTOOL_UI_RULE)
AC_SUBST(INTLTOOL_XAM_RULE)
+AC_SUBST(INTLTOOL_KBD_RULE)
AC_SUBST(INTLTOOL_XML_RULE)
AC_SUBST(INTLTOOL_CAVES_RULE)
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
@@ -7517,6 +7505,11 @@
if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
AC_MSG_ERROR([perl 5.x required for intltool])
fi
+if `perl -e "require XML::Parser" 2>/dev/null`; then
+:
+else
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+fi
=20
# Remove file type tags (using []) from po/POTFILES.
=20
@@ -7544,7 +7537,7 @@
=20
AC_OUTPUT_COMMANDS([
=20
-sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract=
.in > intltool-extract.out
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-ext=
ract.in > intltool-extract.out
if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
rm -f intltool-extract.out
else
@@ -7553,7 +7546,8 @@
chmod ugo+x intltool-extract
chmod u+w intltool-extract
=20
-sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-merge.i=
n > intltool-merge.out
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" \
+ < ${ac_aux_dir}/intltool-merge.in > intltool-merge.out
if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
rm -f intltool-merge.out
else
@@ -7562,7 +7556,7 @@
chmod ugo+x intltool-merge
chmod u+w intltool-merge
=20
-sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-update.=
in > intltool-update.out
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-upd=
ate.in > intltool-update.out
if cmp -s intltool-update intltool-update.out 2>/dev/null; then
rm -f intltool-update.out
else
@@ -7571,7 +7565,7 @@
chmod ugo+x intltool-update
chmod u+w intltool-update
=20
-], INTLTOOL_PERL=3D${INTLTOOL_PERL})
+], INTLTOOL_PERL=3D${INTLTOOL_PERL} ac_aux_dir=3D${ac_aux_dir})
=20
])
=20
diff -Naur gcm-2.1.0+20031016.1.bak/configure gcm-2.1.0+20031016.1/configure
--- gcm-2.1.0+20031016.1.bak/configure Wed Oct 15 18:51:31 2003
+++ gcm-2.1.0+20031016.1/configure Fri Mar 19 21:43:22 2004
@@ -1,11 +1,10 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for gcm 2.1.0.
+# Generated by GNU Autoconf 2.59 for gcm 2.1.0.
#
# Report bugs to <"http://bugzilla.gnome.org">.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -22,9 +21,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=3D1; export DUALCASE # for MKS sh
=20
# Support unset when possible.
-if (FOO=3DFOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=3D60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=3Dunset
else
as_unset=3Dfalse
@@ -43,7 +43,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
eval $as_var=3DC; export $as_var
else
$as_unset $as_var
@@ -220,16 +220,17 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=3D:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=3Dfalse
fi
=20
as_executable_p=3D"test -f"
=20
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp=3D"sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp=3D"eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnu=
m]%_%g'"
=20
# Sed expression to map a string onto a valid variable name.
-as_tr_sh=3D"sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh=3D"eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
=20
=20
# IFS
@@ -467,7 +468,7 @@
ac_subdirs_all=3D"$ac_subdirs_all libgcm"
ac_subdirs_all=3D"$ac_subdirs_all librtftohtml"
ac_subdirs_all=3D"$ac_subdirs_all gcmapplet"
-ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE=
_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf=
orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals=
tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali=
as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRI=
PT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEIN=
FO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS =
ac_ct_CXX CPP EGREP build build_cpu build_vendor build_os host host_cpu hos=
t_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRI=
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG GCM_CFLAGS GCM_LIBS SED_CO=
NFIG GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DAT=
ADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALS=
E POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE=
INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE=
INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_=
UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SC=
HEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPD=
ATE INTLTOOL_PERL NO_PREFIX_PIXMAPS_DIR PIXMAPS_DIR NO_PREFIX_MENU_DIR MENU=
_DIR subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE=
_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf=
orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals=
tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali=
as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRI=
PT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEIN=
FO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS =
ac_ct_CXX CPP EGREP build build_cpu build_vendor build_os host host_cpu hos=
t_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRI=
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG GCM_CFLAGS GCM_LIBS SED_CO=
NFIG GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DAT=
ADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALS=
E POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE=
INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE=
INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_=
UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVE=
S_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_=
MERGE INTLTOOL_UPDATE INTLTOOL_PERL NO_PREFIX_PIXMAPS_DIR PIXMAPS_DIR NO_PR=
EFIX_MENU_DIR MENU_DIR subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=3D''
=20
# Initialize some variables set by options.
@@ -826,7 +827,7 @@
=20
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=3D$`echo $ac_var`
case $ac_val in
@@ -866,10 +867,10 @@
# Try the directory containing this script, then its parent.
ac_confdir=3D`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -981,9 +982,9 @@
cat <<_ACEOF
Installation directories:
--prefix=3DPREFIX install architecture-independent files in PREF=
IX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=3DEPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
=20
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1097,12 +1098,45 @@
ac_srcdir=3D$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=3D$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can =
be
-# absolute.
-ac_abs_builddir=3D`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=3D`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=3D`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=3D`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir=3D"$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=3D`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir=3D"$ac_dir";;
+ *) ac_abs_builddir=3D`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=3D$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=3D$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=3D$ac_srcdir;;
+ *) ac_abs_srcdir=3D$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=3D$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
=20
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
@@ -1113,7 +1147,7 @@
echo
$SHELL $ac_srcdir/configure --help=3Drecursive
elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
+ test -f $ac_srcdir/configure.in; then
echo
$ac_configure --help
else
@@ -1127,10 +1161,9 @@
if $ac_init_version; then
cat <<\_ACEOF
gcm configure 2.1.0
-generated by GNU Autoconf 2.57
+generated by GNU Autoconf 2.59
=20
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1142,7 +1175,7 @@
running configure, to aid debugging if configure makes a mistake.
=20
It was created by gcm $as_me 2.1.0, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
=20
$ $0 $@
=20
@@ -1219,19 +1252,19 @@
2)
ac_configure_args1=3D"$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next =3D true; then
- ac_must_keep_next=3Dfalse # Got value, back to normal.
+ ac_must_keep_next=3Dfalse # Got value, back to normal.
else
- case $ac_arg in
- *=3D* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=3Dtrue ;;
- esac
+ case $ac_arg in
+ *=3D* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=3Dtrue ;;
+ esac
fi
ac_configure_args=3D"$ac_configure_args$ac_sep'$ac_arg'"
# Get rid of the leading space.
@@ -1265,12 +1298,12 @@
case `(ac_space=3D'"'"' '"'"'; set | grep ac_space) 2>&1` in
*ac_space=3D\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'"'"=
'\\2'"'"'/p"
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'"'"'\\2=
'"'"'/p"
;;
*)
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\=
2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\2/p"
;;
esac;
}
@@ -1299,7 +1332,7 @@
for ac_var in $ac_subst_files
do
eval ac_val=3D$`echo $ac_var`
- echo "$ac_var=3D'"'"'$ac_val'"'"'"
+ echo "$ac_var=3D'"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -1398,7 +1431,7 @@
# value.
ac_cache_corrupted=3Dfalse
for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=3D.*/\1/p'`; do
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=3D.*/\1/p'`; do
eval ac_old_set=3D\$ac_cv_env_${ac_var}_set
eval ac_new_set=3D\$ac_env_${ac_var}_set
eval ac_old_val=3D"\$ac_cv_env_${ac_var}_value"
@@ -1415,13 +1448,13 @@
,);;
*)
if test "x$ac_old_val" !=3D "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the pr=
evious run:" >&5
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous =
run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=3D:
+ ac_cache_corrupted=3D:
fi;;
esac
# Pass precious variables to config.status.
@@ -1515,6 +1548,7 @@
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -1531,6 +1565,7 @@
case $as_dir/ in
./ | .// | /cC/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1538,20 +1573,20 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog =3D install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; th=
en
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog =3D install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; th=
en
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog =3D install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog =3D install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
done
done
;;
@@ -1641,7 +1676,7 @@
=20
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=3D`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=3D`echo "$2" | sed 'y,:./+-,___p_,'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" =3D set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2115,7 +2150,6 @@
(exit $ac_status); }
=20
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2135,8 +2169,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C"=
>&6
ac_link_default=3D`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
@@ -2156,23 +2190,23 @@
test -f "$ac_file" || continue
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
o | *.obj )
- ;;
+ ;;
conftest.$ac_ext )
- # This is the source file.
- ;;
+ # This is the source file.
+ ;;
[ab].out )
- # We found the default executable, but exeext=3D'' is most
- # certainly right.
- break;;
+ # We found the default executable, but exeext=3D'' is most
+ # certainly right.
+ break;;
*.* )
- ac_cv_exeext=3D`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
+ ac_cv_exeext=3D`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
+ # but it would be cool to find out if it's true. Does anybody
+ # maintain Libtool? --akim.
+ export ac_cv_exeext
+ break;;
* )
- break;;
+ break;;
esac
done
else
@@ -2246,8 +2280,8 @@
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
o | *.obj ) ;;
*.* ) ac_cv_exeext=3D`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
+ export ac_cv_exeext
+ break;;
* ) break;;
esac
done
@@ -2272,7 +2306,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2323,7 +2356,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2343,11 +2375,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -2360,7 +2401,7 @@
=20
ac_compiler_gnu=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=3D$ac_compiler_gnu
=20
fi
@@ -2376,7 +2417,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2393,11 +2433,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -2410,7 +2459,7 @@
=20
ac_cv_prog_cc_g=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2437,7 +2486,6 @@
ac_cv_prog_cc_stdc=3Dno
ac_save_CC=3D$CC
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2465,6 +2513,16 @@
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!=3D'x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'=3D=3D0 to get some=
thing
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' =3D=3D 0 ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2491,11 +2549,20 @@
CC=3D"$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -2508,7 +2575,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=3D$ac_save_CC
@@ -2536,11 +2603,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -2555,7 +2631,6 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2573,11 +2648,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -2590,9 +2674,8 @@
=20
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2609,11 +2692,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -2625,7 +2717,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -2639,7 +2731,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=3Dc
ac_cpp=3D'$CPP $CPPFLAGS'
ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2656,7 +2748,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-lcposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2680,11 +2771,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -2697,7 +2797,8 @@
=20
ac_cv_lib_cposix_strerror=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
@@ -3049,7 +3150,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3069,11 +3169,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3086,7 +3195,7 @@
=20
ac_compiler_gnu=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=3D$ac_compiler_gnu
=20
fi
@@ -3102,7 +3211,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3119,11 +3227,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3136,7 +3253,7 @@
=20
ac_cv_prog_cc_g=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -3163,7 +3280,6 @@
ac_cv_prog_cc_stdc=3Dno
ac_save_CC=3D$CC
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3191,6 +3307,16 @@
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!=3D'x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'=3D=3D0 to get some=
thing
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' =3D=3D 0 ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -3217,11 +3343,20 @@
CC=3D"$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3234,7 +3369,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=3D$ac_save_CC
@@ -3262,11 +3397,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3281,7 +3425,6 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3299,11 +3442,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3316,9 +3468,8 @@
=20
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3335,11 +3486,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3351,7 +3511,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -3365,7 +3525,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=3Dc
ac_cpp=3D'$CPP $CPPFLAGS'
ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3491,7 +3651,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3511,11 +3670,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3528,7 +3696,7 @@
=20
ac_compiler_gnu=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=3D$ac_compiler_gnu
=20
fi
@@ -3544,7 +3712,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3561,11 +3728,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3578,7 +3754,7 @@
=20
ac_cv_prog_cxx_g=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
@@ -3606,7 +3782,6 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3624,11 +3799,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3641,9 +3825,8 @@
=20
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3660,11 +3843,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3676,7 +3868,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -3711,7 +3903,6 @@
do
CC=3D"$ac_save_CC $ac_arg"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3758,11 +3949,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -3774,7 +3974,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
CC=3D"$ac_save_CC"
=20
@@ -3820,7 +4020,6 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3831,7 +4030,7 @@
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3843,6 +4042,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_c_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=3D
fi
@@ -3863,7 +4063,6 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3881,6 +4080,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_c_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=3D
fi
@@ -3927,7 +4127,6 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3938,7 +4137,7 @@
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3950,6 +4149,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_c_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=3D
fi
@@ -3970,7 +4170,6 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3988,6 +4187,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_c_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=3D
fi
@@ -4048,7 +4248,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4069,11 +4268,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -4086,12 +4294,11 @@
=20
ac_cv_header_stdc=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
=20
if test $ac_cv_header_stdc =3D yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4113,7 +4320,6 @@
if test $ac_cv_header_stdc =3D yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4138,7 +4344,6 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4150,9 +4355,9 @@
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <=3D (c) && (c) <=3D 'i') \
- || ('j' <=3D (c) && (c) <=3D 'r') \
- || ('s' <=3D (c) && (c) <=3D 'z'))
+ (('a' <=3D (c) && (c) <=3D 'i') \
+ || ('j' <=3D (c) && (c) <=3D 'r') \
+ || ('s' <=3D (c) && (c) <=3D 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
=20
@@ -4163,7 +4368,7 @@
int i;
for (i =3D 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) !=3D TOUPPER (i))
+ || toupper (i) !=3D TOUPPER (i))
exit(2);
exit (0);
}
@@ -4599,24 +4804,20 @@
lt_cv_file_magic_test_file=3D/shlib/libc.so
;;
=20
-cygwin* | mingw* | pw32*)
+cygwin*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method=3D'file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd=3D'win32_libid'
;;
=20
+mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # win32_libid shell function, so use a weaker test based on 'objdump'.
+ lt_cv_deplibs_check_method=3D'file_magic file format pei*-i386(.*archite=
cture: i386)?'
+ lt_cv_file_magic_cmd=3D'$OBJDUMP -f'
+ ;;
+
darwin* | rhapsody*)
- # this will be overwritten by pass_all, but leave it in just in case
- lt_cv_deplibs_check_method=3D'file_magic Mach-O dynamically linked share=
d library'
- lt_cv_file_magic_cmd=3D'/usr/bin/file -L'
- case "$host_os" in
- rhapsody* | darwin1.[012])
- lt_cv_file_magic_test_file=3D`/System/Library/Frameworks/System.framew=
ork/System`
- ;;
- *) # Darwin 1.3 on
- lt_cv_file_magic_test_file=3D'/usr/lib/libSystem.dylib'
- ;;
- esac
lt_cv_deplibs_check_method=3Dpass_all
;;
=20
@@ -4659,41 +4860,21 @@
;;
=20
irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
- # this will be overridden with pass_all, but let us keep it just in ca=
se
- lt_cv_deplibs_check_method=3D"file_magic ELF 32-bit MSB dynamic lib MI=
PS - version 1"
- ;;
- *)
- case $LD in
- *-32|*"-32 ") libmagic=3D32-bit;;
- *-n32|*"-n32 ") libmagic=3DN32;;
- *-64|*"-64 ") libmagic=3D64-bit;;
- *) libmagic=3Dnever-match;;
- esac
- # this will be overridden with pass_all, but let us keep it just in ca=
se
- lt_cv_deplibs_check_method=3D"file_magic ELF ${libmagic} MSB mips-[123=
4] dynamic lib MIPS - version 1"
- ;;
+ case $LD in
+ *-32|*"-32 ") libmagic=3D32-bit;;
+ *-n32|*"-n32 ") libmagic=3DN32;;
+ *-64|*"-64 ") libmagic=3D64-bit;;
+ *) libmagic=3Dnever-match;;
esac
- lt_cv_file_magic_test_file=3D`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=3Dpass_all
;;
=20
# This must be Linux ELF.
linux*)
- # linux always uses pass_all now, this code is the old way (tm)
- case $host_cpu in
- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390*=
| sh*)
- lt_cv_deplibs_check_method=3Dpass_all ;;
- *)
- # glibc up to 2.1.1 does not perform some relocations on ARM
- lt_cv_deplibs_check_method=3D'file_magic ELF [0-9][0-9]*-bit [LM]SB (s=
hared object|dynamic lib )' ;;
- esac
lt_cv_deplibs_check_method=3Dpass_all
- lt_cv_file_magic_test_file=3D`echo /lib/libc.so* /lib/libc-*.so`
;;
=20
-netbsd*)
+netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method=3D'match_pattern /lib[^/]+(\.so\.[0-9]+\.[0=
-9]+|_pic\.a)$'
else
@@ -4722,9 +4903,6 @@
;;
=20
osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method=3D'file_magic COFF format alpha shared librar=
y'
- lt_cv_file_magic_test_file=3D/shlib/libc.so
lt_cv_deplibs_check_method=3Dpass_all
;;
=20
@@ -4734,7 +4912,6 @@
=20
solaris*)
lt_cv_deplibs_check_method=3Dpass_all
- lt_cv_file_magic_test_file=3D/lib/libc.so
;;
=20
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -4813,7 +4990,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4816 "configure"' > conftest.$ac_ext
+ echo '#line 4993 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=3D$?
@@ -4910,7 +5087,6 @@
ac_compiler_gnu=3D$ac_cv_c_compiler_gnu
=20
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4927,11 +5103,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -4944,7 +5129,8 @@
=20
lt_cv_cc_needs_belf=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=3Dc
ac_cpp=3D'$CPP $CPPFLAGS'
ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4976,7 +5162,7 @@
=20
=20
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings=
.h \
- inttypes.h stdint.h unistd.h
+ inttypes.h stdint.h unistd.h
do
as_ac_Header=3D`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -4985,7 +5171,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4997,11 +5182,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -5014,7 +5208,7 @@
=20
eval "$as_ac_Header=3Dno"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -5045,7 +5239,6 @@
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5056,11 +5249,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -5073,7 +5275,7 @@
=20
ac_header_compiler=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
=20
@@ -5081,7 +5283,6 @@
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5099,6 +5300,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_c_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=3D
fi
@@ -5118,33 +5320,32 @@
echo "${ECHO_T}$ac_header_preproc" >&6
=20
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,=
rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by t=
he preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compi=
ler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" =
>&2;}
+ ac_header_preproc=3Dyes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be com=
piled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequ=
isite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?=
" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing pre=
requisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite head=
ers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf document=
ation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But=
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Com=
piled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compil=
er will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take p=
recedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ------------------------------------------ ##
+## Report this to "http://bugzilla.gnome.org" ##
+## ------------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -5155,7 +5356,7 @@
if eval "test \"\${$as_ac_Header+set}\" =3D set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=3D$ac_header_preproc"
+ eval "$as_ac_Header=3D\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -5194,7 +5395,6 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5205,7 +5405,7 @@
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5217,6 +5417,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=3D
fi
@@ -5237,7 +5438,6 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5255,6 +5455,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=3D
fi
@@ -5301,7 +5502,6 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5312,7 +5512,7 @@
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5324,6 +5524,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=3D
fi
@@ -5344,7 +5545,6 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5362,6 +5562,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=3D
fi
@@ -5406,7 +5607,7 @@
ac_link=3D'$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $L=
IBS >&5'
ac_compiler_gnu=3D$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 lf95 g95
+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a =
program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=3D$2
@@ -5448,7 +5649,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=3D$F77
- for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 lf95 g95
+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
do
# Extract the first word of "$ac_prog", so it can be a program name with=
args.
set dummy $ac_prog; ac_word=3D$2
@@ -5493,7 +5694,7 @@
=20
=20
# Provide some information about the compiler.
-echo "$as_me:5496:" \
+echo "$as_me:5697:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=3D`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") =
>&5
@@ -5511,9 +5712,10 @@
ac_status=3D$?
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); }
+rm -f a.out
=20
# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.
+# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=3D$ac_ext
ac_ext=3DF
echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 com=
piler" >&5
@@ -5531,11 +5733,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -5548,14 +5759,13 @@
=20
ac_compiler_gnu=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_f77_compiler_gnu=3D$ac_compiler_gnu
=20
fi
echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
ac_ext=3D$ac_save_ext
-G77=3D`test $ac_compiler_gnu =3D yes && echo yes`
ac_test_FFLAGS=3D${FFLAGS+set}
ac_save_FFLAGS=3D$FFLAGS
FFLAGS=3D
@@ -5572,11 +5782,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -5589,7 +5808,7 @@
=20
ac_cv_prog_f77_g=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
=20
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
@@ -5597,18 +5816,20 @@
if test "$ac_test_FFLAGS" =3D set; then
FFLAGS=3D$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g =3D yes; then
- if test "$G77" =3D yes; then
+ if test "x$ac_cv_f77_compiler_gnu" =3D xyes; then
FFLAGS=3D"-g -O2"
else
FFLAGS=3D"-g"
fi
else
- if test "$G77" =3D yes; then
+ if test "x$ac_cv_f77_compiler_gnu" =3D xyes; then
FFLAGS=3D"-O2"
else
FFLAGS=3D
fi
fi
+
+G77=3D`test $ac_compiler_gnu =3D yes && echo yes`
ac_ext=3Dc
ac_cpp=3D'$CPP $CPPFLAGS'
ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6505,11 +6726,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6508: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6729: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=3D$?
cat conftest.err >&5
- echo "$as_me:6512: \$? =3D $ac_status" >&5
+ echo "$as_me:6733: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6738,11 +6959,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6741: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6962: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=3D$?
cat conftest.err >&5
- echo "$as_me:6745: \$? =3D $ac_status" >&5
+ echo "$as_me:6966: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6789,13 +7010,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
- # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
- # that will create temporary files in the current directory regardless =
of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do para=
llel
- # builds.
- chmod -w .
-
lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -6805,11 +7019,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6808: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7022: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=3D$?
cat out/conftest.err >&5
- echo "$as_me:6812: \$? =3D $ac_status" >&5
+ echo "$as_me:7026: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -6982,7 +7196,7 @@
fi
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds=3D'$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=3D
@@ -7173,7 +7387,6 @@
allow_undefined_flag=3D'-berok'
# Determine the default libpath from the value encoded in an empty =
executable.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7190,11 +7403,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -7211,7 +7433,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -7224,7 +7447,6 @@
else
# Determine the default libpath from the value encoded in an empty execu=
table.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7241,11 +7463,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -7262,7 +7493,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -7481,7 +7713,7 @@
link_all_deplibs=3Dyes
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds=3D'$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' =
# a.out
else
@@ -8115,6 +8347,12 @@
# before this can be enabled.
hardcode_into_libs=3Dyes
=20
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+ sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -8124,6 +8362,18 @@
dynamic_linker=3D'GNU/Linux ld.so'
;;
=20
+knetbsd*-gnu)
+ version_type=3Dlinux
+ need_lib_prefix=3Dno
+ need_version=3Dno
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec=3D'${libname}${release}${shared_ext}$major'
+ shlibpath_var=3DLD_LIBRARY_PATH
+ shlibpath_overrides_runpath=3Dno
+ hardcode_into_libs=3Dyes
+ dynamic_linker=3D'GNU ld.so'
+ ;;
+
netbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
@@ -8133,7 +8383,7 @@
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker=3D'NetBSD (a.out) ld.so'
else
- library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec=3D'${libname}${release}${shared_ext}$major'
dynamic_linker=3D'NetBSD ld.elf_so'
fi
@@ -8162,7 +8412,7 @@
openbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
- need_version=3Dno
+ need_version=3Dyes
library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=3DLD_LIBRARY_PATH
@@ -8381,7 +8631,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8405,11 +8654,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -8422,7 +8680,8 @@
=20
ac_cv_lib_dl_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -8446,21 +8705,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares sh=
l_load.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shl_load innocuous_shl_load
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef shl_load
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -8491,11 +8757,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -8508,7 +8783,8 @@
=20
ac_cv_func_shl_load=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -8523,7 +8799,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8547,11 +8822,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -8564,7 +8848,8 @@
=20
ac_cv_lib_dld_shl_load=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -8578,21 +8863,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlop=
en.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define dlopen innocuous_dlopen
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef dlopen
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -8623,11 +8915,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -8640,7 +8941,8 @@
=20
ac_cv_func_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -8655,7 +8957,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8679,11 +8980,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -8696,7 +9006,8 @@
=20
ac_cv_lib_dl_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -8712,7 +9023,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-lsvld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8736,11 +9046,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -8753,7 +9072,8 @@
=20
ac_cv_lib_svld_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -8769,7 +9089,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8793,11 +9112,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -8810,7 +9138,8 @@
=20
ac_cv_lib_dld_dld_link=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -8865,7 +9194,7 @@
lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
lt_status=3D$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8868 "configure"
+#line 9197 "configure"
#include "confdefs.h"
=20
#if HAVE_DLFCN_H
@@ -8963,7 +9292,7 @@
lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
lt_status=3D$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8966 "configure"
+#line 9295 "configure"
#include "confdefs.h"
=20
#if HAVE_DLFCN_H
@@ -10012,7 +10341,6 @@
allow_undefined_flag_CXX=3D'-berok'
# Determine the default libpath from the value encoded in an empty e=
xecutable.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -10029,11 +10357,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -10050,7 +10387,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec_CXX=3D'${wl}-blibpath:$libdir:'"$aix_libpa=
th"
@@ -10064,7 +10402,6 @@
else
# Determine the default libpath from the value encoded in an empty execut=
able.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -10081,11 +10418,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -10102,7 +10448,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec_CXX=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10456,7 +10803,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX=3D'$LD -Bshareable -o $lib $predep_objects $libobj=
s $deplibs $postdep_objects $linker_flags'
wlarc=3D
@@ -11011,7 +11358,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | knetbsd*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -11122,11 +11469,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11125: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=3D$?
cat conftest.err >&5
- echo "$as_me:11129: \$? =3D $ac_status" >&5
+ echo "$as_me:11476: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11173,13 +11520,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
- # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
- # that will create temporary files in the current directory regardless =
of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do para=
llel
- # builds.
- chmod -w .
-
lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -11189,11 +11529,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11192: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11532: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=3D$?
cat out/conftest.err >&5
- echo "$as_me:11196: \$? =3D $ac_status" >&5
+ echo "$as_me:11536: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11696,6 +12036,12 @@
# before this can be enabled.
hardcode_into_libs=3Dyes
=20
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+ sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -11705,6 +12051,18 @@
dynamic_linker=3D'GNU/Linux ld.so'
;;
=20
+knetbsd*-gnu)
+ version_type=3Dlinux
+ need_lib_prefix=3Dno
+ need_version=3Dno
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec=3D'${libname}${release}${shared_ext}$major'
+ shlibpath_var=3DLD_LIBRARY_PATH
+ shlibpath_overrides_runpath=3Dno
+ hardcode_into_libs=3Dyes
+ dynamic_linker=3D'GNU ld.so'
+ ;;
+
netbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
@@ -11714,7 +12072,7 @@
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker=3D'NetBSD (a.out) ld.so'
else
- library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec=3D'${libname}${release}${shared_ext}$major'
dynamic_linker=3D'NetBSD ld.elf_so'
fi
@@ -11743,7 +12101,7 @@
openbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
- need_version=3Dno
+ need_version=3Dyes
library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=3DLD_LIBRARY_PATH
@@ -11962,7 +12320,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -11986,11 +12343,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -12003,7 +12369,8 @@
=20
ac_cv_lib_dl_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -12027,21 +12394,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares sh=
l_load.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shl_load innocuous_shl_load
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef shl_load
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -12072,11 +12446,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -12089,7 +12472,8 @@
=20
ac_cv_func_shl_load=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -12104,7 +12488,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -12128,11 +12511,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -12145,7 +12537,8 @@
=20
ac_cv_lib_dld_shl_load=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -12159,21 +12552,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlop=
en.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define dlopen innocuous_dlopen
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef dlopen
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -12204,11 +12604,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -12221,7 +12630,8 @@
=20
ac_cv_func_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -12236,7 +12646,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -12260,11 +12669,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -12277,7 +12695,8 @@
=20
ac_cv_lib_dl_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -12293,7 +12712,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-lsvld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -12317,11 +12735,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -12334,7 +12761,8 @@
=20
ac_cv_lib_svld_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -12350,7 +12778,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -12374,11 +12801,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -12391,7 +12827,8 @@
=20
ac_cv_lib_dld_dld_link=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -12446,7 +12883,7 @@
lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
lt_status=3D$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12449 "configure"
+#line 12886 "configure"
#include "confdefs.h"
=20
#if HAVE_DLFCN_H
@@ -12544,7 +12981,7 @@
lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
lt_status=3D$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12547 "configure"
+#line 12984 "configure"
#include "confdefs.h"
=20
#if HAVE_DLFCN_H
@@ -13371,11 +13808,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13374: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13811: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=3D$?
cat conftest.err >&5
- echo "$as_me:13378: \$? =3D $ac_status" >&5
+ echo "$as_me:13815: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13422,13 +13859,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
- # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
- # that will create temporary files in the current directory regardless =
of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do para=
llel
- # builds.
- chmod -w .
-
lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -13438,11 +13868,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13441: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13871: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=3D$?
cat out/conftest.err >&5
- echo "$as_me:13445: \$? =3D $ac_status" >&5
+ echo "$as_me:13875: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13615,7 +14045,7 @@
fi
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77=3D'$LD -Bshareable $libobjs $deplibs $linker_flags -o $l=
ib'
wlarc=3D
@@ -13812,11 +14242,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -13833,7 +14272,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec_F77=3D'${wl}-blibpath:$libdir:'"$aix_libp=
ath"
@@ -13852,11 +14292,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -13873,7 +14322,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec_F77=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -14092,7 +14542,7 @@
link_all_deplibs_F77=3Dyes
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77=3D'$LD -Bshareable -o $lib $libobjs $deplibs $linker_fla=
gs' # a.out
else
@@ -14726,6 +15176,12 @@
# before this can be enabled.
hardcode_into_libs=3Dyes
=20
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+ sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -14735,6 +15191,18 @@
dynamic_linker=3D'GNU/Linux ld.so'
;;
=20
+knetbsd*-gnu)
+ version_type=3Dlinux
+ need_lib_prefix=3Dno
+ need_version=3Dno
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec=3D'${libname}${release}${shared_ext}$major'
+ shlibpath_var=3DLD_LIBRARY_PATH
+ shlibpath_overrides_runpath=3Dno
+ hardcode_into_libs=3Dyes
+ dynamic_linker=3D'GNU ld.so'
+ ;;
+
netbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
@@ -14744,7 +15212,7 @@
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker=3D'NetBSD (a.out) ld.so'
else
- library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec=3D'${libname}${release}${shared_ext}$major'
dynamic_linker=3D'NetBSD ld.elf_so'
fi
@@ -14773,7 +15241,7 @@
openbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
- need_version=3Dno
+ need_version=3Dyes
library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=3DLD_LIBRARY_PATH
@@ -15432,11 +15900,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15435: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15903: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=3D$?
cat conftest.err >&5
- echo "$as_me:15439: \$? =3D $ac_status" >&5
+ echo "$as_me:15907: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15665,11 +16133,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15668: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16136: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=3D$?
cat conftest.err >&5
- echo "$as_me:15672: \$? =3D $ac_status" >&5
+ echo "$as_me:16140: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15716,13 +16184,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
- # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
- # that will create temporary files in the current directory regardless =
of
- # the output directory. Thus, making CWD read-only will cause this test
- # to fail, enabling locking or at least warning the user not to do para=
llel
- # builds.
- chmod -w .
-
lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -15732,11 +16193,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15735: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16196: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=3D$?
cat out/conftest.err >&5
- echo "$as_me:15739: \$? =3D $ac_status" >&5
+ echo "$as_me:16200: \$? =3D $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15909,7 +16370,7 @@
fi
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ=3D'$LD -Bshareable $libobjs $deplibs $linker_flags -o $l=
ib'
wlarc=3D
@@ -16100,7 +16561,6 @@
allow_undefined_flag_GCJ=3D'-berok'
# Determine the default libpath from the value encoded in an empty =
executable.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -16117,11 +16577,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -16138,7 +16607,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec_GCJ=3D'${wl}-blibpath:$libdir:'"$aix_libp=
ath"
@@ -16151,7 +16621,6 @@
else
# Determine the default libpath from the value encoded in an empty execu=
table.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -16168,11 +16637,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -16189,7 +16667,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
=20
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
hardcode_libdir_flag_spec_GCJ=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -16408,7 +16887,7 @@
link_all_deplibs_GCJ=3Dyes
;;
=20
- netbsd*)
+ netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ=3D'$LD -Bshareable -o $lib $libobjs $deplibs $linker_fla=
gs' # a.out
else
@@ -17042,6 +17521,12 @@
# before this can be enabled.
hardcode_into_libs=3Dyes
=20
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+ sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -17051,6 +17536,18 @@
dynamic_linker=3D'GNU/Linux ld.so'
;;
=20
+knetbsd*-gnu)
+ version_type=3Dlinux
+ need_lib_prefix=3Dno
+ need_version=3Dno
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec=3D'${libname}${release}${shared_ext}$major'
+ shlibpath_var=3DLD_LIBRARY_PATH
+ shlibpath_overrides_runpath=3Dno
+ hardcode_into_libs=3Dyes
+ dynamic_linker=3D'GNU ld.so'
+ ;;
+
netbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
@@ -17060,7 +17557,7 @@
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker=3D'NetBSD (a.out) ld.so'
else
- library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+ library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec=3D'${libname}${release}${shared_ext}$major'
dynamic_linker=3D'NetBSD ld.elf_so'
fi
@@ -17089,7 +17586,7 @@
openbsd*)
version_type=3Dsunos
need_lib_prefix=3Dno
- need_version=3Dno
+ need_version=3Dyes
library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=3DLD_LIBRARY_PATH
@@ -17308,7 +17805,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17332,11 +17828,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
- echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -17349,7 +17854,8 @@
=20
ac_cv_lib_dl_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -17373,21 +17879,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares sh=
l_load.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shl_load innocuous_shl_load
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef shl_load
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -17418,11 +17931,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -17435,7 +17957,8 @@
=20
ac_cv_func_shl_load=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -17450,7 +17973,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17474,11 +17996,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -17491,7 +18022,8 @@
=20
ac_cv_lib_dld_shl_load=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -17505,21 +18037,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlop=
en.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define dlopen innocuous_dlopen
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef dlopen
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -17550,11 +18089,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -17567,7 +18115,8 @@
=20
ac_cv_func_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -17582,7 +18131,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17606,11 +18154,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -17623,7 +18180,8 @@
=20
ac_cv_lib_dl_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -17639,7 +18197,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-lsvld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17663,11 +18220,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -17680,7 +18246,8 @@
=20
ac_cv_lib_svld_dlopen=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -17696,7 +18263,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17720,11 +18286,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -17737,7 +18312,8 @@
=20
ac_cv_lib_dld_dld_link=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -17792,7 +18368,7 @@
lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
lt_status=3D$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17795 "configure"
+#line 18371 "configure"
#include "confdefs.h"
=20
#if HAVE_DLFCN_H
@@ -17890,7 +18466,7 @@
lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
lt_status=3D$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17893 "configure"
+#line 18469 "configure"
#include "confdefs.h"
=20
#if HAVE_DLFCN_H
@@ -19111,7 +19687,6 @@
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19122,11 +19697,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19139,7 +19723,7 @@
=20
ac_header_compiler=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
=20
@@ -19147,7 +19731,6 @@
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19165,6 +19748,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_c_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=3D
fi
@@ -19184,33 +19768,32 @@
echo "${ECHO_T}$ac_header_preproc" >&6
=20
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,=
rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by t=
he preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compi=
ler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" =
>&2;}
+ ac_header_preproc=3Dyes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be com=
piled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequ=
isite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?=
" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing pre=
requisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite head=
ers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf document=
ation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But=
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Com=
piled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compil=
er will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take p=
recedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ------------------------------------------ ##
+## Report this to "http://bugzilla.gnome.org" ##
+## ------------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -19221,7 +19804,7 @@
if eval "test \"\${$as_ac_Header+set}\" =3D set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=3D$ac_header_preproc"
+ eval "$as_ac_Header=3D\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -19243,7 +19826,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19260,11 +19842,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19277,7 +19868,8 @@
=20
am_cv_val_LC_MESSAGES=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
@@ -19311,7 +19903,6 @@
echo "$as_me:$LINENO: checking libintl.h usability" >&5
echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19322,11 +19913,20 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest.$ac_objext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19339,7 +19939,7 @@
=20
ac_header_compiler=3Dno
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
=20
@@ -19347,7 +19947,6 @@
echo "$as_me:$LINENO: checking libintl.h presence" >&5
echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19365,6 +19964,7 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=3D$ac_c_preproc_warn_flag
+ ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=3D
fi
@@ -19384,33 +19984,32 @@
echo "${ECHO_T}$ac_header_preproc" >&6
=20
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, =
rejected by the preprocessor!" >&5
echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by th=
e preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the prepro=
cessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's resul=
t" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compil=
er's result" >&5
+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >=
&2;}
+ ac_header_preproc=3Dyes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be comp=
iled" >&5
echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequi=
site headers?" >&5
-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?"=
>&2;}
+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prer=
equisite headers?" >&5
+echo "$as_me: WARNING: libintl.h: check for missing prerequisite heade=
rs?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documenta=
tion" >&5
+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But =
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Comp=
iled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the prepro=
cessor's result" >&5
echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's resul=
t" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compile=
r will take precedence" >&5
+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take pr=
ecedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ------------------------------------------ ##
+## Report this to "http://bugzilla.gnome.org" ##
+## ------------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -19440,7 +20039,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19459,11 +20057,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19476,7 +20083,8 @@
=20
gt_cv_func_dgettext_libc=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
=20
fi
echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
@@ -19493,21 +20101,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $a=
c_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef $ac_func
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -19538,11 +20153,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19555,7 +20179,8 @@
=20
eval "$as_ac_var=3Dno"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -19583,7 +20208,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-lintl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19607,11 +20231,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19624,7 +20257,8 @@
=20
ac_cv_lib_intl_bindtextdomain=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
@@ -19638,7 +20272,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-lintl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19662,11 +20295,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19679,7 +20321,8 @@
=20
ac_cv_lib_intl_dgettext=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
@@ -19704,7 +20347,6 @@
ac_check_lib_save_LIBS=3D$LIBS
LIBS=3D"-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19728,11 +20370,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19745,7 +20396,8 @@
=20
ac_cv_lib_intl_dcgettext=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
@@ -19778,21 +20430,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $a=
c_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef $ac_func
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -19823,11 +20482,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19840,7 +20508,8 @@
=20
eval "$as_ac_var=3Dno"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -19927,21 +20596,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $a=
c_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef $ac_func
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -19972,11 +20648,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -19989,7 +20674,8 @@
=20
eval "$as_ac_var=3Dno"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -20078,7 +20764,6 @@
fi
=20
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -20096,11 +20781,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -20120,21 +20814,28 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits=
.h> declares bind_textdomain_codeset.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bind_textdomain_codeset (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
+
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
+
+#undef bind_textdomain_codeset
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -20165,11 +20866,20 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=3D$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
(exit $ac_status); } &&
- { ac_try=3D'test -s conftest$ac_exeext'
+ { ac_try=3D'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=3D$?
+ echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try=3D'test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=3D$?
@@ -20182,7 +20892,8 @@
=20
ac_cv_func_bind_textdomain_codeset=3Dno
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
@@ -20201,7 +20912,8 @@
;;
esac
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=3D"$glib_save_LIBS"
INSTOBJEXT=3D.mo
else
@@ -20322,9 +21034,9 @@
echo $ECHO_N "checking for intltool >=3D ... $ECHO_C" >&6
=20
INTLTOOL_REQUIRED_VERSION_AS_INT=3D`echo | awk -F. '{ printf "%d", $1=
* 100 + $2; }'`
- INTLTOOL_APPLIED_VERSION=3D`awk -F\" '/\\$VERSION / { printf $2; }' <=
${srcdir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION=3D`awk -F\" '/\\$VERSION / { printf $2; }' <=
${ac_aux_dir}/intltool-update.in`
=20
- INTLTOOL_APPLIED_VERSION_AS_INT=3D`awk -F\" '/\\$VERSION / { split($2,=
VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${srcdir}=
/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION_AS_INT=3D`awk -F\" '/\\$VERSION / { split($2,=
VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_=
dir}/intltool-update.in`
=20
=20
if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VER=
SION_AS_INT"; then
@@ -20349,6 +21061,7 @@
INTLTOOL_UI_RULE=3D'%.ui: %.ui.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_XML_RULE=3D'%.xml: %.xml.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_XAM_RULE=3D'%.xam: %.xml.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_KBD_RULE=3D'%.kbd: %.kbd.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< $@ -x -u -m -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_CAVES_RULE=3D'%.caves: %.caves.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_SCHEMAS_RULE=3D'%.schemas: %.schemas.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< $@ -s -u -c $(top_builddir)/po/.intltool-merge-cache'
INTLTOOL_THEME_RULE=3D'%.theme: %.theme.in $(INTLTOOL_MERGE) $=
(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=3DC $(INTLTOOL_MERGE) $(top_srcdi=
r)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
@@ -20369,6 +21082,7 @@
=20
=20
=20
+
# Use the tools built into the package, not the ones that are installed.
=20
INTLTOOL_EXTRACT=3D'$(top_builddir)/intltool-extract'
@@ -20428,6 +21142,13 @@
echo "$as_me: error: perl 5.x required for intltool" >&2;}
{ (exit 1); exit 1; }; }
fi
+if `perl -e "require XML::Parser" 2>/dev/null`; then
+:
+else
+ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required fo=
r intltool" >&5
+echo "$as_me: error: XML::Parser perl module is required for intltool" >&2=
;}
+ { (exit 1); exit 1; }; }
+fi
=20
# Remove file type tags (using []) from po/POTFILES.
=20
@@ -20520,13 +21241,13 @@
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'\\2=
'/p"
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'\\2'/p"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\=
2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\2/p"
;;
esac;
} |
@@ -20556,13 +21277,13 @@
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" =3D x.; then
- ac_vpsub=3D'/^[ ]*VPATH[ ]*=3D/{
+ ac_vpsub=3D'/^[ ]*VPATH[ ]*=3D/{
s/:*\$(srcdir):*/:/;
s/:*\${srcdir}:*/:/;
s/:*@srcdir@:*/:/;
-s/^\([^=3D]*=3D[ ]*\):*/\1/;
+s/^\([^=3D]*=3D[ ]*\):*/\1/;
s/:*$//;
-s/^[^=3D]*=3D[ ]*$//;
+s/^[^=3D]*=3D[ ]*$//;
}'
fi
=20
@@ -20573,7 +21294,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" =3D x: && continue
# 1. Remove the extension, and $U if already installed.
ac_i=3D`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
# 2. Add them.
ac_libobjs=3D"$ac_libobjs $ac_i\$U.$ac_objext"
ac_ltlibobjs=3D"$ac_ltlibobjs $ac_i"'$U.lo'
@@ -20624,9 +21345,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=3D1; export DUALCASE # for MKS sh
=20
# Support unset when possible.
-if (FOO=3DFOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=3D60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=3Dunset
else
as_unset=3Dfalse
@@ -20645,7 +21367,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
eval $as_var=3DC; export $as_var
else
$as_unset $as_var
@@ -20824,16 +21546,17 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=3D:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=3Dfalse
fi
=20
as_executable_p=3D"test -f"
=20
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp=3D"sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp=3D"eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnu=
m]%_%g'"
=20
# Sed expression to map a string onto a valid variable name.
-as_tr_sh=3D"sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh=3D"eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
=20
=20
# IFS
@@ -20860,7 +21583,7 @@
cat >&5 <<_CSEOF
=20
This file was extended by gcm $as_me 2.1.0, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
=20
CONFIG_FILES =3D $CONFIG_FILES
CONFIG_HEADERS =3D $CONFIG_HEADERS
@@ -20904,9 +21627,9 @@
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=3DFILE[:TEMPLATE]
- instantiate the configuration file FILE
+ instantiate the configuration file FILE
--header=3DFILE[:TEMPLATE]
- instantiate the configuration header FILE
+ instantiate the configuration header FILE
=20
Configuration files:
$config_files
@@ -20923,11 +21646,10 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version=3D"\\
gcm config.status 2.1.0
-configured by $0, generated by GNU Autoconf 2.57,
+configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`=
\\"
=20
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
srcdir=3D$srcdir
@@ -21024,7 +21746,7 @@
=20
=20
=20
-INTLTOOL_PERL=3D${INTLTOOL_PERL}
+INTLTOOL_PERL=3D${INTLTOOL_PERL} ac_aux_dir=3D${ac_aux_dir}
=20
_ACEOF
=20
@@ -21212,6 +21934,7 @@
s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t
s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t
s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t
+s,@INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t
s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t
s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
@@ -21256,9 +21979,9 @@
(echo ':t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_=
frag.sed
if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=3D"sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds=3D"sed -f $tmp/subs-$ac_sed_frag.sed"
else
- ac_sed_cmds=3D"$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds=3D"$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
fi
ac_sed_frag=3D`expr $ac_sed_frag + 1`
ac_beg=3D$ac_end
@@ -21276,21 +21999,21 @@
# Support "outfile[:infile[:infile...]]", defaulting infile=3D"outfile.i=
n".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=3D$ac_file.in ;;
esac
=20
# Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
ac_dir=3D`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21306,10 +22029,10 @@
as_dirs=3D"$as_dir $as_dirs"
as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21347,12 +22070,45 @@
ac_srcdir=3D$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=3D$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can =
be
-# absolute.
-ac_abs_builddir=3D`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=3D`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=3D`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=3D`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir=3D"$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=3D`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir=3D"$ac_dir";;
+ *) ac_abs_builddir=3D`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=3D$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=3D$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=3D$ac_srcdir;;
+ *) ac_abs_srcdir=3D$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=3D$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
=20
=20
case $INSTALL in
@@ -21360,11 +22116,6 @@
*) ac_INSTALL=3D$ac_top_builddir$INSTALL ;;
esac
=20
- if test x"$ac_file" !=3D x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -21374,7 +22125,7 @@
configure_input=3D"$ac_file. "
fi
configure_input=3D$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
+ sed 's,.*/,,'` by configure."
=20
# First look for the input files in the build tree, otherwise in the
# src tree.
@@ -21383,26 +22134,32 @@
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=3D:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find inpu=
t file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=3D:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file:=
$f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo $f;;
+ echo "$f";;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" !=3D x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
@@ -21442,12 +22199,12 @@
# NAME is the cpp macro being defined and VALUE is the value it is being g=
iven.
#
# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA=3D's,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB=3D'[ ].*$,\1#\2'
+ac_dA=3D's,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB=3D'[ ].*$,\1#\2'
ac_dC=3D' '
ac_dD=3D',;t'
# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALU=
E".
-ac_uA=3D's,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uA=3D's,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB=3D'$,\1#\2define\3'
ac_uC=3D' '
ac_uD=3D',;t'
@@ -21456,11 +22213,11 @@
# Support "outfile[:infile[:infile...]]", defaulting infile=3D"outfile.i=
n".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=3D$ac_file.in ;;
esac
=20
@@ -21474,28 +22231,29 @@
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=3D:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find inpu=
t file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=3D:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file:=
$f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo $f;;
+ # Do quote $f, to prevent DOS paths from being IFS'd.
+ echo "$f";;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
# Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
=20
_ACEOF
=20
@@ -21518,9 +22276,9 @@
s,[\\$`],\\&,g
t clear
: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac=
_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac=
_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB=
}\1${ac_dC}\2${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB=
}\1${ac_dC}\2${ac_dD},gp
: end
_ACEOF
# If some macros were called several times there might be several times
@@ -21534,13 +22292,13 @@
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
_ACEOF
=20
# Break up conftest.defines because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_S=
TATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_S=
TATUS
+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_S=
TATUS
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_S=
TATUS
echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
@@ -21549,7 +22307,7 @@
# Write a limited-size here document to $tmp/defines.sed.
echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -21576,7 +22334,7 @@
# Write a limited-size here document to $tmp/undefs.sed.
echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -21610,10 +22368,10 @@
else
ac_dir=3D`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21629,10 +22387,10 @@
as_dirs=3D"$as_dir $as_dirs"
as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21664,16 +22422,41 @@
ac_source=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_dir=3D`(dirname "$ac_dest") 2>/dev/null ||
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_dest" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir=3D"$ac_dir"
+ as_dirs=3D
+ while test ! -d "$as_dir"; do
+ as_dirs=3D"$as_dir $as_dirs"
+ as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir=
\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
ac_builddir=3D.
=20
if test "$ac_dir" !=3D .; then
@@ -21699,12 +22482,45 @@
ac_srcdir=3D$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=3D$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can =
be
-# absolute.
-ac_abs_builddir=3D`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=3D`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=3D`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=3D`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir=3D"$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=3D`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir=3D"$ac_dir";;
+ *) ac_abs_builddir=3D`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=3D$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=3D$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=3D$ac_srcdir;;
+ *) ac_abs_srcdir=3D$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=3D$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
=20
=20
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -21716,7 +22532,7 @@
esac ;;
default-3 )
=20
-sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract=
.in > intltool-extract.out
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-ext=
ract.in > intltool-extract.out
if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
rm -f intltool-extract.out
else
@@ -21725,7 +22541,8 @@
chmod ugo+x intltool-extract
chmod u+w intltool-extract
=20
-sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-merge.i=
n > intltool-merge.out
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" \
+ < ${ac_aux_dir}/intltool-merge.in > intltool-merge.out
if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
rm -f intltool-merge.out
else
@@ -21734,7 +22551,7 @@
chmod ugo+x intltool-merge
chmod u+w intltool-merge
=20
-sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-update.=
in > intltool-update.out
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-upd=
ate.in > intltool-update.out
if cmp -s intltool-update intltool-update.out 2>/dev/null; then
rm -f intltool-update.out
else
@@ -21834,10 +22651,10 @@
as_dirs=3D"$as_dir $as_dirs"
as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21875,12 +22692,45 @@
ac_srcdir=3D$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=3D$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can =
be
-# absolute.
-ac_abs_builddir=3D`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=3D`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=3D`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=3D`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir=3D"$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=3D`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir=3D"$ac_dir";;
+ *) ac_abs_builddir=3D`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=3D$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=3D$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=3D$ac_srcdir;;
+ *) ac_abs_srcdir=3D$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=3D$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=3D$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
=20
=20
cd $ac_dir
@@ -21904,20 +22754,20 @@
case $cache_file in
[\\/]* | ?:[\\/]* ) ac_sub_cache_file=3D$cache_file ;;
*) # Relative path.
- ac_sub_cache_file=3D$ac_top_builddir$cache_file ;;
+ ac_sub_cache_file=3D$ac_top_builddir$cache_file ;;
esac
=20
{ echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_=
args --cache-file=3D$ac_sub_cache_file --srcdir=3D$ac_srcdir" >&5
echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-fil=
e=3D$ac_sub_cache_file --srcdir=3D$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
eval $ac_sub_configure $ac_sub_configure_args \
- --cache-file=3D$ac_sub_cache_file --srcdir=3D$ac_srcdir ||
- { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_=
dir" >&5
+ --cache-file=3D$ac_sub_cache_file --srcdir=3D$ac_srcdir ||
+ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
{ (exit 1); exit 1; }; }
fi
=20
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
=20
diff -Naur gcm-2.1.0+20031016.1.bak/debian/changelog gcm-2.1.0+20031016.1/d=
ebian/changelog
--- gcm-2.1.0+20031016.1.bak/debian/changelog Fri Mar 19 21:50:11 2004
+++ gcm-2.1.0+20031016.1/debian/changelog Fri Mar 19 22:11:54 2004
@@ -1,3 +1,10 @@
+gcm (2.1.0+20031016.1-4.1) unstable; urgency=3Dlow
+
+ * Non-maintainer upload during BSP
+ * Update libtool and autotools stuff (Closes: #230821)
+
+ -- Frank Lichtenheld <djpig@debian.org> Fri, 19 Mar 2004 22:11:36 +0100
+
gcm (2.1.0+20031016.1-4) unstable; urgency=3Dlow
=20
* GNOME team upload
diff -Naur gcm-2.1.0+20031016.1.bak/debian/control gcm-2.1.0+20031016.1/deb=
ian/control
--- gcm-2.1.0+20031016.1.bak/debian/control Fri Mar 19 21:50:11 2004
+++ gcm-2.1.0+20031016.1/debian/control Fri Mar 19 23:47:47 2004
@@ -2,7 +2,7 @@
Priority: optional
Section: gnome
Maintainer: Andrew Lau <netsnipe@users.sourceforge.net>
-Build-Depends: automake1.4, cdbs, debhelper (>=3D 4.1), libgtkhtml2-dev, l=
ibpanel-applet2-dev, libxml2-dev, mozilla-dev, pkg-config
+Build-Depends: automake1.4, cdbs, debhelper (>=3D 4.1), libgtkhtml2-dev, l=
ibpanel-applet2-dev, libxml2-dev, mozilla-dev, pkg-config, libxml-parser-pe=
rl
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.de=
bian.org>,=20
Standards-Version: 3.6.1
=20
diff -Naur gcm-2.1.0+20031016.1.bak/debian/control.in gcm-2.1.0+20031016.1/=
debian/control.in
--- gcm-2.1.0+20031016.1.bak/debian/control.in Fri Mar 19 21:50:11 2004
+++ gcm-2.1.0+20031016.1/debian/control.in Fri Mar 19 23:47:38 2004
@@ -2,7 +2,7 @@
Priority: optional
Section: gnome
Maintainer: Andrew Lau <netsnipe@users.sourceforge.net>
-Build-Depends: automake1.4, cdbs, debhelper (>=3D 4.1), libgtkhtml2-dev, l=
ibpanel-applet2-dev, libxml2-dev, mozilla-dev, pkg-config
+Build-Depends: automake1.4, cdbs, debhelper (>=3D 4.1), libgtkhtml2-dev, l=
ibpanel-applet2-dev, libxml2-dev, mozilla-dev, pkg-config, libxml-parser-pe=
rl
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.de=
bian.org>, @GNOME_TEAM@
Standards-Version: 3.6.1
=20
diff -Naur gcm-2.1.0+20031016.1.bak/doc/Makefile.in gcm-2.1.0+20031016.1/do=
c/Makefile.in
--- gcm-2.1.0+20031016.1.bak/doc/Makefile.in Wed Oct 15 18:51:26 2003
+++ gcm-2.1.0+20031016.1/doc/Makefile.in Fri Mar 19 21:43:08 2004
@@ -86,6 +86,7 @@
INTLTOOL_DESKTOP_RULE =3D @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE =3D @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE =3D @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE =3D @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE =3D @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE =3D @INTLTOOL_OAF_RULE@
diff -Naur gcm-2.1.0+20031016.1.bak/launcher/Makefile.in gcm-2.1.0+20031016=
.1/launcher/Makefile.in
--- gcm-2.1.0+20031016.1.bak/launcher/Makefile.in Wed Oct 15 18:51:27 2003
+++ gcm-2.1.0+20031016.1/launcher/Makefile.in Fri Mar 19 21:43:08 2004
@@ -86,6 +86,7 @@
INTLTOOL_DESKTOP_RULE =3D @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE =3D @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE =3D @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE =3D @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE =3D @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE =3D @INTLTOOL_OAF_RULE@
diff -Naur gcm-2.1.0+20031016.1.bak/macros/Makefile.in gcm-2.1.0+20031016.1=
/macros/Makefile.in
--- gcm-2.1.0+20031016.1.bak/macros/Makefile.in Wed Oct 15 18:51:26 2003
+++ gcm-2.1.0+20031016.1/macros/Makefile.in Fri Mar 19 21:43:08 2004
@@ -86,6 +86,7 @@
INTLTOOL_DESKTOP_RULE =3D @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE =3D @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE =3D @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE =3D @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE =3D @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE =3D @INTLTOOL_OAF_RULE@
diff -Naur gcm-2.1.0+20031016.1.bak/pixmaps/Makefile.in gcm-2.1.0+20031016.=
1/pixmaps/Makefile.in
--- gcm-2.1.0+20031016.1.bak/pixmaps/Makefile.in Thu Oct 16 11:00:01 2003
+++ gcm-2.1.0+20031016.1/pixmaps/Makefile.in Fri Mar 19 21:43:08 2004
@@ -86,6 +86,7 @@
INTLTOOL_DESKTOP_RULE =3D @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE =3D @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE =3D @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE =3D @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE =3D @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE =3D @INTLTOOL_OAF_RULE@
diff -Naur gcm-2.1.0+20031016.1.bak/plugins/Makefile.in gcm-2.1.0+20031016.=
1/plugins/Makefile.in
--- gcm-2.1.0+20031016.1.bak/plugins/Makefile.in Wed Oct 15 18:51:26 2003
+++ gcm-2.1.0+20031016.1/plugins/Makefile.in Fri Mar 19 21:43:08 2004
@@ -86,6 +86,7 @@
INTLTOOL_DESKTOP_RULE =3D @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE =3D @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE =3D @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE =3D @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE =3D @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE =3D @INTLTOOL_OAF_RULE@
diff -Naur gcm-2.1.0+20031016.1.bak/src/Makefile.in gcm-2.1.0+20031016.1/sr=
c/Makefile.in
--- gcm-2.1.0+20031016.1.bak/src/Makefile.in Wed Oct 15 18:51:26 2003
+++ gcm-2.1.0+20031016.1/src/Makefile.in Fri Mar 19 21:43:08 2004
@@ -86,6 +86,7 @@
INTLTOOL_DESKTOP_RULE =3D @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE =3D @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT =3D @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE =3D @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE =3D @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE =3D @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE =3D @INTLTOOL_OAF_RULE@
--9amGYk9869ThD9tj--