r14186 - in /desktop/unstable/libbonobo/debian: changelog control control.in patches/90_relibtoolize.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jan 12 16:48:33 UTC 2008
Author: joss
Date: Sat Jan 12 16:48:32 2008
New Revision: 14186
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14186
Log:
+ Don't version the directories, as bonobo is being deprecated
* 90_relibtoolize.patch: relibtoolize to avoid the /usr/lib rpath on
amd64.
* Standards version is 3.7.3.
Added:
desktop/unstable/libbonobo/debian/patches/90_relibtoolize.patch
Modified:
desktop/unstable/libbonobo/debian/changelog
desktop/unstable/libbonobo/debian/control
desktop/unstable/libbonobo/debian/control.in
Modified: desktop/unstable/libbonobo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/changelog?rev=14186&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/changelog (original)
+++ desktop/unstable/libbonobo/debian/changelog Sat Jan 12 16:48:32 2008
@@ -5,7 +5,7 @@
* Fix the dependency loop; closes: #342901.
+ New package: libbonobo2-bin, contains the support binaries that
are not necessary for the library to run.
- + Don't version the directories, as bonobo is being deprecated
+ + Don't version the directories, as bonobo is being deprecated
anyway.
+ Move the moniker, the orbit module and the activation server to
libbonobo2-0.
@@ -13,6 +13,9 @@
+ Make libbonobo2-common architecture-independent.
* Make symbolic links to the documentation in /usr/share/doc.
Closes: #363139.
+ * 90_relibtoolize.patch: relibtoolize to avoid the /usr/lib rpath on
+ amd64.
+ * Standards version is 3.7.3.
-- Josselin Mouette <joss at debian.org> Fri, 11 Jan 2008 18:07:02 +0100
Modified: desktop/unstable/libbonobo/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/control?rev=14186&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/control (original)
+++ desktop/unstable/libbonobo/debian/control Sat Jan 12 16:48:32 2008
@@ -17,7 +17,7 @@
gtk-doc-tools,
docbook-xml,
autotools-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: libbonobo2-common
Architecture: all
Modified: desktop/unstable/libbonobo/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/control.in?rev=14186&op=diff
==============================================================================
--- desktop/unstable/libbonobo/debian/control.in (original)
+++ desktop/unstable/libbonobo/debian/control.in Sat Jan 12 16:48:32 2008
@@ -17,7 +17,7 @@
gtk-doc-tools,
docbook-xml,
autotools-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: libbonobo2-common
Architecture: all
Added: desktop/unstable/libbonobo/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonobo/debian/patches/90_relibtoolize.patch?rev=14186&op=file
==============================================================================
--- desktop/unstable/libbonobo/debian/patches/90_relibtoolize.patch (added)
+++ desktop/unstable/libbonobo/debian/patches/90_relibtoolize.patch Sat Jan 12 16:48:32 2008
@@ -1,0 +1,1021 @@
+diff -pruN libbonobo-2.20.3.orig/aclocal.m4 libbonobo-2.20.3/aclocal.m4
+--- libbonobo-2.20.3.orig/aclocal.m4 2007-12-22 21:35:06.000000000 +0100
++++ libbonobo-2.20.3/aclocal.m4 2008-01-12 17:42:52.689316441 +0100
+@@ -119,7 +119,7 @@ AC_SUBST($1)dnl
+ #-----------------
+ glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+- [dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
+ AC_SUBST(USE_NLS)
+
+@@ -894,7 +894,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
+
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+-# serial 51 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -2505,27 +2505,10 @@ linux* | k*bsd*-gnu)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # find out which ABI we are using
+- libsuff=
+- case "$host_cpu" in
+- x86_64*|s390x*|powerpc64*)
+- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *64-bit*)
+- libsuff=64
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
+- esac
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2537,6 +2520,18 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -3311,7 +3306,7 @@ linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -4345,7 +4340,7 @@ case $host_os in
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -5038,7 +5033,6 @@ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+@@ -5303,9 +5297,6 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ # Is the compiler the GNU C compiler?
+ with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+-
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+
+@@ -5439,11 +5430,11 @@ striplib=$lt_striplib
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+@@ -5455,7 +5446,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $
+
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -5535,7 +5526,7 @@ variables_saved_for_relink="$variables_s
+ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -6030,7 +6021,7 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -6405,6 +6396,9 @@ ifelse([$1],[CXX],[
+ cygwin* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -6610,12 +6604,13 @@ EOF
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -7047,7 +7042,7 @@ _LT_EOF
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -7626,7 +7621,7 @@ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+diff -pruN libbonobo-2.20.3.orig/config.guess libbonobo-2.20.3/config.guess
+--- libbonobo-2.20.3.orig/config.guess 2007-12-22 21:45:16.000000000 +0100
++++ libbonobo-2.20.3/config.guess 2008-01-12 17:42:57.905613701 +0100
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+ # Inc.
+
+-timestamp='2007-05-17'
++timestamp='2007-07-22'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+@@ -793,7 +793,7 @@ EOF
+ exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+- x86)
++ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+diff -pruN libbonobo-2.20.3.orig/config.sub libbonobo-2.20.3/config.sub
+--- libbonobo-2.20.3.orig/config.sub 2007-12-22 21:45:16.000000000 +0100
++++ libbonobo-2.20.3/config.sub 2008-01-12 17:42:57.909613929 +0100
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+ # Inc.
+
+-timestamp='2007-04-29'
++timestamp='2007-06-28'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -475,8 +475,8 @@ case $basic_machine in
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16c)
+- basic_machine=cr16c-unknown
++ cr16)
++ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+diff -pruN libbonobo-2.20.3.orig/configure libbonobo-2.20.3/configure
+--- libbonobo-2.20.3.orig/configure 2007-12-22 21:35:08.000000000 +0100
++++ libbonobo-2.20.3/configure 2008-01-12 17:43:00.113739535 +0100
+@@ -5998,7 +5998,7 @@ linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -9403,12 +9403,13 @@ EOF
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs=no
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -9952,7 +9953,7 @@ if test -z "$aix_libpath"; then aix_libp
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -10648,31 +10649,10 @@ linux* | k*bsd*-gnu)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # find out which ABI we are using
+- libsuff=
+- case "$host_cpu" in
+- x86_64*|s390x*|powerpc64*)
+- echo '#line 10655 "configure"' > conftest.$ac_ext
+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *64-bit*)
+- libsuff=64
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
+- esac
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -10684,6 +10664,18 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -11509,7 +11501,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11512 "configure"
++#line 11504 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11609,7 +11601,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11612 "configure"
++#line 11604 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11941,9 +11933,6 @@ CC=$lt_compiler
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC
+
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+-
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+
+@@ -12077,11 +12066,11 @@ striplib=$lt_striplib
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++predep_objects=$lt_predep_objects
+
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++postdep_objects=$lt_postdep_objects
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+@@ -12093,7 +12082,7 @@ postdeps=$lt_postdeps
+
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++compiler_lib_search_path=$lt_compiler_lib_search_path
+
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -12173,7 +12162,7 @@ variables_saved_for_relink="$variables_s
+ link_all_deplibs=$link_all_deplibs
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -13222,7 +13211,7 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -13923,7 +13912,7 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -14032,11 +14021,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14035: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14024: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14039: \$? = $ac_status" >&5
++ echo "$as_me:14028: \$? = $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 other than the usual output.
+@@ -14136,11 +14125,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14139: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14128: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14143: \$? = $ac_status" >&5
++ echo "$as_me:14132: \$? = $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
+@@ -14208,6 +14197,9 @@ echo $ECHO_N "checking whether the $comp
+ cygwin* | mingw*)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -14638,31 +14630,10 @@ linux* | k*bsd*-gnu)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # find out which ABI we are using
+- libsuff=
+- case "$host_cpu" in
+- x86_64*|s390x*|powerpc64*)
+- echo '#line 14645 "configure"' > conftest.$ac_ext
+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *64-bit*)
+- libsuff=64
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
+- esac
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -14674,6 +14645,18 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -15039,9 +15022,6 @@ CC=$lt_compiler_CXX
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC_CXX
+
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+-
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+
+@@ -15175,11 +15155,11 @@ striplib=$lt_striplib
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++predep_objects=$lt_predep_objects_CXX
+
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++postdep_objects=$lt_postdep_objects_CXX
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+@@ -15191,7 +15171,7 @@ postdeps=$lt_postdeps_CXX
+
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -15271,7 +15251,7 @@ variables_saved_for_relink="$variables_s
+ link_all_deplibs=$link_all_deplibs_CXX
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -15722,11 +15702,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15725: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15705: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15729: \$? = $ac_status" >&5
++ echo "$as_me:15709: \$? = $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 other than the usual output.
+@@ -15826,11 +15806,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15829: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15809: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15833: \$? = $ac_status" >&5
++ echo "$as_me:15813: \$? = $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
+@@ -16090,12 +16070,13 @@ EOF
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -16619,7 +16600,7 @@ if test -z "$aix_libpath"; then aix_libp
+ link_all_deplibs_F77=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -17263,31 +17244,10 @@ linux* | k*bsd*-gnu)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # find out which ABI we are using
+- libsuff=
+- case "$host_cpu" in
+- x86_64*|s390x*|powerpc64*)
+- echo '#line 17270 "configure"' > conftest.$ac_ext
+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *64-bit*)
+- libsuff=64
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
+- esac
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -17299,6 +17259,18 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -17664,9 +17636,6 @@ CC=$lt_compiler_F77
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC_F77
+
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+-
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+
+@@ -17800,11 +17769,11 @@ striplib=$lt_striplib
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++predep_objects=$lt_predep_objects_F77
+
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++postdep_objects=$lt_postdep_objects_F77
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+@@ -17816,7 +17785,7 @@ postdeps=$lt_postdeps_F77
+
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -17896,7 +17865,7 @@ variables_saved_for_relink="$variables_s
+ link_all_deplibs=$link_all_deplibs_F77
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -18006,7 +17975,6 @@ for cc_temp in $compiler""; do
+ done
+ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+-LD_GCJ="$LD"
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
+@@ -18038,11 +18006,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18041: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18009: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18045: \$? = $ac_status" >&5
++ echo "$as_me:18013: \$? = $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 other than the usual output.
+@@ -18328,11 +18296,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18331: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18299: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18335: \$? = $ac_status" >&5
++ echo "$as_me:18303: \$? = $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 other than the usual output.
+@@ -18432,11 +18400,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18435: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18403: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18439: \$? = $ac_status" >&5
++ echo "$as_me:18407: \$? = $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
+@@ -18696,12 +18664,13 @@ EOF
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -19245,7 +19214,7 @@ if test -z "$aix_libpath"; then aix_libp
+ link_all_deplibs_GCJ=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -19889,31 +19858,10 @@ linux* | k*bsd*-gnu)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+- # find out which ABI we are using
+- libsuff=
+- case "$host_cpu" in
+- x86_64*|s390x*|powerpc64*)
+- echo '#line 19896 "configure"' > conftest.$ac_ext
+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *64-bit*)
+- libsuff=64
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+- ;;
+- esac
+- fi
+- rm -rf conftest*
+- ;;
+- esac
+-
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -19925,6 +19873,18 @@ linux* | k*bsd*-gnu)
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -20290,9 +20250,6 @@ CC=$lt_compiler_GCJ
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC_GCJ
+
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+-
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+
+@@ -20426,11 +20383,11 @@ striplib=$lt_striplib
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++predep_objects=$lt_predep_objects_GCJ
+
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++postdep_objects=$lt_postdep_objects_GCJ
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+@@ -20442,7 +20399,7 @@ postdeps=$lt_postdeps_GCJ
+
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -20522,7 +20479,7 @@ variables_saved_for_relink="$variables_s
+ link_all_deplibs=$link_all_deplibs_GCJ
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -20774,9 +20731,6 @@ CC=$lt_compiler_RC
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC_RC
+
+-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+-gcc_ver=\`gcc -dumpversion\`
+-
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+
+@@ -20910,11 +20864,11 @@ striplib=$lt_striplib
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++predep_objects=$lt_predep_objects_RC
+
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++postdep_objects=$lt_postdep_objects_RC
+
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+@@ -20926,7 +20880,7 @@ postdeps=$lt_postdeps_RC
+
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -21006,7 +20960,7 @@ variables_saved_for_relink="$variables_s
+ link_all_deplibs=$link_all_deplibs_RC
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -23880,7 +23834,7 @@ Alternatively, you may set the environme
+ and LIBBONOBO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23890,7 +23844,7 @@ Alternatively, you may set the environme
+ and LIBBONOBO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24034,7 +23988,7 @@ Alternatively, you may set the environme
+ and SERVER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -24044,7 +23998,7 @@ Alternatively, you may set the environme
+ and SERVER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24363,7 +24317,7 @@ Alternatively, you may set the environme
+ and GTHREAD_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -24373,7 +24327,7 @@ Alternatively, you may set the environme
+ and GTHREAD_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+diff -pruN libbonobo-2.20.3.orig/ltmain.sh libbonobo-2.20.3/ltmain.sh
+--- libbonobo-2.20.3.orig/ltmain.sh 2007-10-14 02:34:09.000000000 +0200
++++ libbonobo-2.20.3/ltmain.sh 2007-11-27 21:09:41.000000000 +0100
+@@ -33,9 +33,6 @@ basename="s,^.*/,,g"
+ # function.
+ progpath="$0"
+
+-# define SED for historic ltconfig's generated by Libtool 1.3
+-test -z "$SED" && SED=sed
+-
+ # The name of this program:
+ progname=`echo "$progpath" | $SED $basename`
+ modename="$progname"
+@@ -46,7 +43,7 @@ EXIT_FAILURE=1
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=1.5.24
++VERSION="1.5.24 Debian 1.5.24-2"
+ TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+@@ -2125,7 +2122,10 @@ EOF
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -3247,6 +3247,11 @@ EOF
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
++ ;;
+ esac
+ ;;
+ no)
+@@ -4018,23 +4023,15 @@ EOF
+ fi
+
+ tmp_deplibs=
+- inst_prefix_arg=
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+ *)
+- if test -n "$inst_prefix_dir" && (echo "$test_deplib" | grep -- "$inst_prefix_dir" >/dev/null); then
+- inst_prefix_arg="$inst_prefix_arg $test_deplib"
+- else
+- tmp_deplibs="$tmp_deplibs $test_deplib"
+- fi
++ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+ deplibs="$tmp_deplibs"
+- if test -n "$inst_prefix_arg"; then
+- deplibs="$inst_prefix_arg $deplibs"
+- fi
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
More information about the pkg-gnome-commits
mailing list