123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162 |
- $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- --- libtirpc-0.2.0.orig/aclocal.m4 2009-05-29 00:13:37.000000000 +0200
- +++ libtirpc-0.2.0/aclocal.m4 2009-05-31 05:10:54.000000000 +0200
- @@ -13,15 +13,15 @@
-
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- -m4_if(AC_AUTOCONF_VERSION, [2.63],,
- -[m4_warning([this file was generated for autoconf 2.63.
- +m4_if(AC_AUTOCONF_VERSION, [2.61],,
- +[m4_warning([this file was generated for autoconf 2.61.
- You have another version of autoconf. It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
- -# serial 52 AC_PROG_LIBTOOL
- +# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
- @@ -645,7 +645,6 @@ s390*-*linux*|sparc*-*linux*)
- esac
- ;;
- *64-bit*)
- - libsuff=64
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
- @@ -1708,13 +1707,11 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
- - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # 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="$sys_lib_dlsearch_path_spec $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
- @@ -1726,6 +1723,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
- @@ -2507,7 +2516,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
- @@ -3514,7 +3523,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=
- @@ -5206,7 +5215,7 @@ AC_MSG_CHECKING([for $compiler option to
- ;;
- esac
- ;;
- - netbsd*)
- + netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
- @@ -5583,6 +5592,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'
- ;;
- @@ -5791,12 +5803,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=
- @@ -6227,7 +6240,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
- @@ -6726,14 +6739,16 @@ fi])
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
- -[if test -n "$$1"; then
- - pkg_cv_[]$1="$$1"
- - elif test -n "$PKG_CONFIG"; then
- - PKG_CHECK_EXISTS([$3],
- - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- - [pkg_failed=yes])
- - else
- - pkg_failed=untried
- +[if test -n "$PKG_CONFIG"; then
- + if test -n "$$1"; then
- + pkg_cv_[]$1="$$1"
- + else
- + PKG_CHECK_EXISTS([$3],
- + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- + [pkg_failed=yes])
- + fi
- +else
- + pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
- @@ -6777,9 +6792,9 @@ See the pkg-config man page for more det
- if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
- + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
- - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
- + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|