[Pkg-kde-commits] rev 2382 - people/chrsmrtn/packages/gwenview/debian/patches/common

Christopher Martin chrsmrtn at costa.debian.org
Sun Nov 27 15:40:28 UTC 2005


Author: chrsmrtn
Date: 2005-11-27 15:40:17 +0000 (Sun, 27 Nov 2005)
New Revision: 2382

Added:
   people/chrsmrtn/packages/gwenview/debian/patches/common/06_disable_no_undefined.diff
Removed:
   people/chrsmrtn/packages/gwenview/debian/patches/common/06_automake-1.9.diff
   people/chrsmrtn/packages/gwenview/debian/patches/common/07_disable_no_undefined.diff
   people/chrsmrtn/packages/gwenview/debian/patches/common/08_disable-visibility.diff
Modified:
   people/chrsmrtn/packages/gwenview/debian/patches/common/02_autotools_update.diff
   people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff
   people/chrsmrtn/packages/gwenview/debian/patches/common/05_pedantic-errors.diff
Log:
Update Gwenview's common patches dir.


Modified: people/chrsmrtn/packages/gwenview/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/common/02_autotools_update.diff	2005-11-26 17:43:27 UTC (rev 2381)
+++ people/chrsmrtn/packages/gwenview/debian/patches/common/02_autotools_update.diff	2005-11-27 15:40:17 UTC (rev 2382)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp	2005-07-17 09:33:34.000000000 -0400
-+++ b/admin/depcomp	2005-08-21 17:50:04.000000000 -0400
+--- a/admin/depcomp	2005-07-06 17:21:25.000000000 -0400
++++ b/admin/depcomp	2005-10-28 15:11:00.000000000 -0400
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects

Modified: people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff	2005-11-26 17:43:27 UTC (rev 2381)
+++ people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff	2005-11-27 15:40:17 UTC (rev 2382)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2005-10-01 14:33:07.000000000 -0400
-+++ b/admin/libtool.m4.in	2005-10-01 14:33:27.000000000 -0400
+--- a/admin/libtool.m4.in	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/libtool.m4.in	2005-11-10 12:07:37.000000000 -0500
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -20,7 +20,7 @@
 -##
 -## You should have received a copy of the GNU General Public License
 -## along with this program; if not, write to the Free Software
--## Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -##
 -## As a special exception to the GNU General Public License, if you
 -## distribute this file as part of a program that contains a
@@ -446,7 +446,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
@@ -708,7 +708,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
 +freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
@@ -1269,7 +1269,7 @@
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
--  freebsd*)
+-  freebsd* | kfreebsd*-gnu)
 +  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
@@ -1846,15 +1846,6 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3942,7 +4113,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
 @@ -3953,11 +4124,11 @@
  SED=$lt_SED
  
@@ -2019,7 +2010,7 @@
  	    ;;
  	esac
  	;;
--      freebsd*)
+-      freebsd* | kfreebsd*-gnu)
 +      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
@@ -2659,7 +2650,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
@@ -2851,8 +2842,8 @@
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2005-10-01 14:33:07.000000000 -0400
-+++ b/admin/ltmain.sh	2005-10-01 14:33:27.000000000 -0400
+--- a/admin/ltmain.sh	2005-11-09 04:19:43.000000000 -0500
++++ b/admin/ltmain.sh	2005-11-10 12:07:37.000000000 -0500
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -2862,15 +2853,7 @@
  # Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
  #
-@@ -17,13 +17,41 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
+@@ -24,6 +24,34 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
@@ -3767,14 +3750,7 @@
  	  fi
  	  dir="$absdir"
  	  ;;
-@@ -1276,28 +1483,22 @@
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
--	  *-*-freebsd*-gnu*)
--	    # prevent being parsed by the freebsd regexp below
--	    ;;
- 	  *-*-mingw* | *-*-os2*)
+@@ -1280,18 +1487,18 @@
  	    # These systems don't actually have a C library (as such)
  	    test "X$arg" = "X-lc" && continue
  	    ;;
@@ -3791,15 +3767,12 @@
  	  esac
  	elif test "X$arg" = "X-lc_r"; then
  	 case $host in
--	 *-*-freebsd*-gnu*)
--	   # prevent being parsed by the freebsd regexp below
--	   ;;
 -	 *-*-openbsd*)
 +	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
  	   # Do not include libc_r directly, use -pthread flag.
  	   continue
  	   ;;
-@@ -1307,18 +1508,36 @@
+@@ -1301,18 +1508,36 @@
  	continue
  	;;
  
@@ -3843,7 +3816,7 @@
  	# Unknown arguments in both finalize_command and compile_command need
  	# to be aesthetically quoted because they are evaled later.
  	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1371,6 +1590,11 @@
+@@ -1365,6 +1590,11 @@
  
        -o) prev=output ;;
  
@@ -3855,7 +3828,7 @@
        -release)
  	prev=release
  	continue
-@@ -1393,7 +1617,7 @@
+@@ -1387,7 +1617,7 @@
  	[\\/]* | [A-Za-z]:[\\/]*) ;;
  	*)
  	  $echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -3864,7 +3837,7 @@
  	  ;;
  	esac
  	case "$xrpath " in
-@@ -1479,11 +1703,6 @@
+@@ -1473,11 +1703,6 @@
  	continue
  	;;
  
@@ -3876,7 +3849,7 @@
        # Some other compiler flag.
        -* | +*)
  	# Unknown arguments in both finalize_command and compile_command need
-@@ -1494,7 +1713,6 @@
+@@ -1488,7 +1713,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -3884,7 +3857,7 @@
  	;;
  
        *.$objext)
-@@ -1522,7 +1740,7 @@
+@@ -1516,7 +1740,7 @@
  	     test "$pic_object" = none && \
  	     test "$non_pic_object" = none; then
  	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -3893,7 +3866,7 @@
  	  fi
  
  	  # Extract subdirectory from the argument.
-@@ -1575,7 +1793,7 @@
+@@ -1569,7 +1793,7 @@
  	  # Only an error if not doing a dry-run.
  	  if test -z "$run"; then
  	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
@@ -3902,7 +3875,7 @@
  	  else
  	    # Dry-run case.
  
-@@ -1629,7 +1847,6 @@
+@@ -1623,7 +1847,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -3910,7 +3883,7 @@
  	;;
        esac # arg
  
-@@ -1643,48 +1860,7 @@
+@@ -1637,48 +1860,7 @@
      if test -n "$prev"; then
        $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
        $echo "$help" 1>&2
@@ -3960,7 +3933,7 @@
      fi
  
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1728,7 +1904,7 @@
+@@ -1722,7 +1904,7 @@
      "")
        $echo "$modename: you must specify an output file" 1>&2
        $echo "$help" 1>&2
@@ -3969,7 +3942,7 @@
        ;;
      *.$libext) linkmode=oldlib ;;
      *.lo | *.$objext) linkmode=obj ;;
-@@ -1738,7 +1914,7 @@
+@@ -1732,7 +1914,7 @@
  
      case $host in
      *cygwin* | *mingw* | *pw32*)
@@ -3978,7 +3951,7 @@
        duplicate_compiler_generated_deps=yes
        ;;
      *)
-@@ -1791,7 +1967,7 @@
+@@ -1785,7 +1967,7 @@
  	  *.la) ;;
  	  *)
  	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -3987,7 +3960,7 @@
  	    ;;
  	  esac
  	done
-@@ -1817,7 +1993,10 @@
+@@ -1811,7 +1993,10 @@
  	case $pass in
  	dlopen) libs="$dlfiles" ;;
  	dlpreopen) libs="$dlprefiles" ;;
@@ -3999,7 +3972,7 @@
  	esac
        fi
        if test "$pass" = dlopen; then
-@@ -1829,18 +2008,23 @@
+@@ -1823,18 +2008,23 @@
  	lib=
  	found=no
  	case $deplib in
@@ -4028,7 +4001,7 @@
  	      # Search the libtool library
  	      lib="$searchdir/lib${name}${search_ext}"
  	      if test -f "$lib"; then
-@@ -1901,18 +2085,6 @@
+@@ -1895,18 +2085,6 @@
  	    fi
  	  fi
  	  ;; # -l
@@ -4047,7 +4020,7 @@
  	-L*)
  	  case $linkmode in
  	  lib)
-@@ -1928,11 +2100,11 @@
+@@ -1922,11 +2100,11 @@
  	    fi
  	    if test "$pass" = scan; then
  	      deplibs="$deplib $deplibs"
@@ -4060,7 +4033,7 @@
  	    ;;
  	  *)
  	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1960,7 +2132,22 @@
+@@ -1954,7 +2132,22 @@
  	  fi
  	  case $linkmode in
  	  lib)
@@ -4084,7 +4057,7 @@
  	      $echo
  	      $echo "*** Warning: Trying to link with static lib archive $deplib."
  	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -2011,14 +2198,14 @@
+@@ -2005,14 +2198,14 @@
  	if test "$found" = yes || test -f "$lib"; then :
  	else
  	  $echo "$modename: cannot find the library \`$lib'" 1>&2
@@ -4101,7 +4074,7 @@
  	fi
  
  	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2034,6 +2221,8 @@
+@@ -2028,6 +2221,8 @@
  	# it will not redefine variables installed, or shouldnotlink
  	installed=yes
  	shouldnotlink=no
@@ -4110,7 +4083,7 @@
  
  	# Read the .la file
  	case $lib in
-@@ -2041,13 +2230,6 @@
+@@ -2035,13 +2230,6 @@
  	*) . ./$lib ;;
  	esac
  
@@ -4124,7 +4097,7 @@
  	if test "$linkmode,$pass" = "lib,link" ||
  	   test "$linkmode,$pass" = "prog,scan" ||
  	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2058,33 +2240,32 @@
+@@ -2052,33 +2240,32 @@
  	if test "$pass" = conv; then
  	  # Only check for convenience libraries
  	  deplibs="$lib $deplibs"
@@ -4171,7 +4144,7 @@
  	# Get the name of the library we link against.
  	linklib=
  	for l in $old_library $library_names; do
-@@ -2092,16 +2273,18 @@
+@@ -2086,16 +2273,18 @@
  	done
  	if test -z "$linklib"; then
  	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -4193,7 +4166,7 @@
  	    # If there is no dlname, no dlopen support or we're linking
  	    # statically, we need to preload.  We also need to preload any
  	    # dependent libraries so libltdl's deplib preloader doesn't
-@@ -2138,11 +2321,19 @@
+@@ -2132,11 +2321,19 @@
  	    dir="$libdir"
  	    absdir="$libdir"
  	  fi
@@ -4217,7 +4190,7 @@
  	fi # $installed = yes
  	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
  
-@@ -2150,7 +2341,7 @@
+@@ -2144,7 +2341,7 @@
  	if test "$pass" = dlpreopen; then
  	  if test -z "$libdir"; then
  	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -4226,7 +4199,7 @@
  	  fi
  	  # Prefer using a static library (so that no silly _DYNAMIC symbols
  	  # are required to link).
-@@ -2177,7 +2368,7 @@
+@@ -2171,7 +2368,7 @@
  	  continue
  	fi
  
@@ -4235,7 +4208,7 @@
  	if test "$linkmode" = prog && test "$pass" != link; then
  	  newlib_search_path="$newlib_search_path $ladir"
  	  deplibs="$lib $deplibs"
-@@ -2215,12 +2406,12 @@
+@@ -2209,12 +2406,12 @@
  	  if test -n "$library_names" &&
  	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
  	    # We need to hardcode the library path
@@ -4250,7 +4223,7 @@
  	      esac
  	    fi
  
-@@ -2264,17 +2455,18 @@
+@@ -2258,17 +2455,18 @@
  	    need_relink=yes
  	  fi
  	  # This is a shared library
@@ -4274,7 +4247,7 @@
  	  if test "$linkmode" = lib &&
  	     test "$hardcode_into_libs" = yes; then
  	    # Hardcode the library path.
-@@ -2332,9 +2524,10 @@
+@@ -2326,9 +2524,10 @@
  	    else
  	      $show "extracting exported symbol list from \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -4286,7 +4259,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2345,9 +2538,10 @@
+@@ -2339,9 +2538,10 @@
  	    if test -f "$output_objdir/$newlib"; then :; else
  	      $show "generating import library for \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -4298,7 +4271,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2370,9 +2564,9 @@
+@@ -2364,9 +2564,9 @@
  		case $host in
  		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
  		  *-*-darwin* )
@@ -4311,7 +4284,7 @@
  		      $echo "** Warning, lib $linklib is a module, not a shared library"
  		      if test -z "$old_library" ; then
  		        $echo
-@@ -2380,7 +2574,7 @@
+@@ -2374,7 +2574,7 @@
  		        $echo "** The link will probably fail, sorry"
  		      else
  		        add="$dir/$old_library"
@@ -4320,7 +4293,7 @@
  		    fi
  		esac
  	      elif test "$hardcode_minus_L" = no; then
-@@ -2403,9 +2597,9 @@
+@@ -2397,9 +2597,9 @@
  		add_dir="-L$dir"
  		# Try looking first in the location we're being installed to.
  		if test -n "$inst_prefix_dir"; then
@@ -4332,7 +4305,7 @@
  		      ;;
  		  esac
  		fi
-@@ -2422,7 +2616,7 @@
+@@ -2416,7 +2616,7 @@
  
  	    if test "$lib_linked" != yes; then
  	      $echo "$modename: configuration error: unsupported hardcode properties"
@@ -4341,7 +4314,7 @@
  	    fi
  
  	    if test -n "$add_shlibpath"; then
-@@ -2465,7 +2659,8 @@
+@@ -2459,7 +2659,8 @@
  	      esac
  	      add="-l$name"
  	    elif test "$hardcode_automatic" = yes; then
@@ -4351,7 +4324,7 @@
  	        add="$inst_prefix_dir$libdir/$linklib"
  	      else
  	        add="$libdir/$linklib"
-@@ -2475,9 +2670,9 @@
+@@ -2469,9 +2670,9 @@
  	      add_dir="-L$libdir"
  	      # Try looking first in the location we're being installed to.
  	      if test -n "$inst_prefix_dir"; then
@@ -4363,7 +4336,7 @@
  		    ;;
  		esac
  	      fi
-@@ -2536,17 +2731,16 @@
+@@ -2530,17 +2731,16 @@
  	      fi
  	    fi
  	  else
@@ -4385,7 +4358,7 @@
  	    # Extract -R from dependency_libs
  	    temp_deplibs=
  	    for libdir in $dependency_libs; do
-@@ -2560,7 +2754,7 @@
+@@ -2554,7 +2754,7 @@
  	      esac
  	    done
  	    dependency_libs="$temp_deplibs"
@@ -4394,7 +4367,7 @@
  
  	  newlib_search_path="$newlib_search_path $absdir"
  	  # Link against this library
-@@ -2602,20 +2796,18 @@
+@@ -2596,20 +2796,18 @@
  		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		  if test -z "$libdir"; then
  		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -4419,7 +4392,7 @@
  		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
  		  if test -n "$deplibrary_names" ; then
  		    for tmp in $deplibrary_names ; do
-@@ -2623,55 +2815,45 @@
+@@ -2617,55 +2815,45 @@
  		    done
  		    if test -f "$path/$depdepl" ; then
  		      depdepl="$path/$depdepl"
@@ -4495,7 +4468,7 @@
  	      esac
  	    done
  	  fi # link_all_deplibs != no
-@@ -2758,7 +2940,8 @@
+@@ -2752,7 +2940,8 @@
  	  eval $var=\"$tmp_libs\"
  	done # for var
        fi
@@ -4505,7 +4478,7 @@
        tmp_libs=
        for i in $dependency_libs ; do
  	case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2818,19 +3001,19 @@
+@@ -2812,19 +3001,19 @@
        case $outputname in
        lib*)
  	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -4528,7 +4501,7 @@
  	  eval libname=\"$libname_spec\"
  	else
  	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2841,7 +3024,7 @@
+@@ -2835,7 +3024,7 @@
        if test -n "$objs"; then
  	if test "$deplibs_check_method" != pass_all; then
  	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
@@ -4537,7 +4510,7 @@
  	else
  	  $echo
  	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2889,13 +3072,13 @@
+@@ -2883,13 +3072,13 @@
  	if test -n "$8"; then
  	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
  	  $echo "$help" 1>&2
@@ -4553,7 +4526,7 @@
  	case $vinfo_number in
  	yes)
  	  number_major="$2"
-@@ -2924,6 +3107,11 @@
+@@ -2918,6 +3107,11 @@
  	    age="$number_minor"
  	    revision="$number_minor"
  	    ;;
@@ -4565,7 +4538,7 @@
  	  esac
  	  ;;
  	no)
-@@ -2935,36 +3123,36 @@
+@@ -2929,36 +3123,36 @@
  
  	# Check that each of the things are valid numbers.
  	case $current in
@@ -4612,7 +4585,7 @@
  	fi
  
  	# Calculate the version variables.
-@@ -2981,7 +3169,7 @@
+@@ -2975,7 +3169,7 @@
  	  versuffix="$major.$age.$revision"
  	  # Darwin ld doesn't like 0 for these options...
  	  minor_current=`expr $current + 1`
@@ -4621,7 +4594,7 @@
  	  ;;
  
  	freebsd-aout)
-@@ -3053,7 +3241,7 @@
+@@ -3047,7 +3241,7 @@
  	*)
  	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
  	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
@@ -4630,7 +4603,7 @@
  	  ;;
  	esac
  
-@@ -3104,9 +3292,15 @@
+@@ -3098,9 +3292,15 @@
  	tempremovelist=`$echo "$output_objdir/*"`
  	for p in $tempremovelist; do
  	  case $p in
@@ -4647,7 +4620,7 @@
  	       removelist="$removelist $p"
  	       ;;
  	    *) ;;
-@@ -3143,7 +3337,7 @@
+@@ -3137,7 +3337,7 @@
  	  *) finalize_rpath="$finalize_rpath $libdir" ;;
  	  esac
  	done
@@ -4656,7 +4629,7 @@
  	  dependency_libs="$temp_xrpath $dependency_libs"
  	fi
        fi
-@@ -3176,18 +3370,12 @@
+@@ -3170,12 +3370,12 @@
  	    ;;
  	  *-*-rhapsody* | *-*-darwin1.[012])
  	    # Rhapsody C library is in the System framework
@@ -4666,18 +4639,12 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
--	  *-*-freebsd*-gnu*)
--	    # Prevent $arg from being parsed by the freebsd regexp below.
--	    if test "$build_libtool_need_lc" = "yes"; then
--	      deplibs="$deplibs -lc"
--	    fi
--	    ;;
 -	  *-*-openbsd* | *-*-freebsd*)
 +	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
  	    # Do not include libc due to us having libc/libc_r.
  	    test "X$arg" = "X-lc" && continue
  	    ;;
-@@ -3237,7 +3425,7 @@
+@@ -3225,7 +3425,7 @@
  	  if test "$?" -eq 0 ; then
  	    ldd_output=`ldd conftest`
  	    for i in $deplibs; do
@@ -4686,7 +4653,7 @@
  	      # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" -ne "0"; then
  		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3274,7 +3462,7 @@
+@@ -3262,7 +3462,7 @@
  	    # Error occurred in the first compile.  Let's try to salvage
  	    # the situation: Compile a separate program for each library.
  	    for i in $deplibs; do
@@ -4695,7 +4662,7 @@
  	      # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" != "0"; then
  		$rm conftest
-@@ -3326,7 +3514,7 @@
+@@ -3314,7 +3514,7 @@
  	  set dummy $deplibs_check_method
  	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -4704,7 +4671,7 @@
  	    # If $name is empty we are operating on a -L argument.
              if test "$name" != "" && test  "$name" != "0"; then
  	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3395,7 +3583,7 @@
+@@ -3383,7 +3583,7 @@
  	  set dummy $deplibs_check_method
  	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -4713,7 +4680,7 @@
  	    # If $name is empty we are operating on a -L argument.
  	    if test -n "$name" && test "$name" != "0"; then
  	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-@@ -3475,7 +3663,7 @@
+@@ -3463,7 +3663,7 @@
  	case $host in
  	*-*-rhapsody* | *-*-darwin1.[012])
  	  # On Rhapsody replace the C library is the System framework
@@ -4722,7 +4689,7 @@
  	  ;;
  	esac
  
-@@ -3521,13 +3709,6 @@
+@@ -3509,13 +3709,6 @@
  	    fi
  	  fi
  	fi
@@ -4736,7 +4703,7 @@
  	# Done checking deplibs!
  	deplibs=$newdeplibs
        fi
-@@ -3544,7 +3725,7 @@
+@@ -3532,7 +3725,7 @@
  	  hardcode_libdirs=
  	  dep_rpath=
  	  rpath="$finalize_rpath"
@@ -4745,7 +4712,7 @@
  	  for libdir in $rpath; do
  	    if test -n "$hardcode_libdir_flag_spec"; then
  	      if test -n "$hardcode_libdir_separator"; then
-@@ -3599,7 +3780,7 @@
+@@ -3587,7 +3780,7 @@
  	fi
  
  	# Get the real and link names of the library.
@@ -4754,7 +4721,7 @@
  	eval library_names=\"$library_names_spec\"
  	set dummy $library_names
  	realname="$2"
-@@ -3629,10 +3810,11 @@
+@@ -3617,10 +3810,11 @@
  	    $show "generating symbol list for \`$libname.la'"
  	    export_symbols="$output_objdir/$libname.exp"
  	    $run $rm $export_symbols
@@ -4767,7 +4734,7 @@
  	      if len=`expr "X$cmd" : ".*"` &&
  	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	        $show "$cmd"
-@@ -3642,6 +3824,9 @@
+@@ -3630,6 +3824,9 @@
  	        # The command line is too long to execute in one step.
  	        $show "using reloadable object file for export list..."
  	        skipped_export=:
@@ -4777,7 +4744,7 @@
  	      fi
  	    done
  	    IFS="$save_ifs"
-@@ -3662,12 +3847,12 @@
+@@ -3650,12 +3847,12 @@
  	for test_deplib in $deplibs; do
  		case " $convenience " in
  		*" $test_deplib "*) ;;
@@ -4792,7 +4759,7 @@
  
  	if test -n "$convenience"; then
  	  if test -n "$whole_archive_flag_spec"; then
-@@ -3675,67 +3860,13 @@
+@@ -3663,67 +3860,13 @@
  	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  	  else
  	    gentop="$output_objdir/${outputname}x"
@@ -4863,7 +4830,7 @@
  	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
  	  eval flag=\"$thread_safe_flag_spec\"
  	  linker_flags="$linker_flags $flag"
-@@ -3746,31 +3877,27 @@
+@@ -3734,31 +3877,27 @@
  	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
  	fi
  
@@ -4905,7 +4872,7 @@
  	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	  :
  	else
-@@ -3789,6 +3916,7 @@
+@@ -3777,6 +3916,7 @@
  	    save_libobjs=$libobjs
  	  fi
  	  save_output=$output
@@ -4913,7 +4880,7 @@
  
  	  # Clear the reloadable object creation command queue and
  	  # initialize k to one.
-@@ -3798,13 +3926,13 @@
+@@ -3786,13 +3926,13 @@
  	  delfiles=
  	  last_robj=
  	  k=1
@@ -4929,7 +4896,7 @@
  		 test "$len" -le "$max_cmd_len"; }; then
  	      objlist="$objlist $obj"
  	    else
-@@ -3818,9 +3946,9 @@
+@@ -3806,9 +3946,9 @@
  		# the last one created.
  		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
  	      fi
@@ -4941,7 +4908,7 @@
  	      objlist=$obj
  	      len=1
  	    fi
-@@ -3840,13 +3968,13 @@
+@@ -3828,13 +3968,13 @@
  	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
            fi
  
@@ -4957,7 +4924,7 @@
  	  done
  
  	  $echo "creating a temporary reloadable object file: $output"
-@@ -3871,28 +3999,54 @@
+@@ -3859,28 +3999,54 @@
  	  # value of $libobjs for piecewise linking.
  
  	  # Do each of the archive commands.
@@ -5017,7 +4984,7 @@
  	fi
  
  	# Create links to the real library.
-@@ -3940,7 +4094,7 @@
+@@ -3928,7 +4094,7 @@
        *.lo)
  	if test -n "$objs$old_deplibs"; then
  	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -5026,7 +4993,7 @@
  	fi
  	libobj="$output"
  	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3969,64 +4123,10 @@
+@@ -3957,64 +4123,10 @@
  	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
  	else
  	  gentop="$output_objdir/${obj}x"
@@ -5093,7 +5060,7 @@
  	fi
        fi
  
-@@ -4034,10 +4134,11 @@
+@@ -4022,10 +4134,11 @@
        reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  
        output="$obj"
@@ -5106,7 +5073,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -4050,7 +4151,7 @@
+@@ -4038,7 +4151,7 @@
  	  $run ${rm}r $gentop
  	fi
  
@@ -5115,7 +5082,7 @@
        fi
  
        if test "$build_libtool_libs" != yes; then
-@@ -4063,17 +4164,18 @@
+@@ -4051,17 +4164,18 @@
  	# accidentally link it into a program.
  	# $show "echo timestamp > $libobj"
  	# $run eval "echo timestamp > $libobj" || exit $?
@@ -5136,7 +5103,7 @@
  	  $show "$cmd"
  	  $run eval "$cmd" || exit $?
  	done
-@@ -4085,7 +4187,7 @@
+@@ -4073,7 +4187,7 @@
  	$run ${rm}r $gentop
        fi
  
@@ -5145,7 +5112,7 @@
        ;;
  
      prog)
-@@ -4110,21 +4212,18 @@
+@@ -4098,21 +4212,18 @@
        case $host in
        *-*-rhapsody* | *-*-darwin1.[012])
  	# On Rhapsody replace the C library is the System framework
@@ -5170,7 +5137,7 @@
          ;;
        esac
  
-@@ -4289,12 +4388,12 @@
+@@ -4277,12 +4388,12 @@
  
  	    # Prepare the list of exported symbols
  	    if test -z "$export_symbols"; then
@@ -5187,7 +5154,7 @@
  	      $run eval 'mv "$nlist"T "$nlist"'
  	    fi
  	  fi
-@@ -4346,7 +4445,26 @@
+@@ -4334,7 +4445,26 @@
  #endif
  
  /* The mapping between symbol names and symbols. */
@@ -5214,7 +5181,7 @@
    const char *name;
    lt_ptr address;
  }
-@@ -4406,7 +4524,7 @@
+@@ -4394,7 +4524,7 @@
  	  ;;
  	*)
  	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -5223,7 +5190,7 @@
  	  ;;
  	esac
        else
-@@ -4419,17 +4537,6 @@
+@@ -4407,17 +4537,6 @@
  	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
        fi
  
@@ -5241,7 +5208,7 @@
        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
  	# Replace the output file specification.
  	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-@@ -4505,7 +4612,7 @@
+@@ -4493,7 +4612,7 @@
  	# Link the executable and exit
  	$show "$link_command"
  	$run eval "$link_command" || exit $?
@@ -5250,7 +5217,7 @@
        fi
  
        if test "$hardcode_action" = relink; then
-@@ -4560,10 +4667,10 @@
+@@ -4548,10 +4667,10 @@
        fi
  
        # Quote $echo for shipping.
@@ -5265,7 +5232,7 @@
  	esac
  	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
        else
-@@ -4585,11 +4692,11 @@
+@@ -4573,11 +4692,11 @@
  	  *) exeext= ;;
  	esac
  	case $host in
@@ -5280,7 +5247,7 @@
  
  	    cat > $cwrappersource <<EOF
  
-@@ -4598,7 +4705,7 @@
+@@ -4586,7 +4705,7 @@
  
     The $output program cannot be directly executed until all the libtool
     libraries that it depends on are installed.
@@ -5289,7 +5256,7 @@
     This wrapper executable should never be moved out of the build directory.
     If it is, it will not operate correctly.
  
-@@ -4630,7 +4737,7 @@
+@@ -4618,7 +4737,7 @@
  #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
    defined (__OS2__)
  #define HAVE_DOS_BASED_FILE_SYSTEM
@@ -5298,7 +5265,7 @@
  #define DIR_SEPARATOR_2 '\\'
  #endif
  #endif
-@@ -4661,7 +4768,7 @@
+@@ -4649,7 +4768,7 @@
  {
    char **newargz;
    int i;
@@ -5307,7 +5274,7 @@
    program_name = (char *) xstrdup ((char *) basename (argv[0]));
    newargz = XMALLOC(char *, argc+2);
  EOF
-@@ -4674,7 +4781,7 @@
+@@ -4662,7 +4781,7 @@
    newargz[1] = fnqualify(argv[0]);
    /* we know the script has the same name, without the .exe */
    /* so make sure newargz[1] doesn't end in .exe */
@@ -5316,7 +5283,7 @@
    for (i = 1; i < argc; i++)
      newargz[i+1] = xstrdup(argv[i]);
    newargz[argc+1] = NULL;
-@@ -4685,6 +4792,7 @@
+@@ -4673,6 +4792,7 @@
  EOF
  
  	    cat >> $cwrappersource <<"EOF"
@@ -5324,7 +5291,7 @@
  }
  
  void *
-@@ -4697,7 +4805,7 @@
+@@ -4685,7 +4805,7 @@
    return p;
  }
  
@@ -5333,7 +5300,7 @@
  xstrdup (const char *string)
  {
    return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-@@ -4711,7 +4819,7 @@
+@@ -4699,7 +4819,7 @@
  
  #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
    /* Skip over the disk name in MSDOS pathnames. */
@@ -5342,7 +5309,7 @@
      name += 2;
  #endif
  
-@@ -4721,7 +4829,7 @@
+@@ -4709,7 +4829,7 @@
    return (char *) base;
  }
  
@@ -5351,7 +5318,7 @@
  fnqualify(const char *path)
  {
    size_t size;
-@@ -4749,7 +4857,7 @@
+@@ -4737,7 +4857,7 @@
  }
  
  char *
@@ -5360,7 +5327,7 @@
  {
    size_t len, patlen;
  
-@@ -4769,7 +4877,7 @@
+@@ -4757,7 +4877,7 @@
  }
  
  static void
@@ -5369,7 +5336,7 @@
            const char * message, va_list ap)
  {
    fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4798,7 +4906,7 @@
+@@ -4786,7 +4906,7 @@
  	  ;;
  	esac
  	$rm $output
@@ -5378,7 +5345,7 @@
  
  	$echo > $output "\
  #! $SHELL
-@@ -4819,7 +4927,7 @@
+@@ -4807,7 +4927,7 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -5387,7 +5354,7 @@
  
  relink_command=\"$relink_command\"
  
-@@ -4898,7 +5006,7 @@
+@@ -4886,7 +5006,7 @@
        else
  	$echo \"\$relink_command_output\" >&2
  	$rm \"\$progdir/\$file\"
@@ -5396,7 +5363,7 @@
        fi
      fi
  
-@@ -4948,34 +5056,32 @@
+@@ -4936,34 +5056,32 @@
  	# Backslashes separate directories on plain windows
  	*-*-mingw | *-*-os2*)
  	  $echo >> $output "\
@@ -5437,7 +5404,7 @@
        ;;
      esac
  
-@@ -4998,78 +5104,78 @@
+@@ -4986,78 +5104,78 @@
  
        if test -n "$addlibs"; then
  	gentop="$output_objdir/${outputname}x"
@@ -5577,7 +5544,7 @@
  	else
  	  # the command line is too long to link in one step, link in parts
  	  $echo "using piecewise archive linking..."
-@@ -5078,31 +5184,18 @@
+@@ -5066,31 +5184,18 @@
  	  objlist=
  	  concat_cmds=
  	  save_oldobjs=$oldobjs
@@ -5612,7 +5579,7 @@
  	       test "$len" -le "$max_cmd_len"; then
  	      :
  	    else
-@@ -5110,7 +5203,7 @@
+@@ -5098,7 +5203,7 @@
  	      oldobjs=$objlist
  	      if test "$obj" = "$last_oldobj" ; then
  	        RANLIB=$save_RANLIB
@@ -5621,7 +5588,7 @@
  	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
  	      objlist=
-@@ -5121,12 +5214,13 @@
+@@ -5109,12 +5214,13 @@
  	  if test "X$oldobjs" = "X" ; then
  	    eval cmds=\"\$concat_cmds\"
  	  else
@@ -5636,7 +5603,7 @@
  	IFS="$save_ifs"
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
-@@ -5158,11 +5252,13 @@
+@@ -5146,11 +5252,13 @@
  	fi
        done
        # Quote the link command for shipping.
@@ -5653,7 +5620,7 @@
        # Only create the output if not a dry run.
        if test -z "$run"; then
  	for installed in no yes; do
-@@ -5180,7 +5276,7 @@
+@@ -5168,7 +5276,7 @@
  		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		if test -z "$libdir"; then
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -5662,7 +5629,7 @@
  		fi
  		newdependency_libs="$newdependency_libs $libdir/$name"
  		;;
-@@ -5194,7 +5290,7 @@
+@@ -5182,7 +5290,7 @@
  	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -5671,7 +5638,7 @@
  	      fi
  	      newdlfiles="$newdlfiles $libdir/$name"
  	    done
-@@ -5205,11 +5301,30 @@
+@@ -5193,11 +5301,30 @@
  	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -5703,7 +5670,7 @@
  	  fi
  	  $rm $output
  	  # place dlname in correct position for cygwin
-@@ -5253,7 +5368,7 @@
+@@ -5241,7 +5368,7 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -5712,7 +5679,7 @@
  	    $echo >> $output "\
  relink_command=\"$relink_command\""
  	  fi
-@@ -5266,7 +5381,7 @@
+@@ -5254,7 +5381,7 @@
        $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
        ;;
      esac
@@ -5721,7 +5688,7 @@
      ;;
  
    # libtool install mode
-@@ -5277,11 +5392,11 @@
+@@ -5265,11 +5392,11 @@
      # install_prog (especially on Windows NT).
      if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
         # Allow the use of GNU shtool's install command.
@@ -5735,7 +5702,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -5290,14 +5405,14 @@
+@@ -5278,14 +5405,14 @@
        shift
      else
        install_prog=
@@ -5752,7 +5719,7 @@
        arg="\"$arg\""
        ;;
      esac
-@@ -5315,28 +5430,31 @@
+@@ -5303,28 +5430,31 @@
      do
        if test -n "$dest"; then
  	files="$files $dest"
@@ -5792,7 +5759,7 @@
  	  continue
  	fi
  	;;
-@@ -5345,7 +5463,7 @@
+@@ -5333,7 +5463,7 @@
        # Aesthetically quote the argument.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
        case $arg in
@@ -5801,7 +5768,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -5355,13 +5473,13 @@
+@@ -5343,13 +5473,13 @@
      if test -z "$install_prog"; then
        $echo "$modename: you must specify an install program" 1>&2
        $echo "$help" 1>&2
@@ -5817,7 +5784,7 @@
      fi
  
      if test -z "$files"; then
-@@ -5371,7 +5489,7 @@
+@@ -5359,7 +5489,7 @@
  	$echo "$modename: you must specify a destination" 1>&2
        fi
        $echo "$help" 1>&2
@@ -5826,7 +5793,7 @@
      fi
  
      # Strip any trailing slash from the destination.
-@@ -5392,7 +5510,7 @@
+@@ -5380,7 +5510,7 @@
        if test "$#" -gt 2; then
  	$echo "$modename: \`$dest' is not a directory" 1>&2
  	$echo "$help" 1>&2
@@ -5835,7 +5802,7 @@
        fi
      fi
      case $destdir in
-@@ -5404,7 +5522,7 @@
+@@ -5392,7 +5522,7 @@
  	*)
  	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
  	  $echo "$help" 1>&2
@@ -5844,7 +5811,7 @@
  	  ;;
  	esac
        done
-@@ -5433,7 +5551,7 @@
+@@ -5421,7 +5551,7 @@
  	else
  	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -5853,7 +5820,7 @@
  	fi
  
  	library_names=
-@@ -5475,7 +5593,7 @@
+@@ -5463,7 +5593,7 @@
  	  # but it's something to keep an eye on.
  	  if test "$inst_prefix_dir" = "$destdir"; then
  	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
@@ -5862,7 +5829,7 @@
  	  fi
  
  	  if test -n "$inst_prefix_dir"; then
-@@ -5490,7 +5608,7 @@
+@@ -5478,7 +5608,7 @@
  	  if $run eval "$relink_command"; then :
  	  else
  	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -5871,7 +5838,7 @@
  	  fi
  	fi
  
-@@ -5514,23 +5632,36 @@
+@@ -5502,23 +5632,36 @@
  
  	  if test "$#" -gt 0; then
  	    # Delete the old symlinks, and create new ones.
@@ -5912,7 +5879,7 @@
  	  done
  	  IFS="$save_ifs"
  	fi
-@@ -5568,7 +5699,7 @@
+@@ -5556,7 +5699,7 @@
  	*)
  	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
  	  $echo "$help" 1>&2
@@ -5921,7 +5888,7 @@
  	  ;;
  	esac
  
-@@ -5586,7 +5717,7 @@
+@@ -5574,7 +5717,7 @@
  	  $show "$install_prog $staticobj $staticdest"
  	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
  	fi
@@ -5930,7 +5897,7 @@
  	;;
  
        *)
-@@ -5624,23 +5755,21 @@
+@@ -5612,23 +5755,21 @@
  	  notinst_deplibs=
  	  relink_command=
  
@@ -5963,7 +5930,7 @@
  	  fi
  
  	  finalize=yes
-@@ -5662,17 +5791,15 @@
+@@ -5650,17 +5791,15 @@
  	  done
  
  	  relink_command=
@@ -5989,7 +5956,7 @@
  	  esac
  
  	  outputname=
-@@ -5681,8 +5808,12 @@
+@@ -5669,8 +5808,12 @@
  	      tmpdir="/tmp"
  	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
  	      tmpdir="$tmpdir/libtool-$$"
@@ -6003,7 +5970,7 @@
  		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
  		continue
  	      fi
-@@ -5709,7 +5840,7 @@
+@@ -5697,7 +5840,7 @@
  	fi
  
  	# remove .exe since cygwin /usr/bin/install will append another
@@ -6012,7 +5979,7 @@
  	case $install_prog,$host in
  	*/usr/bin/install*,*cygwin*)
  	  case $file:$destfile in
-@@ -5741,16 +5872,17 @@
+@@ -5729,16 +5872,17 @@
        $show "$install_prog $file $oldlib"
        $run eval "$install_prog \$file \$oldlib" || exit $?
  
@@ -6032,7 +5999,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -5764,9 +5896,9 @@
+@@ -5752,9 +5896,9 @@
      if test -n "$current_libdirs"; then
        # Maybe just do a dry run.
        test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -6044,7 +6011,7 @@
      fi
      ;;
  
-@@ -5785,10 +5917,11 @@
+@@ -5773,10 +5917,11 @@
        for libdir in $libdirs; do
  	if test -n "$finish_cmds"; then
  	  # Do each command in the finish commands.
@@ -6057,7 +6024,7 @@
  	    $show "$cmd"
  	    $run eval "$cmd" || admincmds="$admincmds
         $cmd"
-@@ -5805,7 +5938,7 @@
+@@ -5793,7 +5938,7 @@
      fi
  
      # Exit here if they wanted silent mode.
@@ -6066,7 +6033,7 @@
  
      $echo "----------------------------------------------------------------------"
      $echo "Libraries have been installed in:"
-@@ -5841,7 +5974,7 @@
+@@ -5829,7 +5974,7 @@
      $echo "See any operating system documentation about shared libraries for"
      $echo "more information, such as the ld(1) and ld.so(8) manual pages."
      $echo "----------------------------------------------------------------------"
@@ -6075,7 +6042,7 @@
      ;;
  
    # libtool execute mode
-@@ -5853,7 +5986,7 @@
+@@ -5841,7 +5986,7 @@
      if test -z "$cmd"; then
        $echo "$modename: you must specify a COMMAND" 1>&2
        $echo "$help"
@@ -6084,7 +6051,7 @@
      fi
  
      # Handle -dlopen flags immediately.
-@@ -5861,7 +5994,7 @@
+@@ -5849,7 +5994,7 @@
        if test ! -f "$file"; then
  	$echo "$modename: \`$file' is not a file" 1>&2
  	$echo "$help" 1>&2
@@ -6093,7 +6060,7 @@
        fi
  
        dir=
-@@ -5872,7 +6005,7 @@
+@@ -5860,7 +6005,7 @@
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -6102,7 +6069,7 @@
  	fi
  
  	# Read the libtool library.
-@@ -5899,7 +6032,7 @@
+@@ -5887,7 +6032,7 @@
  	  dir="$dir/$objdir"
  	else
  	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -6111,7 +6078,7 @@
  	fi
  	;;
  
-@@ -5979,7 +6112,7 @@
+@@ -5967,7 +6112,7 @@
  	$echo "export $shlibpath_var"
        fi
        $echo "$cmd$args"
@@ -6120,7 +6087,7 @@
      fi
      ;;
  
-@@ -6007,7 +6140,7 @@
+@@ -5995,7 +6140,7 @@
      if test -z "$rm"; then
        $echo "$modename: you must specify an RM program" 1>&2
        $echo "$help" 1>&2
@@ -6129,7 +6096,7 @@
      fi
  
      rmdirs=
-@@ -6062,10 +6195,11 @@
+@@ -6050,10 +6195,11 @@
  	  if test "$mode" = uninstall; then
  	    if test -n "$library_names"; then
  	      # Do each command in the postuninstall commands.
@@ -6142,7 +6109,7 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6077,10 +6211,11 @@
+@@ -6065,10 +6211,11 @@
  
  	    if test -n "$old_library"; then
  	      # Do each command in the old_postuninstall commands.
@@ -6155,7 +6122,7 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6119,7 +6254,7 @@
+@@ -6107,7 +6254,7 @@
  	if test "$mode" = clean ; then
  	  noexename=$name
  	  case $file in
@@ -6164,7 +6131,7 @@
  	    file=`$echo $file|${SED} 's,.exe$,,'`
  	    noexename=`$echo $name|${SED} 's,.exe$,,'`
  	    # $file with .exe has already been added to rmfiles,
-@@ -6164,20 +6299,20 @@
+@@ -6152,20 +6299,20 @@
    "")
      $echo "$modename: you must specify a MODE" 1>&2
      $echo "$generic_help" 1>&2
@@ -6188,7 +6155,7 @@
  fi
  
  # We need to display help for each of the modes.
-@@ -6213,7 +6348,7 @@
+@@ -6201,7 +6348,7 @@
  a more detailed description of MODE.
  
  Report bugs to <bug-libtool at gnu.org>."
@@ -6197,7 +6164,7 @@
    ;;
  
  clean)
-@@ -6325,6 +6460,8 @@
+@@ -6313,6 +6460,8 @@
    -no-undefined     declare that a library does not refer to external symbols
    -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
    -objectlist FILE  Use a list of object files found in FILE to specify objects
@@ -6206,7 +6173,7 @@
    -release RELEASE  specify package release information
    -rpath LIBDIR     the created library will eventually be installed in LIBDIR
    -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-@@ -6366,14 +6503,14 @@
+@@ -6354,14 +6503,14 @@
  *)
    $echo "$modename: invalid operation mode \`$mode'" 1>&2
    $echo "$help" 1>&2

Modified: people/chrsmrtn/packages/gwenview/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/common/05_pedantic-errors.diff	2005-11-26 17:43:27 UTC (rev 2381)
+++ people/chrsmrtn/packages/gwenview/debian/patches/common/05_pedantic-errors.diff	2005-11-27 15:40:17 UTC (rev 2382)
@@ -1,6 +1,6 @@
 --- a/admin/acinclude.m4.in
 +++ b/admin/acinclude.m4.in
-@@ -2139,9 +2139,6 @@
+@@ -2144,9 +2144,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"

Deleted: people/chrsmrtn/packages/gwenview/debian/patches/common/06_automake-1.9.diff

Added: people/chrsmrtn/packages/gwenview/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/common/06_disable_no_undefined.diff	2005-11-26 17:43:27 UTC (rev 2381)
+++ people/chrsmrtn/packages/gwenview/debian/patches/common/06_disable_no_undefined.diff	2005-11-27 15:40:17 UTC (rev 2382)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)

Deleted: people/chrsmrtn/packages/gwenview/debian/patches/common/07_disable_no_undefined.diff

Deleted: people/chrsmrtn/packages/gwenview/debian/patches/common/08_disable-visibility.diff




More information about the pkg-kde-commits mailing list