[Pkg-kde-commits] rev 668 - branches/kde-3.4.0/packages/kdeadmin/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Sat, 05 Mar 2005 05:21:30 +0100
Author: chrsmrtn-guest
Date: 2005-03-05 05:21:24 +0100 (Sat, 05 Mar 2005)
New Revision: 668
Modified:
branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
Re-generate buildprep.diff - patches properly now.
Modified: branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-03-05 04:20:51 UTC (rev 667)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-03-05 04:21:24 UTC (rev 668)
@@ -1,6 +1,122 @@
+#DPATCHLEVEL=1
+diff -Nrua kdeadmin-3.4.0.orig/Makefile.in kdeadmin-3.4.0/Makefile.in
+--- kdeadmin-3.4.0.orig/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/Makefile.in 2005-03-04 23:09:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -199,6 +199,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -357,7 +360,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -399,12 +402,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -416,7 +419,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+@@ -441,7 +444,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -453,7 +462,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -461,7 +470,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -482,7 +497,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -821,7 +836,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=configure.in kdeadmin.lsm subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+
+ #>+ 2
+ docs-am:
diff -Nrua kdeadmin-3.4.0.orig/acinclude.m4 kdeadmin-3.4.0/acinclude.m4
---- kdeadmin-3.4.0.orig/acinclude.m4 2005-03-04 21:29:47.713430024 +0100
-+++ kdeadmin-3.4.0/acinclude.m4 2005-03-04 21:29:58.284467957 +0100
+--- kdeadmin-3.4.0.orig/acinclude.m4 2005-03-04 07:08:59.000000000 -0500
++++ kdeadmin-3.4.0/acinclude.m4 2005-03-04 23:08:14.000000000 -0500
@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1444,8 +1560,8 @@
])
diff -Nrua kdeadmin-3.4.0.orig/aclocal.m4 kdeadmin-3.4.0/aclocal.m4
---- kdeadmin-3.4.0.orig/aclocal.m4 2005-03-04 21:29:47.760425747 +0100
-+++ kdeadmin-3.4.0/aclocal.m4 2005-03-04 21:30:06.243743585 +0100
+--- kdeadmin-3.4.0.orig/aclocal.m4 2005-03-04 07:09:08.000000000 -0500
++++ kdeadmin-3.4.0/aclocal.m4 2005-03-04 23:08:32.000000000 -0500
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
@@ -2035,3200 +2151,9 @@
# _AM_PROG_TAR(FORMAT)
# --------------------
-diff -Nrua kdeadmin-3.4.0.orig/admin/config.guess kdeadmin-3.4.0/admin/config.guess
---- kdeadmin-3.4.0.orig/admin/config.guess 2005-03-04 21:29:47.756426111 +0100
-+++ kdeadmin-3.4.0/admin/config.guess 2005-03-04 21:30:27.985764844 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
--timestamp='2004-06-24'
-+timestamp='2004-11-12'
-
- # 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
-@@ -203,9 +203,6 @@
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- arc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- cats:OpenBSD:*:*)
- echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -230,18 +227,12 @@
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- pmax:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- sgi:OpenBSD:*:*)
-- echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ echo mips64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- wgrisc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -328,6 +319,9 @@
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit 0 ;;
-+ *:z/VM:*:*)
-+ echo s390-ibm-zvmoe
-+ exit 0 ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit 0 ;;
-@@ -351,7 +345,7 @@
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit 0 ;;
-- DRS?6000:UNIX_SV:4.2*:7*)
-+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
- esac ;;
-@@ -833,6 +827,12 @@
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
-+ crisv32:Linux:*:*)
-+ echo crisv32-axis-linux-gnu
-+ exit 0 ;;
-+ frv:Linux:*:*)
-+ echo frv-unknown-linux-gnu
-+ exit 0 ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -1081,7 +1081,7 @@
- exit 0 ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1179,9 +1179,10 @@
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
- *:Darwin:*:*)
-- case `uname -p` in
-+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+ case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
-- powerpc) UNAME_PROCESSOR=powerpc ;;
-+ unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
-@@ -1249,7 +1250,10 @@
- A*) echo alpha-dec-vms && exit 0 ;;
- I*) echo ia64-dec-vms && exit 0 ;;
- V*) echo vax-dec-vms && exit 0 ;;
-- esac
-+ esac ;;
-+ *:XENIX:*:SysV)
-+ echo i386-pc-xenix
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -Nrua kdeadmin-3.4.0.orig/admin/config.guess.cdbs-orig kdeadmin-3.4.0/admin/config.guess.cdbs-orig
---- kdeadmin-3.4.0.orig/admin/config.guess.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdeadmin-3.4.0/admin/config.guess.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
-@@ -0,0 +1,1449 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-06-24'
-+
-+# 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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub. If it succeeds, it prints the system name on stdout, and
-+# exits with 0. Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help" >&2
-+ exit 1 ;;
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+if test $# != 0; then
-+ echo "$me: too many arguments$help" >&2
-+ exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,) echo "int x;" > $dummy.c ;
-+ for c in cc gcc c89 c99 ; do
-+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+ CC_FOR_BUILD="$c"; break ;
-+ fi ;
-+ done ;
-+ if test x"$CC_FOR_BUILD" = x ; then
-+ CC_FOR_BUILD=no_compiler_found ;
-+ fi
-+ ;;
-+ ,,*) CC_FOR_BUILD=$CC ;;
-+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-+esac ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+ PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+ *:NetBSD:*:*)
-+ # NetBSD (nbsd) targets should (where applicable) match one or
-+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
-+ # switched to ELF, *-*-netbsd* would select the old
-+ # object file format. This provides both forward
-+ # compatibility and a consistent mechanism for selecting the
-+ # object file format.
-+ #
-+ # Note: NetBSD doesn't particularly care about the vendor
-+ # portion of the name. We always set it to "unknown".
-+ sysctl="sysctl -n hw.machine_arch"
-+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+ case "${UNAME_MACHINE_ARCH}" in
-+ armeb) machine=armeb-unknown ;;
-+ arm*) machine=arm-unknown ;;
-+ sh3el) machine=shl-unknown ;;
-+ sh3eb) machine=sh-unknown ;;
-+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+ esac
-+ # The Operating System including object format, if it has switched
-+ # to ELF recently, or will in the future.
-+ case "${UNAME_MACHINE_ARCH}" in
-+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+ eval $set_cc_for_build
-+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep __ELF__ >/dev/null
-+ then
-+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+ # Return netbsd for either. FIX?
-+ os=netbsd
-+ else
-+ os=netbsdelf
-+ fi
-+ ;;
-+ *)
-+ os=netbsd
-+ ;;
-+ esac
-+ # The OS release
-+ # Debian GNU/NetBSD machines have a different userland, and
-+ # thus, need a distinct triplet. However, they do not need
-+ # kernel version information, so it can be replaced with a
-+ # suitable tag, in the style of linux-gnu.
-+ case "${UNAME_VERSION}" in
-+ Debian*)
-+ release='-gnu'
-+ ;;
-+ *)
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ ;;
-+ esac
-+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+ # contains redundant information, the shorter form:
-+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+ echo "${machine}-${os}${release}"
-+ exit 0 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ arc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ luna88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ pmax:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ wgrisc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ alpha:OSF1:*:*)
-+ case $UNAME_RELEASE in
-+ *4.0)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+ ;;
-+ *5.*)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ ;;
-+ esac
-+ # According to Compaq, /usr/sbin/psrinfo has been available on
-+ # OSF/1 and Tru64 systems produced since 1995. I hope that
-+ # covers most systems running today. This code pipes the CPU
-+ # types through head -n 1, so we only detect the type of CPU 0.
-+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+ case "$ALPHA_CPU_TYPE" in
-+ "EV4 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV4.5 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "LCA4 (21066/21068)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV5 (21164)")
-+ UNAME_MACHINE="alphaev5" ;;
-+ "EV5.6 (21164A)")
-+ UNAME_MACHINE="alphaev56" ;;
-+ "EV5.6 (21164PC)")
-+ UNAME_MACHINE="alphapca56" ;;
-+ "EV5.7 (21164PC)")
-+ UNAME_MACHINE="alphapca57" ;;
-+ "EV6 (21264)")
-+ UNAME_MACHINE="alphaev6" ;;
-+ "EV6.7 (21264A)")
-+ UNAME_MACHINE="alphaev67" ;;
-+ "EV6.8CB (21264C)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8AL (21264B)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8CX (21264D)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.9A (21264/EV69A)")
-+ UNAME_MACHINE="alphaev69" ;;
-+ "EV7 (21364)")
-+ UNAME_MACHINE="alphaev7" ;;
-+ "EV7.9 (21364A)")
-+ UNAME_MACHINE="alphaev79" ;;
-+ esac
-+ # A Pn.n version is a patched version.
-+ # A Vn.n version is a released version.
-+ # A Tn.n version is a released field test version.
-+ # A Xn.n version is an unreleased experimental baselevel.
-+ # 1.2 uses "1.2" for uname -r.
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit 0 ;;
-+ Alpha\ *:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # Should we change UNAME_MACHINE based on the output of uname instead
-+ # of the specific Alpha model?
-+ echo alpha-pc-interix
-+ exit 0 ;;
-+ 21064:Windows_NT:50:3)
-+ echo alpha-dec-winnt3.5
-+ exit 0 ;;
-+ Amiga*:UNIX_System_V:4.0:*)
-+ echo m68k-unknown-sysv4
-+ exit 0;;
-+ *:[Aa]miga[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-amigaos
-+ exit 0 ;;
-+ *:[Mm]orph[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-morphos
-+ exit 0 ;;
-+ *:OS/390:*:*)
-+ echo i370-ibm-openedition
-+ exit 0 ;;
-+ *:OS400:*:*)
-+ echo powerpc-ibm-os400
-+ exit 0 ;;
-+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+ echo arm-acorn-riscix${UNAME_RELEASE}
-+ exit 0;;
-+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+ echo hppa1.1-hitachi-hiuxmpp
-+ exit 0;;
-+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+ echo pyramid-pyramid-sysv3
-+ else
-+ echo pyramid-pyramid-bsd
-+ fi
-+ exit 0 ;;
-+ NILE*:*:*:dcosx)
-+ echo pyramid-pyramid-svr4
-+ exit 0 ;;
-+ DRS?6000:unix:4.0:6*)
-+ echo sparc-icl-nx6
-+ exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7*)
-+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
-+ esac ;;
-+ sun4H:SunOS:5.*:*)
-+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ i86pc:SunOS:5.*:*)
-+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:6*:*)
-+ # According to config.sub, this is the proper way to canonicalize
-+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
-+ # it's likely to be more like Solaris than SunOS4.
-+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:*:*)
-+ case "`/usr/bin/arch -k`" in
-+ Series*|S4*)
-+ UNAME_RELEASE=`uname -v`
-+ ;;
-+ esac
-+ # Japanese Language versions have a version number like `4.1.3-JL'.
-+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+ exit 0 ;;
-+ sun3*:SunOS:*:*)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun*:*:4.2BSD:*)
-+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+ case "`/bin/arch`" in
-+ sun3)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ sun4)
-+ echo sparc-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ esac
-+ exit 0 ;;
-+ aushp:SunOS:*:*)
-+ echo sparc-auspex-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ # The situation for MiNT is a little confusing. The machine name
-+ # can be virtually everything (everything which is not
-+ # "atarist" or "atariste" at least should have a processor
-+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
-+ # to the lowercase version "mint" (or "freemint"). Finally
-+ # the system name "TOS" denotes a system which is actually not
-+ # MiNT. But MiNT is downward compatible to TOS, so this should
-+ # be no problem.
-+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ powerpc:machten:*:*)
-+ echo powerpc-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ RISC*:Mach:*:*)
-+ echo mips-dec-mach_bsd4.3
-+ exit 0 ;;
-+ RISC*:ULTRIX:*:*)
-+ echo mips-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ VAX*:ULTRIX*:*:*)
-+ echo vax-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ 2020:CLIX:*:* | 2430:CLIX:*:*)
-+ echo clipper-intergraph-clix${UNAME_RELEASE}
-+ exit 0 ;;
-+ mips:*:*:UMIPS | mips:*:*:RISCos)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h> /* for printf() prototype */
-+ int main (int argc, char *argv[]) {
-+#else
-+ int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+ #if defined (host_mips) && defined (MIPSEB)
-+ #if defined (SYSTYPE_SYSV)
-+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_SVR4)
-+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+ #endif
-+ #endif
-+ exit (-1);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
-+ echo mips-mips-riscos${UNAME_RELEASE}
-+ exit 0 ;;
-+ Motorola:PowerMAX_OS:*:*)
-+ echo powerpc-motorola-powermax
-+ exit 0 ;;
-+ Motorola:*:4.3:PL8-*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:Power_UNIX:*:*)
-+ echo powerpc-harris-powerunix
-+ exit 0 ;;
-+ m88k:CX/UX:7*:*)
-+ echo m88k-harris-cxux7
-+ exit 0 ;;
-+ m88k:*:4*:R4*)
-+ echo m88k-motorola-sysv4
-+ exit 0 ;;
-+ m88k:*:3*:R3*)
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ AViiON:dgux:*:*)
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+ then
-+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+ [ ${TARGET_BINARY_INTERFACE}x = x ]
-+ then
-+ echo m88k-dg-dgux${UNAME_RELEASE}
-+ else
-+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+ fi
-+ else
-+ echo i586-dg-dgux${UNAME_RELEASE}
-+ fi
-+ exit 0 ;;
-+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
-+ echo m88k-dolphin-sysv3
-+ exit 0 ;;
-+ M88*:*:R3*:*)
-+ # Delta 88k system running SVR3
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+ echo m88k-tektronix-sysv3
-+ exit 0 ;;
-+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+ echo m68k-tektronix-bsd
-+ exit 0 ;;
-+ *:IRIX*:*:*)
-+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+ exit 0 ;;
-+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
-+ i*86:AIX:*:*)
-+ echo i386-ibm-aix
-+ exit 0 ;;
-+ ia64:AIX:*:*)
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:2:3)
-+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <sys/systemcfg.h>
-+
-+ main()
-+ {
-+ if (!__power_pc())
-+ exit(1);
-+ puts("powerpc-ibm-aix3.2.5");
-+ exit(0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo rs6000-ibm-aix3.2.5
-+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+ echo rs6000-ibm-aix3.2.4
-+ else
-+ echo rs6000-ibm-aix3.2
-+ fi
-+ exit 0 ;;
-+ *:AIX:*:[45])
-+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+ IBM_ARCH=rs6000
-+ else
-+ IBM_ARCH=powerpc
-+ fi
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:*:*)
-+ echo rs6000-ibm-aix
-+ exit 0 ;;
-+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+ echo romp-ibm-bsd4.4
-+ exit 0 ;;
-+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-+ exit 0 ;; # report: romp-ibm BSD 4.3
-+ *:BOSX:*:*)
-+ echo rs6000-bull-bosx
-+ exit 0 ;;
-+ DPX/2?00:B.O.S.:*:*)
-+ echo m68k-bull-sysv3
-+ exit 0 ;;
-+ 9000/[34]??:4.3bsd:1.*:*)
-+ echo m68k-hp-bsd
-+ exit 0 ;;
-+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+ echo m68k-hp-bsd4.4
-+ exit 0 ;;
-+ 9000/[34678]??:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ case "${UNAME_MACHINE}" in
-+ 9000/31? ) HP_ARCH=m68000 ;;
-+ 9000/[34]?? ) HP_ARCH=m68k ;;
-+ 9000/[678][0-9][0-9])
-+ if [ -x /usr/bin/getconf ]; then
-+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
-+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-+ esac ;;
-+ esac
-+ fi
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
-+EOF
-+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+ test -z "$HP_ARCH" && HP_ARCH=hppa
-+ fi ;;
-+ esac
-+ if [ ${HP_ARCH} = "hppa2.0w" ]
-+ then
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
-+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ ia64:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ echo ia64-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ 3050*:HI-UX:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <unistd.h>
-+ int
-+ main ()
-+ {
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
-+ results, however. */
-+ if (CPU_IS_PA_RISC (cpu))
-+ {
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+ default: puts ("hppa-hitachi-hiuxwe2"); break;
-+ }
-+ }
-+ else if (CPU_IS_HP_MC68K (cpu))
-+ puts ("m68k-hitachi-hiuxwe2");
-+ else puts ("unknown-hitachi-hiuxwe2");
-+ exit (0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo unknown-hitachi-hiuxwe2
-+ exit 0 ;;
-+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+ echo hppa1.1-hp-bsd
-+ exit 0 ;;
-+ 9000/8??:4.3bsd:*:*)
-+ echo hppa1.0-hp-bsd
-+ exit 0 ;;
-+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+ echo hppa1.0-hp-mpeix
-+ exit 0 ;;
-+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+ echo hppa1.1-hp-osf
-+ exit 0 ;;
-+ hp8??:OSF1:*:*)
-+ echo hppa1.0-hp-osf
-+ exit 0 ;;
-+ i*86:OSF1:*:*)
-+ if [ -x /usr/sbin/sysversion ] ; then
-+ echo ${UNAME_MACHINE}-unknown-osf1mk
-+ else
-+ echo ${UNAME_MACHINE}-unknown-osf1
-+ fi
-+ exit 0 ;;
-+ parisc*:Lites*:*:*)
-+ echo hppa1.1-hp-lites
-+ exit 0 ;;
-+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ CRAY*Y-MP:*:*:*)
-+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*[A-Z]90:*:*:*)
-+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*TS:*:*:*)
-+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*T3E:*:*:*)
-+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*SV1:*:*:*)
-+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ *:UNICOS/mp:*:*)
-+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ 5000:UNIX_System_V:4.*:*)
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ sparc*:BSD/OS:*:*)
-+ echo sparc-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:BSD/OS:*:*)
-+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:FreeBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ i*:CYGWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-cygwin
-+ exit 0 ;;
-+ i*:MINGW*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw32
-+ exit 0 ;;
-+ i*:PW*:*)
-+ echo ${UNAME_MACHINE}-pc-pw32
-+ exit 0 ;;
-+ x86:Interix*:[34]*)
-+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
-+ exit 0 ;;
-+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+ # UNAME_MACHINE based on the output of uname instead of i386?
-+ echo i586-pc-interix
-+ exit 0 ;;
-+ i*:UWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-uwin
-+ exit 0 ;;
-+ p*:CYGWIN*:*)
-+ echo powerpcle-unknown-cygwin
-+ exit 0 ;;
-+ prep*:SunOS:5.*:*)
-+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ *:GNU:*:*)
-+ # the GNU system
-+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+ exit 0 ;;
-+ *:GNU/*:*:*)
-+ # other systems with GNU libc and userland
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ exit 0 ;;
-+ i*86:Minix:*:*)
-+ echo ${UNAME_MACHINE}-pc-minix
-+ exit 0 ;;
-+ arm*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ cris:Linux:*:*)
-+ echo cris-axis-linux-gnu
-+ exit 0 ;;
-+ ia64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m68*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ mips:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips
-+ #undef mipsel
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mipsel
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ mips64:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips64
-+ #undef mips64el
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mips64el
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips64
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
-+ exit 0 ;;
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit 0 ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit 0 ;;
-+ parisc:Linux:*:* | hppa:Linux:*:*)
-+ # Look for CPU level
-+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
-+ esac
-+ exit 0 ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
-+ exit 0 ;;
-+ s390:Linux:*:* | s390x:Linux:*:*)
-+ echo ${UNAME_MACHINE}-ibm-linux
-+ exit 0 ;;
-+ sh64*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sh*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sparc:Linux:*:* | sparc64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ x86_64:Linux:*:*)
-+ echo x86_64-unknown-linux-gnu
-+ exit 0 ;;
-+ i*86:Linux:*:*)
-+ # The BFD linker knows what the default object file format is, so
-+ # first see if it will tell us. cd to the root directory to prevent
-+ # problems with other programs or directories called `ld' in the path.
-+ # Set LC_ALL=C to ensure ld outputs messages in English.
-+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+ | sed -ne '/supported targets:/!d
-+ s/[ ][ ]*/ /g
-+ s/.*supported targets: *//
-+ s/ .*//
-+ p'`
-+ case "$ld_supported_targets" in
-+ elf32-i386)
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+ ;;
-+ a.out-i386-linux)
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+ exit 0 ;;
-+ coff-i386)
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+ exit 0 ;;
-+ "")
-+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
-+ # one that does not give us useful --help.
-+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+ exit 0 ;;
-+ esac
-+ # Determine whether the default compiler is a.out or elf
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #ifdef __ELF__
-+ # ifdef __GLIBC__
-+ # if __GLIBC__ >= 2
-+ LIBC=gnu
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ #else
-+ #ifdef __INTEL_COMPILER
-+ LIBC=gnu
-+ #else
-+ LIBC=gnuaout
-+ #endif
-+ #endif
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+ ;;
-+ i*86:DYNIX/ptx:4*:*)
-+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+ # earlier versions are messed up and put the nodename in both
-+ # sysname and nodename.
-+ echo i386-sequent-sysv4
-+ exit 0 ;;
-+ i*86:UNIX_SV:4.2MP:2.*)
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
-+ # I just have to hope. -- rms.
-+ # Use sysv4.2uw... so that sysv4* matches it.
-+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:OS/2:*:*)
-+ # If we were able to find `uname', then EMX Unix compatibility
-+ # is probably installed.
-+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit 0 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:syllable:*:*)
-+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
-+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+ else
-+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ fi
-+ exit 0 ;;
-+ i*86:*:5:[78]*)
-+ case `/bin/uname -X | grep "^Machine"` in
-+ *486*) UNAME_MACHINE=i486 ;;
-+ *Pentium) UNAME_MACHINE=i586 ;;
-+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+ esac
-+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:*:3.2:*)
-+ if test -f /usr/options/cb.name; then
-+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+ && UNAME_MACHINE=i586
-+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+ else
-+ echo ${UNAME_MACHINE}-pc-sysv32
-+ fi
-+ exit 0 ;;
-+ pc:*:*:*)
-+ # Left here for compatibility:
-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+ # the processor, so we play safe by assuming i386.
-+ echo i386-pc-msdosdjgpp
-+ exit 0 ;;
-+ Intel:Mach:3*:*)
-+ echo i386-pc-mach3
-+ exit 0 ;;
-+ paragon:*:*:*)
-+ echo i860-intel-osf1
-+ exit 0 ;;
-+ i860:*:4.*:*) # i860-SVR4
-+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+ else # Add other i860-SVR4 vendors below as they are discovered.
-+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
-+ fi
-+ exit 0 ;;
-+ mini*:CTIX:SYS*5:*)
-+ # "miniframe"
-+ echo m68010-convergent-sysv
-+ exit 0 ;;
-+ mc68k:UNIX:SYSTEM5:3.51m)
-+ echo m68k-convergent-sysv
-+ exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
-+ M68*:*:R3V[5678]*:*)
-+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+ OS_REL=''
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && echo i486-ncr-sysv4 && exit 0 ;;
-+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+ echo m68k-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ mc68030:UNIX_System_V:4.*:*)
-+ echo m68k-atari-sysv4
-+ exit 0 ;;
-+ TSUNAMI:LynxOS:2.*:*)
-+ echo sparc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ rs6000:LynxOS:2.*:*)
-+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ SM[BE]S:UNIX_SV:*:*)
-+ echo mips-dde-sysv${UNAME_RELEASE}
-+ exit 0 ;;
-+ RM*:ReliantUNIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ RM*:SINIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ *:SINIX-*:*:*)
-+ if uname -p 2>/dev/null >/dev/null ; then
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ echo ${UNAME_MACHINE}-sni-sysv4
-+ else
-+ echo ns32k-sni-sysv
-+ fi
-+ exit 0 ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel@ccMail.Census.GOV>
-+ echo i586-unisys-sysv4
-+ exit 0 ;;
-+ *:UNIX_System_V:4*:FTX*)
-+ # From Gerald Hewes <hewes@openmarket.com>.
-+ # How about differentiating between stratus architectures? -djm
-+ echo hppa1.1-stratus-sysv4
-+ exit 0 ;;
-+ *:*:*:FTX*)
-+ # From seanf@swdc.stratus.com.
-+ echo i860-stratus-sysv4
-+ exit 0 ;;
-+ *:VOS:*:*)
-+ # From Paul.Green@stratus.com.
-+ echo hppa1.1-stratus-vos
-+ exit 0 ;;
-+ mc68*:A/UX:*:*)
-+ echo m68k-apple-aux${UNAME_RELEASE}
-+ exit 0 ;;
-+ news*:NEWS-OS:6*:*)
-+ echo mips-sony-newsos6
-+ exit 0 ;;
-+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+ if [ -d /usr/nec ]; then
-+ echo mips-nec-sysv${UNAME_RELEASE}
-+ else
-+ echo mips-unknown-sysv${UNAME_RELEASE}
-+ fi
-+ exit 0 ;;
-+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-+ echo powerpc-be-beos
-+ exit 0 ;;
-+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
-+ echo powerpc-apple-beos
-+ exit 0 ;;
-+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
-+ echo i586-pc-beos
-+ exit 0 ;;
-+ SX-4:SUPER-UX:*:*)
-+ echo sx4-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-5:SUPER-UX:*:*)
-+ echo sx5-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-6:SUPER-UX:*:*)
-+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ Power*:Rhapsody:*:*)
-+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Rhapsody:*:*)
-+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Darwin:*:*)
-+ case `uname -p` in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ UNAME_PROCESSOR=`uname -p`
-+ if test "$UNAME_PROCESSOR" = "x86"; then
-+ UNAME_PROCESSOR=i386
-+ UNAME_MACHINE=pc
-+ fi
-+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:QNX:*:4*)
-+ echo i386-pc-qnx
-+ exit 0 ;;
-+ NSR-?:NONSTOP_KERNEL:*:*)
-+ echo nsr-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:NonStop-UX:*:*)
-+ echo mips-compaq-nonstopux
-+ exit 0 ;;
-+ BS2000:POSIX*:*:*)
-+ echo bs2000-siemens-sysv
-+ exit 0 ;;
-+ DS/*:UNIX_System_V:*:*)
-+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Plan9:*:*)
-+ # "uname -m" is not consistent, so use $cputype instead. 386
-+ # is converted to i386 for consistency with other x86
-+ # operating systems.
-+ if test "$cputype" = "386"; then
-+ UNAME_MACHINE=i386
-+ else
-+ UNAME_MACHINE="$cputype"
-+ fi
-+ echo ${UNAME_MACHINE}-unknown-plan9
-+ exit 0 ;;
-+ *:TOPS-10:*:*)
-+ echo pdp10-unknown-tops10
-+ exit 0 ;;
-+ *:TENEX:*:*)
-+ echo pdp10-unknown-tenex
-+ exit 0 ;;
-+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+ echo pdp10-dec-tops20
-+ exit 0 ;;
-+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+ echo pdp10-xkl-tops20
-+ exit 0 ;;
-+ *:TOPS-20:*:*)
-+ echo pdp10-unknown-tops20
-+ exit 0 ;;
-+ *:ITS:*:*)
-+ echo pdp10-unknown-its
-+ exit 0 ;;
-+ SEI:*:*:SEIUX)
-+ echo mips-sei-seiux${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ *:*VMS:*:*)
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ case "${UNAME_MACHINE}" in
-+ A*) echo alpha-dec-vms && exit 0 ;;
-+ I*) echo ia64-dec-vms && exit 0 ;;
-+ V*) echo vax-dec-vms && exit 0 ;;
-+ esac
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
-+ I don't know.... */
-+ printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+ printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+ "4"
-+#else
-+ ""
-+#endif
-+ ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+ printf ("arm-acorn-riscix"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+ printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+ int version;
-+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+ if (version < 4)
-+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ else
-+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+ exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+ printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+ printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+ printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+ printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+ printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+ printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+ struct utsname un;
-+
-+ uname(&un);
-+
-+ if (strncmp(un.version, "V2", 2) == 0) {
-+ printf ("i386-sequent-ptx2\n"); exit (0);
-+ }
-+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+ printf ("i386-sequent-ptx1\n"); exit (0);
-+ }
-+ printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+# include <sys/param.h>
-+# if defined (BSD)
-+# if BSD == 43
-+ printf ("vax-dec-bsd4.3\n"); exit (0);
-+# else
-+# if BSD == 199006
-+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# endif
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# else
-+ printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+ printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+ exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+ case `getsysinfo -f cpu_type` in
-+ c1*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ c2*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ c34*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ c38*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ c4*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+ ftp://ftp.gnu.org/pub/gnu/config/
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo = `(hostinfo) 2>/dev/null`
-+/bin/universe = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -Nrua kdeadmin-3.4.0.orig/admin/config.sub kdeadmin-3.4.0/admin/config.sub
---- kdeadmin-3.4.0.orig/admin/config.sub 2005-03-04 21:29:47.757426020 +0100
-+++ kdeadmin-3.4.0/admin/config.sub 2005-03-04 21:30:27.996763843 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
--timestamp='2004-06-24'
-+timestamp='2004-11-30'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -267,7 +267,7 @@
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xstormy16 | xtensa \
-+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-@@ -343,8 +343,8 @@
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-- | xtensa-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-@@ -457,6 +457,9 @@
- crds | unos)
- basic_machine=m68k-crds
- ;;
-+ crisv32 | crisv32-* | etraxfs*)
-+ basic_machine=crisv32-axis
-+ ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-@@ -486,6 +489,10 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ djgpp)
-+ basic_machine=i586-pc
-+ os=-msdosdjgpp
-+ ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
-@@ -1026,6 +1033,10 @@
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
-+ xbox)
-+ basic_machine=i686-pc
-+ os=-mingw32
-+ ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-@@ -1294,6 +1305,9 @@
- -kaos*)
- os=-kaos
- ;;
-+ -zvmoe)
-+ os=-zvmoe
-+ ;;
- -none)
- ;;
- *)
-diff -Nrua kdeadmin-3.4.0.orig/admin/config.sub.cdbs-orig kdeadmin-3.4.0/admin/config.sub.cdbs-orig
---- kdeadmin-3.4.0.orig/admin/config.sub.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdeadmin-3.4.0/admin/config.sub.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
-@@ -0,0 +1,1552 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-06-24'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine. It does not imply ALL GNU software can.
-+#
-+# 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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# 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., 59 Temple Place - Suite 330,
-+# Boston, MA 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support. The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+ $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help"
-+ exit 1 ;;
-+
-+ *local*)
-+ # First pass through any local machine types.
-+ echo $1
-+ exit 0;;
-+
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+ exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+ exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-+case $maybe_os in
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+ os=-$maybe_os
-+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-+ ;;
-+ *)
-+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+ if [ $basic_machine != $1 ]
-+ then os=`echo $1 | sed 's/.*-/-/'`
-+ else os=; fi
-+ ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work. We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+ -sun*os*)
-+ # Prevent following clause from handling this invalid input.
-+ ;;
-+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+ -apple | -axis | -knuth | -cray)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -sim | -cisco | -oki | -wec | -winbond)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -scout)
-+ ;;
-+ -wrs)
-+ os=-vxworks
-+ basic_machine=$1
-+ ;;
-+ -chorusos*)
-+ os=-chorusos
-+ basic_machine=$1
-+ ;;
-+ -chorusrdb)
-+ os=-chorusrdb
-+ basic_machine=$1
-+ ;;
-+ -hiux*)
-+ os=-hiuxwe2
-+ ;;
-+ -sco5)
-+ os=-sco3.2v5
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco4)
-+ os=-sco3.2v4
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2.[4-9]*)
-+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2v[4-9]*)
-+ # Don't forget version if it is 3.2v4 or newer.
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco*)
-+ os=-sco3.2v2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -udk*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -isc)
-+ os=-isc2.2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -clix*)
-+ basic_machine=clipper-intergraph
-+ ;;
-+ -isc*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -lynx*)
-+ os=-lynxos
-+ ;;
-+ -ptx*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+ ;;
-+ -windowsnt*)
-+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+ ;;
-+ -psos*)
-+ os=-psos
-+ ;;
-+ -mint | -mint[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+ # Recognize the basic CPU types without company name.
-+ # Some are omitted here because they have special meanings below.
-+ 1750a | 580 \
-+ | a29k \
-+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+ | am33_2.0 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | c4x | clipper \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | fr30 | frv \
-+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | i370 | i860 | i960 | ia64 \
-+ | ip2k | iq2000 \
-+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
-+ | mips | mipsbe | mipseb | mipsel | mipsle \
-+ | mips16 \
-+ | mips64 | mips64el \
-+ | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
-+ | mips64vr4100 | mips64vr4100el \
-+ | mips64vr4300 | mips64vr4300el \
-+ | mips64vr5000 | mips64vr5000el \
-+ | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa64 | mipsisa64el \
-+ | mipsisa64r2 | mipsisa64r2el \
-+ | mipsisa64sb1 | mipsisa64sb1el \
-+ | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipstx39 | mipstx39el \
-+ | mn10200 | mn10300 \
-+ | msp430 \
-+ | ns16k | ns32k \
-+ | openrisc | or32 \
-+ | pdp10 | pdp11 | pj | pjl \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | pyramid \
-+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+ | strongarm \
-+ | tahoe | thumb | tic4x | tic80 | tron \
-+ | v850 | v850e \
-+ | we32k \
-+ | x86 | xscale | xstormy16 | xtensa \
-+ | z8k)
-+ basic_machine=$basic_machine-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12)
-+ # Motorola 68HC11/12.
-+ basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+ ;;
-+
-+ # We use `pc' rather than `unknown'
-+ # because (1) that's what they normally are, and
-+ # (2) the word "unknown" tends to confuse beginning users.
-+ i*86 | x86_64)
-+ basic_machine=$basic_machine-pc
-+ ;;
-+ # Object if more than one company name word.
-+ *-*-*)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+ # Recognize the basic CPU types with company name.
-+ 580-* \
-+ | a29k-* \
-+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
-+ | bs2000-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+ | clipper-* | craynv-* | cydra-* \
-+ | d10v-* | d30v-* | dlx-* \
-+ | elxsi-* \
-+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | h8300-* | h8500-* \
-+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | i*86-* | i860-* | i960-* | ia64-* \
-+ | ip2k-* | iq2000-* \
-+ | m32r-* | m32rle-* \
-+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+ | m88110-* | m88k-* | mcore-* \
-+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+ | mips16-* \
-+ | mips64-* | mips64el-* \
-+ | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
-+ | mips64vr4100-* | mips64vr4100el-* \
-+ | mips64vr4300-* | mips64vr4300el-* \
-+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64r2-* | mipsisa64r2el-* \
-+ | mipsisa64sb1-* | mipsisa64sb1el-* \
-+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | mmix-* \
-+ | msp430-* \
-+ | none-* | np1-* | ns16k-* | ns32k-* \
-+ | orion-* \
-+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | pyramid-* \
-+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | tahoe-* | thumb-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tron-* \
-+ | v850-* | v850e-* | vax-* \
-+ | we32k-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-+ | xtensa-* \
-+ | ymp-* \
-+ | z8k-*)
-+ ;;
-+ # Recognize the various machine names and aliases which stand
-+ # for a CPU type and a company and sometimes even an OS.
-+ 386bsd)
-+ basic_machine=i386-unknown
-+ os=-bsd
-+ ;;
-+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+ basic_machine=m68000-att
-+ ;;
-+ 3b*)
-+ basic_machine=we32k-att
-+ ;;
-+ a29khif)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
-+ adobe68k)
-+ basic_machine=m68010-adobe
-+ os=-scout
-+ ;;
-+ alliant | fx80)
-+ basic_machine=fx80-alliant
-+ ;;
-+ altos | altos3068)
-+ basic_machine=m68k-altos
-+ ;;
-+ am29k)
-+ basic_machine=a29k-none
-+ os=-bsd
-+ ;;
-+ amd64)
-+ basic_machine=x86_64-pc
-+ ;;
-+ amd64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ amdahl)
-+ basic_machine=580-amdahl
-+ os=-sysv
-+ ;;
-+ amiga | amiga-*)
-+ basic_machine=m68k-unknown
-+ ;;
-+ amigaos | amigados)
-+ basic_machine=m68k-unknown
-+ os=-amigaos
-+ ;;
-+ amigaunix | amix)
-+ basic_machine=m68k-unknown
-+ os=-sysv4
-+ ;;
-+ apollo68)
-+ basic_machine=m68k-apollo
-+ os=-sysv
-+ ;;
-+ apollo68bsd)
-+ basic_machine=m68k-apollo
-+ os=-bsd
-+ ;;
-+ aux)
-+ basic_machine=m68k-apple
-+ os=-aux
-+ ;;
-+ balance)
-+ basic_machine=ns32k-sequent
-+ os=-dynix
-+ ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
-+ convex-c1)
-+ basic_machine=c1-convex
-+ os=-bsd
-+ ;;
-+ convex-c2)
-+ basic_machine=c2-convex
-+ os=-bsd
-+ ;;
-+ convex-c32)
-+ basic_machine=c32-convex
-+ os=-bsd
-+ ;;
-+ convex-c34)
-+ basic_machine=c34-convex
-+ os=-bsd
-+ ;;
-+ convex-c38)
-+ basic_machine=c38-convex
-+ os=-bsd
-+ ;;
-+ cray | j90)
-+ basic_machine=j90-cray
-+ os=-unicos
-+ ;;
-+ craynv)
-+ basic_machine=craynv-cray
-+ os=-unicosmp
-+ ;;
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
-+ ;;
-+ crds | unos)
-+ basic_machine=m68k-crds
-+ ;;
-+ cris | cris-* | etrax*)
-+ basic_machine=cris-axis
-+ ;;
-+ crx)
-+ basic_machine=crx-unknown
-+ os=-elf
-+ ;;
-+ da30 | da30-*)
-+ basic_machine=m68k-da30
-+ ;;
-+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+ basic_machine=mips-dec
-+ ;;
-+ decsystem10* | dec10*)
-+ basic_machine=pdp10-dec
-+ os=-tops10
-+ ;;
-+ decsystem20* | dec20*)
-+ basic_machine=pdp10-dec
-+ os=-tops20
-+ ;;
-+ delta | 3300 | motorola-3300 | motorola-delta \
-+ | 3300-motorola | delta-motorola)
-+ basic_machine=m68k-motorola
-+ ;;
-+ delta88)
-+ basic_machine=m88k-motorola
-+ os=-sysv3
-+ ;;
-+ dpx20 | dpx20-*)
-+ basic_machine=rs6000-bull
-+ os=-bosx
-+ ;;
-+ dpx2* | dpx2*-bull)
-+ basic_machine=m68k-bull
-+ os=-sysv3
-+ ;;
-+ ebmon29k)
-+ basic_machine=a29k-amd
-+ os=-ebmon
-+ ;;
-+ elxsi)
-+ basic_machine=elxsi-elxsi
-+ os=-bsd
-+ ;;
-+ encore | umax | mmax)
-+ basic_machine=ns32k-encore
-+ ;;
-+ es1800 | OSE68k | ose68k | ose | OSE)
-+ basic_machine=m68k-ericsson
-+ os=-ose
-+ ;;
-+ fx2800)
-+ basic_machine=i860-alliant
-+ ;;
-+ genix)
-+ basic_machine=ns32k-ns
-+ ;;
-+ gmicro)
-+ basic_machine=tron-gmicro
-+ os=-sysv
-+ ;;
-+ go32)
-+ basic_machine=i386-pc
-+ os=-go32
-+ ;;
-+ h3050r* | hiux*)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ h8300hms)
-+ basic_machine=h8300-hitachi
-+ os=-hms
-+ ;;
-+ h8300xray)
-+ basic_machine=h8300-hitachi
-+ os=-xray
-+ ;;
-+ h8500hms)
-+ basic_machine=h8500-hitachi
-+ os=-hms
-+ ;;
-+ harris)
-+ basic_machine=m88k-harris
-+ os=-sysv3
-+ ;;
-+ hp300-*)
-+ basic_machine=m68k-hp
-+ ;;
-+ hp300bsd)
-+ basic_machine=m68k-hp
-+ os=-bsd
-+ ;;
-+ hp300hpux)
-+ basic_machine=m68k-hp
-+ os=-hpux
-+ ;;
-+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k2[0-9][0-9] | hp9k31[0-9])
-+ basic_machine=m68000-hp
-+ ;;
-+ hp9k3[2-9][0-9])
-+ basic_machine=m68k-hp
-+ ;;
-+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k78[0-9] | hp78[0-9])
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][13679] | hp8[0-9][13679])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hppa-next)
-+ os=-nextstep3
-+ ;;
-+ hppaosf)
-+ basic_machine=hppa1.1-hp
-+ os=-osf
-+ ;;
-+ hppro)
-+ basic_machine=hppa1.1-hp
-+ os=-proelf
-+ ;;
-+ i370-ibm* | ibm*)
-+ basic_machine=i370-ibm
-+ ;;
-+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
-+ i*86v32)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv32
-+ ;;
-+ i*86v4*)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv4
-+ ;;
-+ i*86v)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv
-+ ;;
-+ i*86sol2)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-solaris2
-+ ;;
-+ i386mach)
-+ basic_machine=i386-mach
-+ os=-mach
-+ ;;
-+ i386-vsta | vsta)
-+ basic_machine=i386-unknown
-+ os=-vsta
-+ ;;
-+ iris | iris4d)
-+ basic_machine=mips-sgi
-+ case $os in
-+ -irix*)
-+ ;;
-+ *)
-+ os=-irix4
-+ ;;
-+ esac
-+ ;;
-+ isi68 | isi)
-+ basic_machine=m68k-isi
-+ os=-sysv
-+ ;;
-+ m88k-omron*)
-+ basic_machine=m88k-omron
-+ ;;
-+ magnum | m3230)
-+ basic_machine=mips-mips
-+ os=-sysv
-+ ;;
-+ merlin)
-+ basic_machine=ns32k-utek
-+ os=-sysv
-+ ;;
-+ mingw32)
-+ basic_machine=i386-pc
-+ os=-mingw32
-+ ;;
-+ miniframe)
-+ basic_machine=m68000-convergent
-+ ;;
-+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+ mips3*-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+ ;;
-+ mips3*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+ ;;
-+ monitor)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ morphos)
-+ basic_machine=powerpc-unknown
-+ os=-morphos
-+ ;;
-+ msdos)
-+ basic_machine=i386-pc
-+ os=-msdos
-+ ;;
-+ mvs)
-+ basic_machine=i370-ibm
-+ os=-mvs
-+ ;;
-+ ncr3000)
-+ basic_machine=i486-ncr
-+ os=-sysv4
-+ ;;
-+ netbsd386)
-+ basic_machine=i386-unknown
-+ os=-netbsd
-+ ;;
-+ netwinder)
-+ basic_machine=armv4l-rebel
-+ os=-linux
-+ ;;
-+ news | news700 | news800 | news900)
-+ basic_machine=m68k-sony
-+ os=-newsos
-+ ;;
-+ news1000)
-+ basic_machine=m68030-sony
-+ os=-newsos
-+ ;;
-+ news-3600 | risc-news)
-+ basic_machine=mips-sony
-+ os=-newsos
-+ ;;
-+ necv70)
-+ basic_machine=v70-nec
-+ os=-sysv
-+ ;;
-+ next | m*-next )
-+ basic_machine=m68k-next
-+ case $os in
-+ -nextstep* )
-+ ;;
-+ -ns2*)
-+ os=-nextstep2
-+ ;;
-+ *)
-+ os=-nextstep3
-+ ;;
-+ esac
-+ ;;
-+ nh3000)
-+ basic_machine=m68k-harris
-+ os=-cxux
-+ ;;
-+ nh[45]000)
-+ basic_machine=m88k-harris
-+ os=-cxux
-+ ;;
-+ nindy960)
-+ basic_machine=i960-intel
-+ os=-nindy
-+ ;;
-+ mon960)
-+ basic_machine=i960-intel
-+ os=-mon960
-+ ;;
-+ nonstopux)
-+ basic_machine=mips-compaq
-+ os=-nonstopux
-+ ;;
-+ np1)
-+ basic_machine=np1-gould
-+ ;;
-+ nsr-tandem)
-+ basic_machine=nsr-tandem
-+ ;;
-+ op50n-* | op60c-*)
-+ basic_machine=hppa1.1-oki
-+ os=-proelf
-+ ;;
-+ or32 | or32-*)
-+ basic_machine=or32-unknown
-+ os=-coff
-+ ;;
-+ os400)
-+ basic_machine=powerpc-ibm
-+ os=-os400
-+ ;;
-+ OSE68000 | ose68000)
-+ basic_machine=m68000-ericsson
-+ os=-ose
-+ ;;
-+ os68k)
-+ basic_machine=m68k-none
-+ os=-os68k
-+ ;;
-+ pa-hitachi)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ paragon)
-+ basic_machine=i860-intel
-+ os=-osf
-+ ;;
-+ pbd)
-+ basic_machine=sparc-tti
-+ ;;
-+ pbb)
-+ basic_machine=m68k-tti
-+ ;;
-+ pc532 | pc532-*)
-+ basic_machine=ns32k-pc532
-+ ;;
-+ pentium | p5 | k5 | k6 | nexgen | viac3)
-+ basic_machine=i586-pc
-+ ;;
-+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+ basic_machine=i686-pc
-+ ;;
-+ pentiumii | pentium2 | pentiumiii | pentium3)
-+ basic_machine=i686-pc
-+ ;;
-+ pentium4)
-+ basic_machine=i786-pc
-+ ;;
-+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentium4-*)
-+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pn)
-+ basic_machine=pn-gould
-+ ;;
-+ power) basic_machine=power-ibm
-+ ;;
-+ ppc) basic_machine=powerpc-unknown
-+ ;;
-+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppcle | powerpclittle | ppc-le | powerpc-little)
-+ basic_machine=powerpcle-unknown
-+ ;;
-+ ppcle-* | powerpclittle-*)
-+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64) basic_machine=powerpc64-unknown
-+ ;;
-+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+ basic_machine=powerpc64le-unknown
-+ ;;
-+ ppc64le-* | powerpc64little-*)
-+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ps2)
-+ basic_machine=i386-ibm
-+ ;;
-+ pw32)
-+ basic_machine=i586-unknown
-+ os=-pw32
-+ ;;
-+ rom68k)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ rm[46]00)
-+ basic_machine=mips-siemens
-+ ;;
-+ rtpc | rtpc-*)
-+ basic_machine=romp-ibm
-+ ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
-+ sa29200)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ sb1)
-+ basic_machine=mipsisa64sb1-unknown
-+ ;;
-+ sb1el)
-+ basic_machine=mipsisa64sb1el-unknown
-+ ;;
-+ sei)
-+ basic_machine=mips-sei
-+ os=-seiux
-+ ;;
-+ sequent)
-+ basic_machine=i386-sequent
-+ ;;
-+ sh)
-+ basic_machine=sh-hitachi
-+ os=-hms
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparclite-wrs | simso-wrs)
-+ basic_machine=sparclite-wrs
-+ os=-vxworks
-+ ;;
-+ sps7)
-+ basic_machine=m68k-bull
-+ os=-sysv2
-+ ;;
-+ spur)
-+ basic_machine=spur-unknown
-+ ;;
-+ st2000)
-+ basic_machine=m68k-tandem
-+ ;;
-+ stratus)
-+ basic_machine=i860-stratus
-+ os=-sysv4
-+ ;;
-+ sun2)
-+ basic_machine=m68000-sun
-+ ;;
-+ sun2os3)
-+ basic_machine=m68000-sun
-+ os=-sunos3
-+ ;;
-+ sun2os4)
-+ basic_machine=m68000-sun
-+ os=-sunos4
-+ ;;
-+ sun3os3)
-+ basic_machine=m68k-sun
-+ os=-sunos3
-+ ;;
-+ sun3os4)
-+ basic_machine=m68k-sun
-+ os=-sunos4
-+ ;;
-+ sun4os3)
-+ basic_machine=sparc-sun
-+ os=-sunos3
-+ ;;
-+ sun4os4)
-+ basic_machine=sparc-sun
-+ os=-sunos4
-+ ;;
-+ sun4sol2)
-+ basic_machine=sparc-sun
-+ os=-solaris2
-+ ;;
-+ sun3 | sun3-*)
-+ basic_machine=m68k-sun
-+ ;;
-+ sun4)
-+ basic_machine=sparc-sun
-+ ;;
-+ sun386 | sun386i | roadrunner)
-+ basic_machine=i386-sun
-+ ;;
-+ sv1)
-+ basic_machine=sv1-cray
-+ os=-unicos
-+ ;;
-+ symmetry)
-+ basic_machine=i386-sequent
-+ os=-dynix
-+ ;;
-+ t3e)
-+ basic_machine=alphaev5-cray
-+ os=-unicos
-+ ;;
-+ t90)
-+ basic_machine=t90-cray
-+ os=-unicos
-+ ;;
-+ tic54x | c54x*)
-+ basic_machine=tic54x-unknown
-+ os=-coff
-+ ;;
-+ tic55x | c55x*)
-+ basic_machine=tic55x-unknown
-+ os=-coff
-+ ;;
-+ tic6x | c6x*)
-+ basic_machine=tic6x-unknown
-+ os=-coff
-+ ;;
-+ tx39)
-+ basic_machine=mipstx39-unknown
-+ ;;
-+ tx39el)
-+ basic_machine=mipstx39el-unknown
-+ ;;
-+ toad1)
-+ basic_machine=pdp10-xkl
-+ os=-tops20
-+ ;;
-+ tower | tower-32)
-+ basic_machine=m68k-ncr
-+ ;;
-+ tpf)
-+ basic_machine=s390x-ibm
-+ os=-tpf
-+ ;;
-+ udi29k)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ ultra3)
-+ basic_machine=a29k-nyu
-+ os=-sym1
-+ ;;
-+ v810 | necv810)
-+ basic_machine=v810-nec
-+ os=-none
-+ ;;
-+ vaxv)
-+ basic_machine=vax-dec
-+ os=-sysv
-+ ;;
-+ vms)
-+ basic_machine=vax-dec
-+ os=-vms
-+ ;;
-+ vpp*|vx|vx-*)
-+ basic_machine=f301-fujitsu
-+ ;;
-+ vxworks960)
-+ basic_machine=i960-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks68)
-+ basic_machine=m68k-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks29k)
-+ basic_machine=a29k-wrs
-+ os=-vxworks
-+ ;;
-+ w65*)
-+ basic_machine=w65-wdc
-+ os=-none
-+ ;;
-+ w89k-*)
-+ basic_machine=hppa1.1-winbond
-+ os=-proelf
-+ ;;
-+ xps | xps100)
-+ basic_machine=xps100-honeywell
-+ ;;
-+ ymp)
-+ basic_machine=ymp-cray
-+ os=-unicos
-+ ;;
-+ z8k-*-coff)
-+ basic_machine=z8k-unknown
-+ os=-sim
-+ ;;
-+ none)
-+ basic_machine=none-none
-+ os=-none
-+ ;;
-+
-+# Here we handle the default manufacturer of certain CPU types. It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+ w89k)
-+ basic_machine=hppa1.1-winbond
-+ ;;
-+ op50n)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ op60c)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ romp)
-+ basic_machine=romp-ibm
-+ ;;
-+ mmix)
-+ basic_machine=mmix-knuth
-+ ;;
-+ rs6000)
-+ basic_machine=rs6000-ibm
-+ ;;
-+ vax)
-+ basic_machine=vax-dec
-+ ;;
-+ pdp10)
-+ # there are many clones, so DEC is not a safe bet
-+ basic_machine=pdp10-unknown
-+ ;;
-+ pdp11)
-+ basic_machine=pdp11-dec
-+ ;;
-+ we32k)
-+ basic_machine=we32k-att
-+ ;;
-+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+ basic_machine=sh-unknown
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
-+ basic_machine=sparc-sun
-+ ;;
-+ cydra)
-+ basic_machine=cydra-cydrome
-+ ;;
-+ orion)
-+ basic_machine=orion-highlevel
-+ ;;
-+ orion105)
-+ basic_machine=clipper-highlevel
-+ ;;
-+ mac | mpw | mac-mpw)
-+ basic_machine=m68k-apple
-+ ;;
-+ pmac | pmac-mpw)
-+ basic_machine=powerpc-apple
-+ ;;
-+ *-unknown)
-+ # Make sure to match an already-canonicalized machine name.
-+ ;;
-+ *)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+ *-digital*)
-+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+ ;;
-+ *-commodore*)
-+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+ # First match some system type aliases
-+ # that might get confused with valid system types.
-+ # -solaris* is a basic system type, with this one exception.
-+ -solaris1 | -solaris1.*)
-+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+ ;;
-+ -solaris)
-+ os=-solaris2
-+ ;;
-+ -svr4*)
-+ os=-sysv4
-+ ;;
-+ -unixware*)
-+ os=-sysv4.2uw
-+ ;;
-+ -gnu/linux*)
-+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+ ;;
-+ # First accept the basic system types.
-+ # The portable systems comes first.
-+ # Each alternative MUST END IN A *, to match a version number.
-+ # -sysv* is not here because it comes later, after sysvr4.
-+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+ | -aos* \
-+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -chorusos* | -chorusrdb* \
-+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+ # Remember, each alternative MUST END IN *, to match a version number.
-+ ;;
-+ -qnx*)
-+ case $basic_machine in
-+ x86-* | i*86-*)
-+ ;;
-+ *)
-+ os=-nto$os
-+ ;;
-+ esac
-+ ;;
-+ -nto-qnx*)
-+ ;;
-+ -nto*)
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+ ;;
-+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+ ;;
-+ -mac*)
-+ os=`echo $os | sed -e 's|mac|macos|'`
-+ ;;
-+ -linux-dietlibc)
-+ os=-linux-dietlibc
-+ ;;
-+ -linux*)
-+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
-+ ;;
-+ -sunos5*)
-+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+ ;;
-+ -sunos6*)
-+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+ ;;
-+ -opened*)
-+ os=-openedition
-+ ;;
-+ -os400*)
-+ os=-os400
-+ ;;
-+ -wince*)
-+ os=-wince
-+ ;;
-+ -osfrose*)
-+ os=-osfrose
-+ ;;
-+ -osf*)
-+ os=-osf
-+ ;;
-+ -utek*)
-+ os=-bsd
-+ ;;
-+ -dynix*)
-+ os=-bsd
-+ ;;
-+ -acis*)
-+ os=-aos
-+ ;;
-+ -atheos*)
-+ os=-atheos
-+ ;;
-+ -syllable*)
-+ os=-syllable
-+ ;;
-+ -386bsd)
-+ os=-bsd
-+ ;;
-+ -ctix* | -uts*)
-+ os=-sysv
-+ ;;
-+ -nova*)
-+ os=-rtmk-nova
-+ ;;
-+ -ns2 )
-+ os=-nextstep2
-+ ;;
-+ -nsk*)
-+ os=-nsk
-+ ;;
-+ # Preserve the version number of sinix5.
-+ -sinix5.*)
-+ os=`echo $os | sed -e 's|sinix|sysv|'`
-+ ;;
-+ -sinix*)
-+ os=-sysv4
-+ ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
-+ -triton*)
-+ os=-sysv3
-+ ;;
-+ -oss*)
-+ os=-sysv3
-+ ;;
-+ -svr4)
-+ os=-sysv4
-+ ;;
-+ -svr3)
-+ os=-sysv3
-+ ;;
-+ -sysvr4)
-+ os=-sysv4
-+ ;;
-+ # This must come after -sysvr4.
-+ -sysv*)
-+ ;;
-+ -ose*)
-+ os=-ose
-+ ;;
-+ -es1800*)
-+ os=-ose
-+ ;;
-+ -xenix)
-+ os=-xenix
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ os=-mint
-+ ;;
-+ -aros*)
-+ os=-aros
-+ ;;
-+ -kaos*)
-+ os=-kaos
-+ ;;
-+ -none)
-+ ;;
-+ *)
-+ # Get rid of the `-' at the beginning of $os.
-+ os=`echo $os | sed 's/[^-]*-//'`
-+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system. Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+ *-acorn)
-+ os=-riscix1.2
-+ ;;
-+ arm*-rebel)
-+ os=-linux
-+ ;;
-+ arm*-semi)
-+ os=-aout
-+ ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ # This must come before the *-dec entry.
-+ pdp10-*)
-+ os=-tops20
-+ ;;
-+ pdp11-*)
-+ os=-none
-+ ;;
-+ *-dec | vax-*)
-+ os=-ultrix4.2
-+ ;;
-+ m68*-apollo)
-+ os=-domain
-+ ;;
-+ i386-sun)
-+ os=-sunos4.0.2
-+ ;;
-+ m68000-sun)
-+ os=-sunos3
-+ # This also exists in the configure program, but was not the
-+ # default.
-+ # os=-sunos4
-+ ;;
-+ m68*-cisco)
-+ os=-aout
-+ ;;
-+ mips*-cisco)
-+ os=-elf
-+ ;;
-+ mips*-*)
-+ os=-elf
-+ ;;
-+ or32-*)
-+ os=-coff
-+ ;;
-+ *-tti) # must be before sparc entry or we get the wrong os.
-+ os=-sysv3
-+ ;;
-+ sparc-* | *-sun)
-+ os=-sunos4.1.1
-+ ;;
-+ *-be)
-+ os=-beos
-+ ;;
-+ *-ibm)
-+ os=-aix
-+ ;;
-+ *-knuth)
-+ os=-mmixware
-+ ;;
-+ *-wec)
-+ os=-proelf
-+ ;;
-+ *-winbond)
-+ os=-proelf
-+ ;;
-+ *-oki)
-+ os=-proelf
-+ ;;
-+ *-hp)
-+ os=-hpux
-+ ;;
-+ *-hitachi)
-+ os=-hiux
-+ ;;
-+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+ os=-sysv
-+ ;;
-+ *-cbm)
-+ os=-amigaos
-+ ;;
-+ *-dg)
-+ os=-dgux
-+ ;;
-+ *-dolphin)
-+ os=-sysv3
-+ ;;
-+ m68k-ccur)
-+ os=-rtu
-+ ;;
-+ m88k-omron*)
-+ os=-luna
-+ ;;
-+ *-next )
-+ os=-nextstep
-+ ;;
-+ *-sequent)
-+ os=-ptx
-+ ;;
-+ *-crds)
-+ os=-unos
-+ ;;
-+ *-ns)
-+ os=-genix
-+ ;;
-+ i370-*)
-+ os=-mvs
-+ ;;
-+ *-next)
-+ os=-nextstep3
-+ ;;
-+ *-gould)
-+ os=-sysv
-+ ;;
-+ *-highlevel)
-+ os=-bsd
-+ ;;
-+ *-encore)
-+ os=-bsd
-+ ;;
-+ *-sgi)
-+ os=-irix
-+ ;;
-+ *-siemens)
-+ os=-sysv4
-+ ;;
-+ *-masscomp)
-+ os=-rtu
-+ ;;
-+ f30[01]-fujitsu | f700-fujitsu)
-+ os=-uxpv
-+ ;;
-+ *-rom68k)
-+ os=-coff
-+ ;;
-+ *-*bug)
-+ os=-coff
-+ ;;
-+ *-apple)
-+ os=-macos
-+ ;;
-+ *-atari*)
-+ os=-mint
-+ ;;
-+ *)
-+ os=-none
-+ ;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer. We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+ *-unknown)
-+ case $os in
-+ -riscix*)
-+ vendor=acorn
-+ ;;
-+ -sunos*)
-+ vendor=sun
-+ ;;
-+ -aix*)
-+ vendor=ibm
-+ ;;
-+ -beos*)
-+ vendor=be
-+ ;;
-+ -hpux*)
-+ vendor=hp
-+ ;;
-+ -mpeix*)
-+ vendor=hp
-+ ;;
-+ -hiux*)
-+ vendor=hitachi
-+ ;;
-+ -unos*)
-+ vendor=crds
-+ ;;
-+ -dgux*)
-+ vendor=dg
-+ ;;
-+ -luna*)
-+ vendor=omron
-+ ;;
-+ -genix*)
-+ vendor=ns
-+ ;;
-+ -mvs* | -opened*)
-+ vendor=ibm
-+ ;;
-+ -os400*)
-+ vendor=ibm
-+ ;;
-+ -ptx*)
-+ vendor=sequent
-+ ;;
-+ -tpf*)
-+ vendor=ibm
-+ ;;
-+ -vxsim* | -vxworks* | -windiss*)
-+ vendor=wrs
-+ ;;
-+ -aux*)
-+ vendor=apple
-+ ;;
-+ -hms*)
-+ vendor=hitachi
-+ ;;
-+ -mpw* | -macos*)
-+ vendor=apple
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ vendor=atari
-+ ;;
-+ -vos*)
-+ vendor=stratus
-+ ;;
-+ esac
-+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+ ;;
-+esac
-+
-+echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
diff -Nrua kdeadmin-3.4.0.orig/configure kdeadmin-3.4.0/configure
---- kdeadmin-3.4.0.orig/configure 2005-03-04 21:29:47.765425292 +0100
-+++ kdeadmin-3.4.0/configure 2005-03-04 21:30:26.029942844 +0100
+--- kdeadmin-3.4.0.orig/configure 2005-03-04 07:09:31.000000000 -0500
++++ kdeadmin-3.4.0/configure 2005-03-04 23:09:23.000000000 -0500
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -10656,8 +7581,8 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
diff -Nrua kdeadmin-3.4.0.orig/configure.in kdeadmin-3.4.0/configure.in
---- kdeadmin-3.4.0.orig/configure.in 2005-03-04 21:29:47.759425838 +0100
-+++ kdeadmin-3.4.0/configure.in 2005-03-04 21:29:58.650434650 +0100
+--- kdeadmin-3.4.0.orig/configure.in 2005-03-04 07:08:59.000000000 -0500
++++ kdeadmin-3.4.0/configure.in 2005-03-04 23:08:15.000000000 -0500
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdeadmin, "3.4.0") dnl searches for some needed programs
@@ -10667,9125 +7592,9 @@
KDE_SET_PREFIX
dnl generate the config header
-diff -Nrua kdeadmin-3.4.0.orig/debian/cdbs/kde.mk kdeadmin-3.4.0/debian/cdbs/kde.mk
---- kdeadmin-3.4.0.orig/debian/cdbs/kde.mk 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/cdbs/kde.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,129 +0,0 @@
--# $Id: kde.mk 642 2005-03-04 18:55:54Z dato-guest $
--# -*- mode: makefile; coding: utf-8 -*-
--# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
--# Description: A class for KDE packages; sets KDE environment variables, etc
--#
--# This program is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License as
--# published by the Free Software Foundation; either version 2, or (at
--# your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# 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., 59 Temple Place, Suite 330, Boston, MA
--# 02111-1307 USA.
--
--
--ifndef _cdbs_bootstrap
--_cdbs_scripts_path ?= /usr/lib/cdbs
--_cdbs_rules_path ?= /usr/share/cdbs/1/rules
--_cdbs_class_path ?= /usr/share/cdbs/1/class
--endif
--
--ifndef _cdbs_class_kde
--_cdbs_class_kde := 1
--
--include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
--
--DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
--
--common-configure-arch common-configure-indep:: debian/stamp-cvs-make
--debian/stamp-cvs-make:
-- if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
-- $(MAKE) -f admin/Makefile.common; \
-- fi
-- touch debian/stamp-cvs-make
--
--include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
--
--export kde_cgidir = \$${libdir}/cgi-bin
--export kde_confdir = \$${sysconfdir}/kde3
--export kde_htmldir = \$${datadir}/doc/kde/HTML
--
--ifeq (,$(findstring nofinal,$(DEB_BUILD_OPTIONS)))
-- cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
--endif
--ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-- cdbs_kde_enable_final =
-- cdbs_kde_enable_debug = --enable-debug=full
--else
-- cdbs_kde_enable_debug = --disable-debug
--endif
--
--cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
--
--DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
--DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
--DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
--DEB_PATCHDIRS := debian/patches/common debian/patches
--
--common-build-arch common-build-indep:: debian/stamp-apidox
--debian/stamp-apidox:
-- if test -n "$(DEB_KDE_APIDOX)"; then \
-- $(DEB_MAKE_INVOKE) apidox; \
-- fi
-- touch debian/stamp-apidox
--
--common-install-arch common-install-indep:: install-apidox
--install-apidox::
-- if test -n "$(DEB_KDE_APIDOX)"; then \
-- $(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
-- fi
--
--common-build-arch:: debian/stamp-man-pages
--debian/stamp-man-pages:
-- # Generate man pages for the programs
-- [ -d debian/man/out ] || mkdir debian/man/out
-- for f in $$(find debian/man -name '*.sgml'); do \
-- docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-- done
-- touch debian/stamp-man-pages
--
--clean::
-- rm -rf debian/man/out
-- rm -f debian/stamp-man-pages
--
--clean::
-- if test -n "$(DEB_KDE_CVS_MAKE)"; then \
-- find . -name Makefile.in -print | \
-- xargs --no-run-if-empty rm -f; \
-- rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-- configure configure.files configure.in stamp-h.in \
-- subdirs; \
-- fi
-- rm -f debian/stamp-cvs-make
-- rm -f debian/stamp-apidox
-- rm -rf debian/shlibs-check
--
--# Workaround for Bug##296984
--clean:: reverse-patches
-- for dir in $(DEB_PATCHDIRS) ; do \
-- rm -f $$dir/*.log ; \
-- done
--
--cleanbuilddir::
-- -if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
--
--buildprep: clean apply-patches
-- make -f admin/Makefile.common dist
-- debian/rules clean
--
--binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-- set -e; \
-- for doc in `cd debian/tmp/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
-- pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-- echo Building $$pkg HTML docs...; \
-- mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-- cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-- meinproc $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-- done
--
--$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-- if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
--
--endif
-diff -Nrua kdeadmin-3.4.0.orig/debian/changelog kdeadmin-3.4.0/debian/changelog
---- kdeadmin-3.4.0.orig/debian/changelog 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/changelog 1970-01-01 01:00:00.000000000 +0100
-@@ -1,638 +0,0 @@
--kdeadmin (4:3.4.0~rc1-2) unstable; urgency=low
--
-- +++ Changes by Pierre Habouzit:
--
-- * Remove kcmlinuz from Depends for kdeadmin meta package.
--
-- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 28 Feb 2005 23:17:26 +0100
--
--kdeadmin (4:3.4.0~rc1-1) unstable; urgency=low
--
-- * First release candidate for the upcoming KDE 3.4 release.
--
-- * Converted packaging to CDBS.
--
-- +++ Changes by Pierre Habouzit:
--
-- * Wrote a man page for kdat.
-- * Recommends kdebase-bin for lilo-config (kdesu in the menu command).
-- * Add myself to uploaders.
--
-- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 28 Feb 2005 10:11:49 +0100
--
--kdeadmin (4:3.3.2-1) unstable; urgency=low
--
-- +++ Changes by Christopher Martin:
--
-- * KDE_3_3_BRANCH update.
--
-- * Change debian/copyright file to refer to licenses, instead of copyright,
-- when discussing KDE's licenses.
--
-- +++ Changes by Isaac Clerencia:
--
-- * Added myself to Uploaders
--
-- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Jan 2005 23:10:27 +0100
--
--kdeadmin (4:3.3.2-0pre1) experimental; urgency=low
--
-- * New upstream release.
-- * KDE_3_3_BRANCH update.
-- * Remove build-dependency on automake1.9.
--
-- -- Christopher Martin <chrsmrtn@freeshell.org> Thu, 16 Dec 2004 13:59:53 -0500
--
--kdeadmin (4:3.3.1-1) unstable; urgency=low
--
-- * New upstream release.
-- * KDE_3_3_BRANCH update.
--
-- -- Christopher L Cheney <ccheney@debian.org> Thu, 4 Nov 2004 23:30:00 -0600
--
--kdeadmin (4:3.3.0-2) unstable; urgency=low
--
-- * KDE_3_3_BRANCH update.
--
-- -- Christopher L Cheney <ccheney@debian.org> Sat, 25 Sep 2004 23:51:24 -0500
--
--kdeadmin (4:3.3.0-1) unstable; urgency=high
--
-- * New upstream release.
--
-- -- Christopher L Cheney <ccheney@debian.org> Fri, 13 Aug 2004 23:30:00 -0500
--
--kdeadmin (4:3.2.3-1) unstable; urgency=high
--
-- * New upstream release.
--
-- -- Christopher L Cheney <ccheney@debian.org> Tue, 3 Aug 2004 14:00:00 -0500
--
--kdeadmin (4:3.2.2-1) unstable; urgency=low
--
-- * New upstream release.
-- * debian/kpackage.mime: fix the entries to use a proper
-- nametemplate. see also #235216.
-- * debian/*.menu: remove the obsolete kderemove tag.
--
-- -- Christopher L Cheney <ccheney@debian.org> Mon, 12 Apr 2004 01:00:00 -0500
--
--kdeadmin (4:3.2.1-1) unstable; urgency=low
--
-- * New upstream release.
--
-- -- Christopher L Cheney <ccheney@debian.org> Fri, 5 Mar 2004 18:00:00 -0600
--
--kdeadmin (4:3.2.0-0pre1v1) experimental; urgency=low
--
-- * New upstream release.
--
-- -- Christopher L Cheney <ccheney@debian.org> Wed, 18 Feb 2004 19:00:00 -0600
--
--kdeadmin (4:3.1.95-1) unstable; urgency=low
--
-- * New upstream release.
--
-- -- Christopher L Cheney <ccheney@debian.org> Fri, 23 Jan 2004 23:00:00 -0600
--
--kdeadmin (4:3.1.5-1) unstable; urgency=low
--
-- * New upstream release.
-- * Added libtool arm patch.
--
-- -- Christopher L Cheney <ccheney@debian.org> Mon, 12 Jan 2004 14:00:00 -0600
--
--kdeadmin (4:3.1.4-2) unstable; urgency=low
--
-- * Changed Maintainer to Debian Qt/KDE Maintainers
--
-- -- Christopher L Cheney <ccheney@debian.org> Tue, 6 Jan 2004 19:00:00 -0600
--
--kdeadmin (4:3.1.4-1) unstable; urgency=low
--
-- * New upstream release.
-- * Added patch to update autotools files.
-- * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
-- causes configure checks to fail due to #line numbers being > 32767.
--
-- -- Christopher L Cheney <ccheney@debian.org> Thu, 16 Oct 2003 01:00:00 -0500
--
--kdeadmin (4:3.1.3-1) unstable; urgency=low
--
-- * New upstream release.
--
-- -- Christopher L Cheney <ccheney@debian.org> Fri, 1 Aug 2003 14:00:00 -0500
--
--kdeadmin (4:3.1.2-1) unstable; urgency=low
--
-- * New upstream release.
--
-- -- Christopher L Cheney <ccheney@debian.org> Thu, 22 May 2003 22:00:00 -0500
--
--kdeadmin (4:3.1.1-1) unstable; urgency=low
--
-- * New upstream release.
-- * Add 'chmod +x configure' to rules. (Closes: #181357, #181563)
--
-- -- Christopher L Cheney <ccheney@debian.org> Wed, 12 Mar 2003 01:00:00 -0600
--
--kdeadmin (4:3.1.0-1) unstable; urgency=low
--
-- * New upstream release.
-- * Rebuilt debian dir.
--
-- -- Christopher L Cheney <ccheney@debian.org> Mon, 03 Feb 2003 22:00:00 -0600
--
--kdeadmin (4:2.2.2-7.2) stable-security; urgency=high
--
-- * Non-maintainer upload by the Security Team
-- * Added special detection routine for big/little endianess on MIPS since
-- the line "byteorder : {big|little} endian" from /proc/cpuinfo was
-- removed as of Linux 2.4.20, resulting in the mipsel buildd being
-- unable to build this package.
--
-- -- Martin Schulze <joey@infodrom.org> Wed, 8 Jan 2003 20:01:04 +0100
--
--kdeadmin (4:2.2.2-7.1) stable-security; urgency=high
--
-- * Non-maintainer upload by the Security Team
-- * Applied upstream patches to fix several potential vulnerabilities.
-- http://www.kde.org/info/security/advisory-20021220-1.txt
--
-- -- Martin Schulze <joey@infodrom.org> Sun, 5 Jan 2003 21:09:43 +0100
--
--kdeadmin (4:2.2.2-7) unstable; urgency=high
--
-- * Fixed lilo Build-Dep (added [i386])
--
-- -- Christopher L Cheney <ccheney@debian.org> Mon, 4 Mar 2002 08:00:00 -0600
--
--kdeadmin (4:2.2.2-6) unstable; urgency=high
--
-- * Changing Maintainer to Chris.
-- * Fixing PowerPC breakage.
--
-- -- Daniel Stone <daniel@sfarc.net> Wed, 27 Feb 2002 21:28:09 +1100
--
--kdeadmin (4:2.2.2-5) unstable; urgency=low
--
-- * debian/control, kpackage/Makefile.am:
-- - Update kpackage for rpm 4.0.3, thanks Joey Hess. (Tighten [Build]Deps on
-- rpm, librpm0-dev->librpm-dev). (closes: #128195, #127948)
-- * debian/control:
-- - Tighten Build-Deps so it only builds with libpng2.
--
-- -- Daniel Stone <daniel@sfarc.net> Tue, 1 Jan 2002 06:50:15 -0500
--
--kdeadmin (4:2.2.2-4) unstable; urgency=low
--
-- * Crap! I lost the Build-Dep on docbook-to-man in the merge between my -2
-- and RevKrusty's; reinstated. (closes: #122044)
-- * Really install the new manpages.
--
-- -- Daniel Stone <daniel@sfarc.net> Sun, 2 Dec 2001 11:23:19 +1100
--
--kdeadmin (4:2.2.2-3) unstable; urgency=low
--
-- * New maintainer. (closes: #114101)
-- * debian/{secpolicy,kwuftpd,kuser,ksysv,kpackage,kcron}.sgml:
-- - New manpages.
-- * secpolicy/main.cpp: fix this dodgyness, it now gives an actual description:
-- daniel@tsubasa:~/kde-2.2.2/kdeadmin-2.2.2/kdeadmin-2.2.2% ./secpolicy/secpolicy --help
-- Usage: secpolicy [Qt-options] [KDE-options]
-- What does this do?
--
-- -- Daniel Stone <daniel@sfarc.net> Sat, 1 Dec 2001 23:59:40 +1100
--
--kdeadmin (4:2.2.2-2) unstable; urgency=low
--
-- * Sync with upstream
-- * Cleanup build process
-- * Update documentation for freeze
-- * Fix build-deps/deps/etc...
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 29 Nov 2001 04:15:00 -0700
--
--kdeadmin (4:2.2.2-1) unstable; urgency=low
--
-- * New upstream version
-- * use auto* again
-- * lintian cleanup
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 07 Nov 2001 19:26:00 -0700
--
--kdeadmin (4:2.2.1-1.3) unstable; urgency=low
--
-- * take out checks for auto* as it just hoses things
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 08 Oct 2001 19:26:00 -0700
--
--kdeadmin (4:2.2.1-1.2) unstable; urgency=low
--
-- * fix configure
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 05 Oct 2001 09:28:00 -0700
--
--kdeadmin (4:2.2.1-1.1) unstable; urgency=low
--
-- * Workaround for stupid automake 1.5 issues
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Oct 2001 09:28:00 -0700
--
--kdeadmin (4:2.2.1-1) unstable; urgency=low
--
-- * New upstream version
-- * Change maintainer
-- * Lintian error cleanup
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 25 Aug 2001 14:31:00 -0700
--
--kdeadmin (4:2.2.0-final-1) unstable; urgency=low
--
-- * New upstream version 2.2
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 30 Jul 2001 00:01:00 -0700
--
--kdeadmin (4:2.2.0-0.1beta1-2) unstable; urgency=low
--
-- * Use apt by default and not rpm for kpackage (Closes: #106937)
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Jul 2001 18:33:00 -0700
--
--kdeadmin (4:2.2.0-0.1beta1-1) unstable; urgency=low
--
-- * sync with upstream
-- * gcc3 build fixes
-- * ksysctrl removed for now by upstream
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 26 Jul 2001 18:05:00 -0700
--
--kdeadmin (4:2.2.0-0beta1-3) unstable; urgency=low
--
-- * Depend on proper version of rpm so we don't crash (Closes: #103439)
-- * Sync with upstream
-- * More alpha build fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Jul 2001 03:25:00 -0700
--
--kdeadmin (4:2.2.0-0beta1-2) unstable; urgency=low
--
-- * Sync with upstream
-- * Autobuild for alpha now
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 03 Jul 2001 02:20:00 -0700
--
--kdeadmin (4:2.2.0-0beta1-1) unstable; urgency=low
--
-- * Sync with upstream
-- * fix mips build
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 30 Jun 2001 20:30:00 -0700
--
--kdeadmin (4:2.2-cvs20010622-1) unstable; urgency=low
--
-- * New upstream version
-- * 2.2 beta1
-- * Adding in Enhances: tags
-- * New package kcmlinuz - linux kernel configuration gui
-- * Fix kpackage deps and crashes due to rpm (Closes: #99747, #97946)
-- * build with nis support
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Jun 2001 06:30:00 -0700
--
--kdeadmin (4:2.1.1-2) unstable; urgency=low
--
-- * Update menu tags to include new kde menu removal tag
-- * Update build-depends to recognize real | virtual
-- * Adding in lintian overrides
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 17:28:00 -0700
--
--kdeadmin (4:2.1.1-1.0.1) unstable; urgency=low
--
-- * Rebuild with older libc
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Mar 2001 16:33:00 -0700
--
--kdeadmin (4:2.1.1-1) unstable; urgency=low
--
-- * New upstream version
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Mar 2001 10:29:00 -0700
--
--kdeadmin (4:2.1.0-3) unstable; urgency=low
--
-- * Change Build-Depends and rebuild with new librpm packages (Closes: #89695)
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Mar 2001 10:29:00 -0700
--
--kdeadmin (4:2.1.0-2) unstable; urgency=low
--
-- * Adding rpm to build-depends (Closes: #87412)
-- * Upstream fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 04:58:00 -0700
--
--kdeadmin (4:2.1.0-1) unstable; urgency=low
--
-- * Fresh CVS sync with future 2.1.1 version
-- * Fixing build process for non-i386 systems (Closes: #87412)
-- * Adding libbz2-dev to build-depends
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 04 Mar 2001 06:46:00 -0700
--
--kdeadmin (4:2.1-final-1) unstable; urgency=low
--
-- * New upstream version
-- * Updating standards version
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 02:31:00 -0700
--
--kdeadmin (4:2.1-beta2-1) unstable; urgency=low
--
-- * New upstream beta
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 22 Jan 2001 06:00:00 -0700
--
--kdeadmin (4:2.1-20010115-1) unstable; urgency=low
--
-- * More upstream fixes
-- * Fixes assertion problems (Closes: #75073)
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 Jan 2001 01:00:00 -0700
--
--kdeadmin (4:2.1-20010106-1) unstable; urgency=low
--
-- * More upstream fixes
-- * Fixing depends as well as updating them
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 06 Jan 2001 23:30:00 -0700
--
--kdeadmin (4:2.1-20010101-1) unstable; urgency=low
--
-- * More upstream fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 01 Jan 2001 17:05:00 -0700
--
--kdeadmin (4:2.1-20001218-1) unstable; urgency=low
--
-- * More upstream fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Dec 2000 13:11:00 -0700
--
--kdeadmin (4:2.1-20001216-1) unstable; urgency=low
--
-- * More upstream fixes
-- * Adding in conflicts for kdeadmin which I forgot to to along time ago
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 16 Dec 2000 23:50:00 -0700
--
--kdeadmin (4:2.1-20001213-1) unstable; urgency=low
--
-- * New upstream beta version
-- * Fix deb package indexing (Closes: #79060)
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 13 Dec 2000 18:00:00 -0700
--
--kdeadmin (4:2.0-final-8) unstable; urgency=low
--
-- * Fixing file conflicts (Closes: #77853)
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 25 Nov 2000 06:45:00 -0700
--
--kdeadmin (4:2.0-final-7) unstable; urgency=low
--
-- * More upstream fixes
-- * build rules cleanup
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 21 Nov 2000 04:45:00 -0700
--
--kdeadmin (4:2.0-final-6) unstable; urgency=low
--
-- * More upstream fixes
-- * More dependency cleanup - xlib6g vs xlibs
-- * ftp-server depends fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 18 Nov 2000 00:45:00 -0700
--
--kdeadmin (4:2.0-final-5) unstable; urgency=low
--
-- * More upstream fixes
-- * More dependency cleanup
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 18 Nov 2000 00:45:00 -0700
--
--kdeadmin (4:2.0-final-4) unstable; urgency=low
--
-- * More upstream fixes
-- * adding menu hints
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 09 Nov 2000 22:45:00 -0700
--
--kdeadmin (4:2.0-final-3) unstable; urgency=low
--
-- * More upstream fixes
-- * build against new xlibs
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 18:00:00 -0700
--
--kdeadmin (4:2.0-final-2) unstable; urgency=low
--
-- * More upstream fixes
-- * kdat no longer provided
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Nov 2000 18:00:00 -0700
--
--kdeadmin (4:2.0-final-0) unstable; urgency=low
--
-- * KDE 2.0
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Oct 2000 00:00:00 -0700
--
--kdeadmin (4:2.0-20001013-0) unstable; urgency=low
--
-- * More upstream fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 23:45:00 -0700
--
--kdeadmin (4:2.0-20001011-0) unstable; urgency=low
--
-- * KDE 2.0 RC2
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 11 Oct 2000 06:00:00 -0700
--
--kdeadmin (4:2.0-20001006-0) unstable; urgency=low
--
-- * More upstream fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 06 Oct 2000 04:00:00 -0700
--
--kdeadmin (4:2.0-20001005-0) unstable; urgency=low
--
-- * More upstream fixes
-- * Compiling against non-versioned kdelibs once again
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 05 Oct 2000 15:00:00 -0700
--
--kdeadmin (4:2.0-20001002-0) unstable; urgency=low
--
-- * KDE 2.0 RC1
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Oct 2000 01:30:00 -0700
--
--kdeadmin (4:2.0-20000927-0) unstable; urgency=low
--
-- * More upstream fixes
-- * Building in RPM support to kpackage again.
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Sep 2000 04:30:00 -0700
--
--kdeadmin (4:2.0-20000925-0) unstable; urgency=low
--
-- * More upstream fixes
-- * Updating build-depends
-- * Changing task dependencies (Closes: #72407, #72350, #72333)
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 25 Sep 2000 15:30:00 -0700
--
--kdeadmin (4:2.0-20000920-0) unstable; urgency=low
--
-- * More upstream fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 20 Sep 2000 22:00:00 -0700
--
--kdeadmin (4:2.0-20000918-0) unstable; urgency=low
--
-- * More upstream fixes
-- * Breaking down kdeadmin into individual packages
-- * Changing section from utils to admin (Closes: #71870)
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Sep 2000 18:00:00 -0700
--
--kdeadmin (4:2.0-20000909-0) unstable; urgency=low
--
-- * More upstream fixes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 22:00:00 -0700
--
--kdeadmin (4:2.0-20000907-0) unstable; urgency=low
--
-- * More upstream fixes
-- * Built against new QT 2.2
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Sep 2000 04:00:00 -0700
--
--kdeadmin (4:2.0-20000901-0) unstable; urgency=low
--
-- * More upstream fixes
-- * Merging package changes into upstream CVS
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 01 Sep 2000 17:00:00 -0700
--
--kdeadmin (4:2.0-20000825-1.0) experimental; urgency=low
--
-- * KDE 2.0 beta 4
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 Aug 2000 22:30:00 -0700
--
--kdeadmin (4:2.0-20000820-1.0) experimental; urgency=low
--
-- * New upstream beta version
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 20 Aug 2000 09:30:00 -0700
--
--kdeadmin-cvs (4:2.0-20000521-1.0) experimental; urgency=low
--
-- * New upstream CVS version
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 21 May 2000 18:15:00 -0700
--
--kdeadmin-cvs (4:2.0-20000512-1.1) experimental; urgency=low
--
-- * New upstream CVS version
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 12 May 2000 22:30:00 -0700
--
--kdeadmin-cvs (4:2.0-20000308-1.0) experimental; urgency=low
--
-- * New upstream CVS version
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Mar 2000 22:30:00 -0700
--
--kdeadmin-cvs (4:2.0-20000302-1.0) experimental; urgency=low
--
-- * New upstream CVS version
-- * Adding in build options for pam
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 02 Mar 2000 22:00:00 -0700
--
--kdeadmin-cvs (4:2.0-20000229-1.0) experimental; urgency=low
--
-- * New upstream CVS version
-- * Adding in build-depends
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 29 Feb 2000 22:00:00 -0700
--
--kdeadmin-cvs (4:2.0-19991001-1) unstable; urgency=low
--
-- * Cleaning out old workaround in menu.in
-- * Fixing up dependencies
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 01 Oct 1999 14:22:41 -0400
--
--kdeadmin-cvs (4:2.0-19990820-1) unstable; urgency=low
--
-- * new upstream CVS version
-- * migrating back to /usr from /opt
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 20 Aug 1999 14:22:41 -0400
--
--kdeadmin-cvs (4:2.0-19990524-1) unstable; urgency=low
--
-- * new upstream version
-- * migrating back to / from /opt
-- * migrating in some minor build changes
--
-- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 24 May 1999 07:00:41 -0400
--
--kdeadmin (4:1.1-19990217-1) unstable; urgency=low
--
-- * new upstream version
--
-- -- Patricia Jung <trish@freiburg.linux.de> Wed, 17 Feb 1999 19:09:41 +0100
--
--kdeadmin (4:1.1-19990207-3) unstable; urgency=low
--
-- * fixed ScriptPath and RunlevelPath for ksysv
--
-- -- Patricia Jung <trish@freiburg.linux.de> Thu, 11 Feb 1999 22:58:00 +0100
--
--kdeadmin (4:1.1-19990207-2) unstable; urgency=low
--
-- * fixed a bug with the wrong libjpeg version
--
-- -- Stephan Kulow <coolo@kde.org> Tue, 9 Feb 1999 10:43:42 +0100
--
--kdeadmin (4:1.1-19990207-1) unstable; urgency=low
--
-- * new upstream version 1.1 and new epoche
--
-- -- Stephan Kulow <coolo@kde.org> Sun, 7 Feb 1999 12:12:58 +0100
--
--kdeadmin (2:980419-b4-1) unstable; urgency=low
--
-- * new upstream version Beta4
--
-- -- Stephan Kulow <coolo@kde.org> Sun, 19 Apr 1998 18:20:53 +0200
--
--kdeadmin (2:980402-1) frozen; urgency=low
--
-- * new upstream version with bugfixes
--
-- -- Stephan Kulow <coolo@kde.org> Thu, 2 Apr 1998 18:05:34 +0200
--
--kdeadmin (2:980309-1) unstable; urgency=low
--
-- * Initial Release.
--
-- -- Stephan Kulow <coolo@kde.org> Tue, 10 Mar 1998 20:40:02 +0100
-diff -Nrua kdeadmin-3.4.0.orig/debian/compat kdeadmin-3.4.0/debian/compat
---- kdeadmin-3.4.0.orig/debian/compat 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/compat 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--4
-diff -Nrua kdeadmin-3.4.0.orig/debian/control kdeadmin-3.4.0/debian/control
---- kdeadmin-3.4.0.orig/debian/control 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/control 1970-01-01 01:00:00.000000000 +0100
-@@ -1,144 +0,0 @@
--Source: kdeadmin
--Section: kde
--Priority: optional
--Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
--Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>, Isaac Clerencia <isaac@debian.org>, Pierre Habouzit <pierre.habouzit@m4x.org>
--Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.2.30), docbook-to-man, gawk, gettext, kdelibs4-dev (>> 4:3.3.99), libbz2-dev, libpam0g-dev, lilo [i386], sharutils, texinfo, rpm
--Standards-Version: 3.6.1
--
--Package: kdeadmin
--Section: kde
--Architecture: all
--Depends: kcron (>= ${Source-Version}), kdat (>= ${Source-Version}), kdeadmin-kfile-plugins (>= ${Source-Version}), kpackage (>= ${Source-Version}), ksysv (>= ${Source-Version}), kuser (>= ${Source-Version}), secpolicy (>= ${Source-Version})
--Recommends: lilo-config (>= ${Source-Version})
--Description: KDE Administration tools metapackage
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- This package depends on the KDE Administration tools packages.
--
--Package: kcron
--Section: admin
--Architecture: any
--Depends: ${shlibs:Depends}
--Suggests: khelpcenter
--Description: KDE Crontab editor
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- Crontab editor for KDE.
-- .
-- This package is part of the official KDE admin module.
--
--Package: kdat
--Section: admin
--Architecture: any
--Depends: ${shlibs:Depends}
--Suggests: khelpcenter
--Description: KDE tape backup tool
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- Tape backup tool for KDE.
-- .
-- This package is part of the official KDE admin module.
--
--Package: kdeadmin-kfile-plugins
--Section: kde
--Architecture: any
--Depends: ${shlibs:Depends}
--Description: KDE File dialog plugins for deb and rpm files
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- File dialog plugins for deb and rpm package files.
-- .
-- This package is part of the official KDE admin module.
--
--Package: kpackage
--Section: admin
--Architecture: any
--Depends: ${shlibs:Depends}
--Recommends: rpm
--Suggests: khelpcenter
--Description: KDE Software package tool
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- This is a frontend to both .rpm and .deb package formats. It allows you
-- to view currently installed packages, browse available packages, and
-- install/remove them.
-- .
-- This package is part of the official KDE admin module.
--
--Package: ksysv
--Section: admin
--Architecture: any
--Depends: ${shlibs:Depends}
--Suggests: khelpcenter
--Description: KDE SysV-style init configuration editor
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- This program allows you to edit your start and stop scripts using a
-- drag and drop GUI.
-- .
-- This package is part of the official KDE admin module.
--
--Package: kuser
--Section: admin
--Architecture: any
--Depends: ${shlibs:Depends}
--Suggests: khelpcenter
--Description: KDE user/group administration tool
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- A user/group administration tool for KDE.
-- .
-- This package is part of the official KDE admin module.
--
--Package: lilo-config
--Section: kde
--Architecture: i386
--Depends: ${shlibs:Depends}, kcontrol
--Suggests: lilo
--Description: KDE Frontend for lilo configuration
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- lilo-config is a KDE based frontend to the lilo boot manager configuration.
-- It runs out of the KDE Control Center.
-- .
-- This package is part of the official KDE admin module.
--
--Package: secpolicy
--Section: admin
--Architecture: any
--Depends: ${shlibs:Depends}
--Description: KDE PAM security policy configuration tool
-- KDE is a powerful Open Source graphical desktop environment
-- for Unix workstations. It combines ease of use, contemporary
-- functionality, and outstanding graphical design with the
-- technological superiority of the Unix operating system.
-- .
-- This tool allows you to manipulate the PAM configuration files for each
-- "service" you have created to use PAM.
-- .
-- This package is part of the official KDE admin module.
-diff -Nrua kdeadmin-3.4.0.orig/debian/copyright kdeadmin-3.4.0/debian/copyright
---- kdeadmin-3.4.0.orig/debian/copyright 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/copyright 1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
--This package was debianized by Christopher L Cheney <ccheney@debian.org> on
--Tue, 16 Apr 2002 22:00:00 -0500.
--
--It was downloaded via CVS from cvs.kde.org
--
--Upstream Authors: Bernhard Rosenkraenzer <bero@redhat.de> and many others...
--
--
--License:
--
--All programs are under the GPL. On Debian systems, the complete text of
--the GPL license can be found in the /usr/share/common-licenses/GPL file.
-diff -Nrua kdeadmin-3.4.0.orig/debian/kcron.install kdeadmin-3.4.0/debian/kcron.install
---- kdeadmin-3.4.0.orig/debian/kcron.install 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/kcron.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1,13 +0,0 @@
--debian/tmp/usr/bin/kcron
--debian/tmp/usr/share/applications/kde/kcron.desktop
--debian/tmp/usr/share/apps/kcron/kcronui.rc
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/common
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/index.cache.bz2
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/index.docbook
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/kcron.png
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/kcronstart.png
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/newtask.png
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/newvariable.png
--debian/tmp/usr/share/doc/kde/HTML/en/kcron/print.png
--debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcron.png
--debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcron.png
-diff -Nrua kdeadmin-3.4.0.orig/debian/kcron.manpages kdeadmin-3.4.0/debian/kcron.manpages
---- kdeadmin-3.4.0.orig/debian/kcron.manpages 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kcron.manpages 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--debian/man/kcron.1
-diff -Nrua kdeadmin-3.4.0.orig/debian/kcron.menu kdeadmin-3.4.0/debian/kcron.menu
---- kdeadmin-3.4.0.orig/debian/kcron.menu 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/kcron.menu 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--?package(kcron):\
-- needs="X11"\
-- section="Apps/System"\
-- hints="KDE"\
-- title="KDE Task Scheduler"\
-- command="/usr/bin/kcron"
-diff -Nrua kdeadmin-3.4.0.orig/debian/kdat.install kdeadmin-3.4.0/debian/kdat.install
---- kdeadmin-3.4.0.orig/debian/kdat.install 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kdat.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1,38 +0,0 @@
--debian/tmp/usr/bin/kdat
--debian/tmp/usr/share/applications/kde/kdat.desktop
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_archive.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_backup.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_eject.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_mounted.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_restore.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_select_all.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_select_none.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_select_some.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_unmounted.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/16x16/apps/kdat_verify.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/32x32/apps/kdat.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/32x32/apps/kdat_backup.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/32x32/apps/kdat_restore.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/32x32/apps/kdat_verify.png
--debian/tmp/usr/share/apps/kdat/icons/crystalsvg/48x48/apps/kdat.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_archive.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_backup.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_eject.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_mounted.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_restore.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_select_all.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_select_none.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_select_some.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_unmounted.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/16x16/apps/kdat_verify.png
--debian/tmp/usr/share/apps/kdat/icons/locolor/32x32/apps/kdat.png
--debian/tmp/usr/share/doc/kde/HTML/en/kdat/common
--debian/tmp/usr/share/doc/kde/HTML/en/kdat/index.cache.bz2
--debian/tmp/usr/share/doc/kde/HTML/en/kdat/index.docbook
--debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kdat.png
--debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kdat.png
--debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kdat.png
--debian/tmp/usr/share/icons/locolor/16x16/apps/kdat.png
--debian/tmp/usr/share/icons/locolor/32x32/apps/kdat.png
-diff -Nrua kdeadmin-3.4.0.orig/debian/kdat.manpages kdeadmin-3.4.0/debian/kdat.manpages
---- kdeadmin-3.4.0.orig/debian/kdat.manpages 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kdat.manpages 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--debian/man/kdat.1
-diff -Nrua kdeadmin-3.4.0.orig/debian/kdat.menu kdeadmin-3.4.0/debian/kdat.menu
---- kdeadmin-3.4.0.orig/debian/kdat.menu 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/kdat.menu 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--?package(kdat):\
-- needs="X11"\
-- section="Apps/System"\
-- hints="KDE"\
-- title="KDat"\
-- command="/usr/bin/kdat"
-diff -Nrua kdeadmin-3.4.0.orig/debian/kdeadmin-kfile-plugins.install kdeadmin-3.4.0/debian/kdeadmin-kfile-plugins.install
---- kdeadmin-3.4.0.orig/debian/kdeadmin-kfile-plugins.install 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kdeadmin-kfile-plugins.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--debian/tmp/usr/lib/kde3/kfile_deb.la
--debian/tmp/usr/lib/kde3/kfile_deb.so
--debian/tmp/usr/lib/kde3/kfile_rpm.la
--debian/tmp/usr/lib/kde3/kfile_rpm.so
--debian/tmp/usr/share/services/kfile_deb.desktop
--debian/tmp/usr/share/services/kfile_rpm.desktop
-diff -Nrua kdeadmin-3.4.0.orig/debian/kpackage.install kdeadmin-3.4.0/debian/kpackage.install
---- kdeadmin-3.4.0.orig/debian/kpackage.install 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kpackage.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1,50 +0,0 @@
--debian/tmp/usr/bin/kpackage
--debian/tmp/usr/share/applications/kde/kpackage.desktop
--debian/tmp/usr/share/apps/kpackage/kpackageui.rc
--debian/tmp/usr/share/apps/kpackage/pics/bnew.png
--debian/tmp/usr/share/apps/kpackage/pics/bsd.png
--debian/tmp/usr/share/apps/kpackage/pics/bupdated.png
--debian/tmp/usr/share/apps/kpackage/pics/cross.png
--debian/tmp/usr/share/apps/kpackage/pics/dbad.png
--debian/tmp/usr/share/apps/kpackage/pics/deb.png
--debian/tmp/usr/share/apps/kpackage/pics/dnew.png
--debian/tmp/usr/share/apps/kpackage/pics/dupdated.png
--debian/tmp/usr/share/apps/kpackage/pics/ftin.xpm
--debian/tmp/usr/share/apps/kpackage/pics/ftout.xpm
--debian/tmp/usr/share/apps/kpackage/pics/kiss.png
--debian/tmp/usr/share/apps/kpackage/pics/knew.png
--debian/tmp/usr/share/apps/kpackage/pics/kupdated.png
--debian/tmp/usr/share/apps/kpackage/pics/noball.png
--debian/tmp/usr/share/apps/kpackage/pics/ptick.png
--debian/tmp/usr/share/apps/kpackage/pics/question.png
--debian/tmp/usr/share/apps/kpackage/pics/rnew.png
--debian/tmp/usr/share/apps/kpackage/pics/rpm.png
--debian/tmp/usr/share/apps/kpackage/pics/rupdated.png
--debian/tmp/usr/share/apps/kpackage/pics/slack.png
--debian/tmp/usr/share/apps/kpackage/pics/snew.png
--debian/tmp/usr/share/apps/kpackage/pics/supdated.png
--debian/tmp/usr/share/apps/kpackage/pics/tick.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/bsdloc.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/common
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/debaptloc.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/debloc.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/handle.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/index.cache.bz2
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/index.docbook
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/install.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/left.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/right-change.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/right-files.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/right-prop.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/rpmloc.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/slackloc.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/uninstall.png
--debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kpackage.png
--debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpackage.png
--debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpackage.png
--debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpackage.png
--debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kpackage.png
--debian/tmp/usr/share/mimelnk/application/x-debian-package.desktop
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/search.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/searchf.png
--debian/tmp/usr/share/doc/kde/HTML/en/kpackage/searchl.png
-diff -Nrua kdeadmin-3.4.0.orig/debian/kpackage.manpages kdeadmin-3.4.0/debian/kpackage.manpages
---- kdeadmin-3.4.0.orig/debian/kpackage.manpages 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kpackage.manpages 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--debian/man/kpackage.1
-diff -Nrua kdeadmin-3.4.0.orig/debian/kpackage.menu kdeadmin-3.4.0/debian/kpackage.menu
---- kdeadmin-3.4.0.orig/debian/kpackage.menu 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kpackage.menu 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--?package(kpackage):\
-- needs="X11"\
-- section="Apps/System"\
-- hints="KDE"\
-- title="KDE Package Manager"\
-- command="/usr/bin/kpackage"
-diff -Nrua kdeadmin-3.4.0.orig/debian/kpackage.mime kdeadmin-3.4.0/debian/kpackage.mime
---- kdeadmin-3.4.0.orig/debian/kpackage.mime 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/kpackage.mime 1970-01-01 01:00:00.000000000 +0100
-@@ -1,2 +0,0 @@
--application/x-deb; kpackage -caption "Package Manager" %s; nametemplate=%s.deb; test=test "$DISPLAY" != ""; priority=7
--application/x-rpm; kpackage -caption "Package Manager" %s; nametemplate=%s.rpm; test=test "$DISPLAY" != ""; priority=7
-diff -Nrua kdeadmin-3.4.0.orig/debian/ksysv.install kdeadmin-3.4.0/debian/ksysv.install
---- kdeadmin-3.4.0.orig/debian/ksysv.install 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/ksysv.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1,17 +0,0 @@
--debian/tmp/usr/bin/ksysv
--debian/tmp/usr/share/applications/kde/ksysv.desktop
--debian/tmp/usr/share/apps/ksysv/ksysvui.rc
--debian/tmp/usr/share/apps/ksysv/pics/ksysv_locked.png
--debian/tmp/usr/share/apps/ksysv/pics/ksysv_restart.png
--debian/tmp/usr/share/apps/ksysv/pics/ksysv_start.png
--debian/tmp/usr/share/apps/ksysv/pics/ksysv_stop.png
--debian/tmp/usr/share/apps/ksysv/pics/ksysv_unlocked.png
--debian/tmp/usr/share/doc/kde/HTML/en/ksysv/common
--debian/tmp/usr/share/doc/kde/HTML/en/ksysv/index.cache.bz2
--debian/tmp/usr/share/doc/kde/HTML/en/ksysv/index.docbook
--debian/tmp/usr/share/icons/crystalsvg/16x16/actions/toggle_log.png
--debian/tmp/usr/share/icons/crystalsvg/16x16/apps/ksysv.png
--debian/tmp/usr/share/icons/crystalsvg/32x32/apps/ksysv.png
--debian/tmp/usr/share/icons/crystalsvg/48x48/apps/ksysv.png
--debian/tmp/usr/share/mimelnk/application/x-ksysv.desktop
--debian/tmp/usr/share/mimelnk/text/x-ksysv-log.desktop
-diff -Nrua kdeadmin-3.4.0.orig/debian/ksysv.manpages kdeadmin-3.4.0/debian/ksysv.manpages
---- kdeadmin-3.4.0.orig/debian/ksysv.manpages 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/ksysv.manpages 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--debian/man/ksysv.1
-diff -Nrua kdeadmin-3.4.0.orig/debian/ksysv.menu kdeadmin-3.4.0/debian/ksysv.menu
---- kdeadmin-3.4.0.orig/debian/ksysv.menu 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/ksysv.menu 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--?package(ksysv):\
-- needs="X11"\
-- section="Apps/System"\
-- hints="KDE"\
-- title="KDE SysV-Init Editor"\
-- command="/usr/bin/ksysv"
-diff -Nrua kdeadmin-3.4.0.orig/debian/kuser.install kdeadmin-3.4.0/debian/kuser.install
---- kdeadmin-3.4.0.orig/debian/kuser.install 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kuser.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--debian/tmp/usr/bin/kuser
--debian/tmp/usr/share/applications/kde/kuser.desktop
--debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png
--debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png
--debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png
--debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/delete_user.png
--debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/edit_group.png
--debian/tmp/usr/share/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png
--debian/tmp/usr/share/apps/kuser/kuserui.rc
--debian/tmp/usr/share/apps/kuser/pics/group.png
--debian/tmp/usr/share/apps/kuser/pics/user.png
--debian/tmp/usr/share/config.kcfg/kuser.kcfg
--debian/tmp/usr/share/doc/kde/HTML/en/kuser/common
--debian/tmp/usr/share/doc/kde/HTML/en/kuser/index.cache.bz2
--debian/tmp/usr/share/doc/kde/HTML/en/kuser/index.docbook
--debian/tmp/usr/share/doc/kde/HTML/en/kuser/kuser.png
--debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kuser.png
--debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kuser.png
--debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kuser.png
--debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kuser.png
--debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kuser.png
-diff -Nrua kdeadmin-3.4.0.orig/debian/kuser.manpages kdeadmin-3.4.0/debian/kuser.manpages
---- kdeadmin-3.4.0.orig/debian/kuser.manpages 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/kuser.manpages 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--debian/man/kuser.1
-diff -Nrua kdeadmin-3.4.0.orig/debian/kuser.menu kdeadmin-3.4.0/debian/kuser.menu
---- kdeadmin-3.4.0.orig/debian/kuser.menu 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/kuser.menu 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--?package(kuser):\
-- needs="X11"\
-- section="Apps/System"\
-- hints="KDE"\
-- title="KDE User Manager"\
-- command="/usr/bin/kuser"
-diff -Nrua kdeadmin-3.4.0.orig/debian/lilo-config.install kdeadmin-3.4.0/debian/lilo-config.install
---- kdeadmin-3.4.0.orig/debian/lilo-config.install 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/lilo-config.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1,3 +0,0 @@
--debian/tmp/usr/lib/kde3/kcm_lilo.la
--debian/tmp/usr/lib/kde3/kcm_lilo.so
--debian/tmp/usr/share/applications/kde/lilo.desktop
-diff -Nrua kdeadmin-3.4.0.orig/debian/lilo-config.lintian kdeadmin-3.4.0/debian/lilo-config.lintian
---- kdeadmin-3.4.0.orig/debian/lilo-config.lintian 2005-03-04 21:29:47.769424928 +0100
-+++ kdeadmin-3.4.0/debian/lilo-config.lintian 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--lilo-config: menu-command-not-in-package /usr/lib/menu/lilo-config:6 /usr/bin/kdesu
-diff -Nrua kdeadmin-3.4.0.orig/debian/lilo-config.menu kdeadmin-3.4.0/debian/lilo-config.menu
---- kdeadmin-3.4.0.orig/debian/lilo-config.menu 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/lilo-config.menu 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--?package(lilo-config):\
-- needs="X11"\
-- section="Apps/System"\
-- hints="KDE"\
-- title="lilo-config"\
-- command="/usr/bin/kdesu kcmshell lilo"
-diff -Nrua kdeadmin-3.4.0.orig/debian/man/kcron.sgml kdeadmin-3.4.0/debian/man/kcron.sgml
---- kdeadmin-3.4.0.orig/debian/man/kcron.sgml 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/man/kcron.sgml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,333 +0,0 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
--
--<!-- Process this file with docbook-to-man to generate an nroff manual
-- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
-- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-- less'. A typical entry in a Makefile or Makefile.am is:
--
--manpage.1: manpage.sgml
-- docbook-to-man $< > $@
-- -->
--
-- <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-- <!ENTITY dhsurname "<surname>Stone</surname>">
-- <!ENTITY dhdate "<date>October 21, 2001</date>">
-- <!ENTITY dhsection "<manvolnum>8</manvolnum>">
-- <!ENTITY dhemail "<email>daniel@sfarc.net</email>">
-- <!ENTITY dhusername "Daniel Stone">
-- <!ENTITY dhucpackage "<refentrytitle>KCRON</refentrytitle>">
-- <!ENTITY dhpackage "kcron">
--
-- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
-- <!ENTITY gnu "<acronym>GNU</acronym>">
--]>
--
--<refentry>
-- <refentryinfo>
-- <address>
-- &dhemail;
-- </address>
-- <author>
-- &dhfirstname;
-- &dhsurname;
-- </author>
-- <copyright>
-- <year>2001</year>
-- <holder>&dhusername;</holder>
-- </copyright>
-- &dhdate;
-- </refentryinfo>
-- <refmeta>
-- &dhucpackage;
--
-- &dhsection;
-- </refmeta>
-- <refnamediv>
-- <refname>&dhpackage;</refname>
--
-- <refpurpose>Views and sets cron daemon configuration.</refpurpose>
-- </refnamediv>
-- <refsynopsisdiv>
-- <cmdsynopsis>
-- <command>&dhpackage;</command>
--
-- <arg><option>--help<replaceable></replaceable></option></arg>
-- <arg><option>--help-kde<replaceable></replaceable></option></arg>
-- <arg><option>--help-qt<replaceable></replaceable></option></arg>
-- <arg><option>--version<replaceable> -v</replaceable></option></arg>
-- <arg><option>--license<replaceable></replaceable></option></arg>
-- <arg><option>--author<replaceable></replaceable></option></arg>
-- <arg><option>--caption <caption><replaceable></replaceable></option></arg>
-- <arg><option>--icon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--miniicon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--dcopserver <server><replaceable></replaceable></option></arg>
-- <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-- <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-- <arg><option>--style <style><replaceable></replaceable></option></arg>
-- <arg><option>--geometry <geometry><replaceable></replaceable></option></arg>
-- <arg><option>--display <display><replaceable></replaceable></option></arg>
-- <arg><option>--session <sessionid><replaceable></replaceable></option></arg>
-- <arg><option>--cmap<replaceable></replaceable></option></arg>
-- <arg><option>--ncols <columns><replaceable></replaceable></option></arg>
-- <arg><option>--nograb<replaceable></replaceable></option></arg>
-- <arg><option>--dograb<replaceable></replaceable></option></arg>
-- <arg><option>--sync<replaceable></replaceable></option></arg>
-- <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg>
-- <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg>
-- <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg>
-- <arg><option>--name<replaceable> <name></replaceable></option></arg>
-- <arg><option>--title<replaceable> <title></replaceable></option></arg>
-- <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-- <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg>
-- <arg><option>--im<replaceable> <server></replaceable></option></arg>
-- <arg><option>--noxim<replaceable></replaceable></option></arg>
-- </cmdsynopsis>
-- </refsynopsisdiv>
-- <refsect1>
-- <title>DESCRIPTION</title>
--
-- <para>This manual page documents briefly the
-- <command>&dhpackage;</command> command.</para>
--
-- <para><command>&dhpackage;</command> is an application to configure cron
-- services.</para>
--
-- </refsect1>
-- <refsect1>
-- <title>OPTIONS</title>
--
-- <para>These programs follow the usual GNU command line syntax,
-- with long options starting with two dashes (`-'). A summary of
-- options is included below. However, the ordering is very strict -
-- --help/-h must come before hostname.</para>
-- <variablelist>
-- <varlistentry>
-- <term><option>-v</option>
-- <option>--version</option>
-- </term>
-- <listitem>
-- <para>Show version information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--author</option>
-- </term>
-- <listitem>
-- <para>Show information about the author.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--license</option>
-- </term>
-- <listitem>
-- <para>Show license information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--caption <caption></option>
-- </term>
-- <listitem>
-- <para>Specify the caption of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--icon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--miniicon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the mini-icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dcopserver <server></option>
-- </term>
-- <listitem>
-- <para>Specify the DCOP server to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nocrashhandler</option>
-- </term>
-- <listitem>
-- <para>Disable KDE crash handler (enables core dumps).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--waitforwm</option>
-- </term>
-- <listitem>
-- <para>Waits for a compatible window manager to start.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--style <style></option>
-- </term>
-- <listitem>
-- <para>Sets the application's GUI style (overrides KDE).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--geometry <geometry></option>
-- </term>
-- <listitem>
-- <para>Sets the geometry of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--display <display></option>
-- </term>
-- <listitem>
-- <para>Specifies the X display to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--session <sessionid></option>
-- </term>
-- <listitem>
-- <para>Restores the application for the given session ID.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--cmap</option>
-- </term>
-- <listitem>
-- <para>Forces use of an internal colour map on an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--ncols <count></option>
-- </term>
-- <listitem>
-- <para>Limits the number of colours allowed in an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nograb</option>
-- </term>
-- <listitem>
-- <para>Forces Qt to never grab the mouse or keyboard.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dograb</option>
-- </term>
-- <listitem>
-- <para>Overrides --nograb, which may be implicitly set.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--sync</option>
-- </term>
-- <listitem>
-- <para>Forces synchronous mode (for debugging).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--font <font></option>
-- <option>--fn <font></option></term>
-- <listitem>
-- <para>Sets the default application font.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--background <colour></option>
-- <option>--bg <colour></option></term>
-- <listitem>
-- <para>Sets the default background colour and application
-- pallette.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--foreground <colour></option>
-- <option>--fg <colour></option></term>
-- <listitem>
-- <para>Sets the default foreground colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--button <colour></option>
-- <option>--btn <colour></option></term>
-- <listitem>
-- <para>Sets the default button colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--name <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application name.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--title <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application title.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--visual TrueColor</option>
-- </term>
-- <listitem>
-- <para>Forces the application to use a True Colour visual on 8-bit
-- displays.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--inputstyle <style></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) input style. Possible values are:
-- onthespot, overthespot, offthespot, and root.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--im <server></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) server.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--noxim</option>
-- </term>
-- <listitem>
-- <para>Disables X Input Method (XIM) support.</para>
-- </listitem>
-- </varlistentry>
-- </variablelist>
-- </refsect1>
-- <refsect1>
-- <title>AUTHOR</title>
--
-- <para>This manual page was written by &dhusername; <&dhemail;> for
-- the &debian; system (but may be used by others). Permission is
-- granted to copy, distribute and/or modify this document under
-- the terms of the <acronym>GNU</acronym> General Public License
-- version 2 or any later version published by the Free Software Foundation.</para>
--
-- </refsect1>
--</refentry>
--
--<!-- Keep this comment at the end of the file
--Local variables:
--mode: sgml
--sgml-omittag:t
--sgml-shorttag:t
--sgml-minimize-attributes:nil
--sgml-always-quote-attributes:t
--sgml-indent-step:2
--sgml-indent-data:t
--sgml-parent-document:nil
--sgml-default-dtd-file:nil
--sgml-exposed-tags:nil
--sgml-local-catalogs:nil
--sgml-local-ecat-files:nil
--End:
---->
-diff -Nrua kdeadmin-3.4.0.orig/debian/man/kdat.sgml kdeadmin-3.4.0/debian/man/kdat.sgml
---- kdeadmin-3.4.0.orig/debian/man/kdat.sgml 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/man/kdat.sgml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,333 +0,0 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
--
--<!-- Process this file with docbook-to-man to generate an nroff manual
-- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
-- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-- less'. A typical entry in a Makefile or Makefile.am is:
--
--manpage.1: manpage.sgml
-- docbook-to-man $< > $@
-- -->
--
-- <!ENTITY dhfirstname "<firstname>Pierre</firstname>">
-- <!ENTITY dhsurname "<surname>Habouzit</surname>">
-- <!ENTITY dhdate "<date>February 28, 2005</date>">
-- <!ENTITY dhsection "<manvolnum>8</manvolnum>">
-- <!ENTITY dhemail "<email>pierre.habouzit@m4x.org</email>">
-- <!ENTITY dhusername "Pierre Habouzit">
-- <!ENTITY dhucpackage "<refentrytitle>KDAT</refentrytitle>">
-- <!ENTITY dhpackage "kdat">
--
-- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
-- <!ENTITY gnu "<acronym>GNU</acronym>">
--]>
--
--<refentry>
-- <refentryinfo>
-- <address>
-- &dhemail;
-- </address>
-- <author>
-- &dhfirstname;
-- &dhsurname;
-- </author>
-- <copyright>
-- <year>2005</year>
-- <holder>&dhusername;</holder>
-- </copyright>
-- &dhdate;
-- </refentryinfo>
-- <refmeta>
-- &dhucpackage;
--
-- &dhsection;
-- </refmeta>
-- <refnamediv>
-- <refname>&dhpackage;</refname>
--
-- <refpurpose>tar-based DAT archiver for KDE.</refpurpose>
-- </refnamediv>
-- <refsynopsisdiv>
-- <cmdsynopsis>
-- <command>&dhpackage;</command>
--
-- <arg><option>--help<replaceable></replaceable></option></arg>
-- <arg><option>--help-kde<replaceable></replaceable></option></arg>
-- <arg><option>--help-qt<replaceable></replaceable></option></arg>
-- <arg><option>--version<replaceable> -v</replaceable></option></arg>
-- <arg><option>--license<replaceable></replaceable></option></arg>
-- <arg><option>--author<replaceable></replaceable></option></arg>
-- <arg><option>--caption <caption><replaceable></replaceable></option></arg>
-- <arg><option>--icon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--miniicon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--dcopserver <server><replaceable></replaceable></option></arg>
-- <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-- <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-- <arg><option>--style <style><replaceable></replaceable></option></arg>
-- <arg><option>--geometry <geometry><replaceable></replaceable></option></arg>
-- <arg><option>--display <display><replaceable></replaceable></option></arg>
-- <arg><option>--session <sessionid><replaceable></replaceable></option></arg>
-- <arg><option>--cmap<replaceable></replaceable></option></arg>
-- <arg><option>--ncols <columns><replaceable></replaceable></option></arg>
-- <arg><option>--nograb<replaceable></replaceable></option></arg>
-- <arg><option>--dograb<replaceable></replaceable></option></arg>
-- <arg><option>--sync<replaceable></replaceable></option></arg>
-- <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg>
-- <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg>
-- <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg>
-- <arg><option>--name<replaceable> <name></replaceable></option></arg>
-- <arg><option>--title<replaceable> <title></replaceable></option></arg>
-- <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-- <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg>
-- <arg><option>--im<replaceable> <server></replaceable></option></arg>
-- <arg><option>--noxim<replaceable></replaceable></option></arg>
-- </cmdsynopsis>
-- </refsynopsisdiv>
-- <refsect1>
-- <title>DESCRIPTION</title>
--
-- <para>This manual page documents briefly the
-- <command>&dhpackage;</command> command.</para>
--
-- <para><command>&dhpackage;</command> is a tar based tape archiver,
-- that is designed to work with multiple archives on a single tape.</para>
--
-- </refsect1>
-- <refsect1>
-- <title>OPTIONS</title>
--
-- <para>These programs follow the usual GNU command line syntax,
-- with long options starting with two dashes (`-'). A summary of
-- options is included below. However, the ordering is very strict -
-- --help/-h must come before hostname.</para>
-- <variablelist>
-- <varlistentry>
-- <term><option>-v</option>
-- <option>--version</option>
-- </term>
-- <listitem>
-- <para>Show version information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--author</option>
-- </term>
-- <listitem>
-- <para>Show information about the author.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--license</option>
-- </term>
-- <listitem>
-- <para>Show license information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--caption <caption></option>
-- </term>
-- <listitem>
-- <para>Specify the caption of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--icon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--miniicon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the mini-icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dcopserver <server></option>
-- </term>
-- <listitem>
-- <para>Specify the DCOP server to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nocrashhandler</option>
-- </term>
-- <listitem>
-- <para>Disable KDE crash handler (enables core dumps).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--waitforwm</option>
-- </term>
-- <listitem>
-- <para>Waits for a compatible window manager to start.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--style <style></option>
-- </term>
-- <listitem>
-- <para>Sets the application's GUI style (overrides KDE).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--geometry <geometry></option>
-- </term>
-- <listitem>
-- <para>Sets the geometry of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--display <display></option>
-- </term>
-- <listitem>
-- <para>Specifies the X display to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--session <sessionid></option>
-- </term>
-- <listitem>
-- <para>Restores the application for the given session ID.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--cmap</option>
-- </term>
-- <listitem>
-- <para>Forces use of an internal colour map on an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--ncols <count></option>
-- </term>
-- <listitem>
-- <para>Limits the number of colours allowed in an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nograb</option>
-- </term>
-- <listitem>
-- <para>Forces Qt to never grab the mouse or keyboard.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dograb</option>
-- </term>
-- <listitem>
-- <para>Overrides --nograb, which may be implicitly set.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--sync</option>
-- </term>
-- <listitem>
-- <para>Forces synchronous mode (for debugging).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--font <font></option>
-- <option>--fn <font></option></term>
-- <listitem>
-- <para>Sets the default application font.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--background <colour></option>
-- <option>--bg <colour></option></term>
-- <listitem>
-- <para>Sets the default background colour and application
-- pallette.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--foreground <colour></option>
-- <option>--fg <colour></option></term>
-- <listitem>
-- <para>Sets the default foreground colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--button <colour></option>
-- <option>--btn <colour></option></term>
-- <listitem>
-- <para>Sets the default button colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--name <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application name.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--title <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application title.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--visual TrueColor</option>
-- </term>
-- <listitem>
-- <para>Forces the application to use a True Colour visual on 8-bit
-- displays.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--inputstyle <style></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) input style. Possible values are:
-- onthespot, overthespot, offthespot, and root.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--im <server></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) server.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--noxim</option>
-- </term>
-- <listitem>
-- <para>Disables X Input Method (XIM) support.</para>
-- </listitem>
-- </varlistentry>
-- </variablelist>
-- </refsect1>
-- <refsect1>
-- <title>AUTHOR</title>
--
-- <para>This manual page was written by &dhusername; <&dhemail;> for
-- the &debian; system (but may be used by others). Permission is
-- granted to copy, distribute and/or modify this document under
-- the terms of the <acronym>GNU</acronym> General Public License
-- version 2 or any later version published by the Free Software Foundation.</para>
--
-- </refsect1>
--</refentry>
--
--<!-- Keep this comment at the end of the file
--Local variables:
--mode: sgml
--sgml-omittag:t
--sgml-shorttag:t
--sgml-minimize-attributes:nil
--sgml-always-quote-attributes:t
--sgml-indent-step:2
--sgml-indent-data:t
--sgml-parent-document:nil
--sgml-default-dtd-file:nil
--sgml-exposed-tags:nil
--sgml-local-catalogs:nil
--sgml-local-ecat-files:nil
--End:
---->
-diff -Nrua kdeadmin-3.4.0.orig/debian/man/kpackage.sgml kdeadmin-3.4.0/debian/man/kpackage.sgml
---- kdeadmin-3.4.0.orig/debian/man/kpackage.sgml 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/man/kpackage.sgml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,349 +0,0 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
--
--<!-- Process this file with docbook-to-man to generate an nroff manual
-- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
-- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-- less'. A typical entry in a Makefile or Makefile.am is:
--
--manpage.1: manpage.sgml
-- docbook-to-man $< > $@
-- -->
--
-- <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-- <!ENTITY dhsurname "<surname>Stone</surname>">
-- <!ENTITY dhdate "<date>October 21, 2001</date>">
-- <!ENTITY dhsection "<manvolnum>1</manvolnum>">
-- <!ENTITY dhemail "<email>daniel@sfarc.net</email>">
-- <!ENTITY dhusername "Daniel Stone">
-- <!ENTITY dhucpackage "<refentrytitle>KPACKAGE</refentrytitle>">
-- <!ENTITY dhpackage "kpackage">
--
-- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
-- <!ENTITY gnu "<acronym>GNU</acronym>">
--]>
--
--<refentry>
-- <refentryinfo>
-- <address>
-- &dhemail;
-- </address>
-- <author>
-- &dhfirstname;
-- &dhsurname;
-- </author>
-- <copyright>
-- <year>2001</year>
-- <holder>&dhusername;</holder>
-- </copyright>
-- &dhdate;
-- </refentryinfo>
-- <refmeta>
-- &dhucpackage;
--
-- &dhsection;
-- </refmeta>
-- <refnamediv>
-- <refname>&dhpackage;</refname>
--
-- <refpurpose>Installs, removes, and queries packages.</refpurpose>
-- </refnamediv>
-- <refsynopsisdiv>
-- <cmdsynopsis>
-- <command>&dhpackage;</command>
--
-- <arg><option>--help<replaceable></replaceable></option></arg>
-- <arg><option>--help-kde<replaceable></replaceable></option></arg>
-- <arg><option>--help-qt<replaceable></replaceable></option></arg>
-- <arg><option>--version<replaceable> -v</replaceable></option></arg>
-- <arg><option>--license<replaceable></replaceable></option></arg>
-- <arg><option>--author<replaceable></replaceable></option></arg>
-- <arg><option>--caption <caption><replaceable></replaceable></option></arg>
-- <arg><option>--icon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--miniicon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--dcopserver <server><replaceable></replaceable></option></arg>
-- <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-- <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-- <arg><option>--style <style><replaceable></replaceable></option></arg>
-- <arg><option>--geometry <geometry><replaceable></replaceable></option></arg>
-- <arg><option>--display <display><replaceable></replaceable></option></arg>
-- <arg><option>--session <sessionid><replaceable></replaceable></option></arg>
-- <arg><option>--cmap<replaceable></replaceable></option></arg>
-- <arg><option>--ncols <columns><replaceable></replaceable></option></arg>
-- <arg><option>--nograb<replaceable></replaceable></option></arg>
-- <arg><option>--dograb<replaceable></replaceable></option></arg>
-- <arg><option>--sync<replaceable></replaceable></option></arg>
-- <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg>
-- <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg>
-- <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg>
-- <arg><option>--name<replaceable> <name></replaceable></option></arg>
-- <arg><option>--title<replaceable> <title></replaceable></option></arg>
-- <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-- <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg>
-- <arg><option>--im<replaceable> <server></replaceable></option></arg>
-- <arg><option>--noxim<replaceable></replaceable></option></arg>
-- <arg><option>--remote<replaceable> <server></replaceable></option></arg>
-- <arg><option>file<replaceable></replaceable></option></arg>
-- </cmdsynopsis>
-- </refsynopsisdiv>
-- <refsect1>
-- <title>DESCRIPTION</title>
--
-- <para>This manual page documents briefly the
-- <command>&dhpackage;</command> command.</para>
--
-- <para><command>&dhpackage;</command> is an application to install, remove
-- and query packages in many formats, including RPM and DEB.</para>
--
-- </refsect1>
-- <refsect1>
-- <title>OPTIONS</title>
--
-- <para>These programs follow the usual GNU command line syntax,
-- with long options starting with two dashes (`-'). A summary of
-- options is included below. However, the ordering is very strict -
-- --help/-h must come before hostname.</para>
-- <variablelist>
-- <varlistentry>
-- <term><option>-v</option>
-- <option>--version</option>
-- </term>
-- <listitem>
-- <para>Show version information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--author</option>
-- </term>
-- <listitem>
-- <para>Show information about the author.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--license</option>
-- </term>
-- <listitem>
-- <para>Show license information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--caption <caption></option>
-- </term>
-- <listitem>
-- <para>Specify the caption of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--icon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--miniicon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the mini-icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dcopserver <server></option>
-- </term>
-- <listitem>
-- <para>Specify the DCOP server to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nocrashhandler</option>
-- </term>
-- <listitem>
-- <para>Disable KDE crash handler (enables core dumps).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--waitforwm</option>
-- </term>
-- <listitem>
-- <para>Waits for a compatible window manager to start.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--style <style></option>
-- </term>
-- <listitem>
-- <para>Sets the application's GUI style (overrides KDE).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--geometry <geometry></option>
-- </term>
-- <listitem>
-- <para>Sets the geometry of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--display <display></option>
-- </term>
-- <listitem>
-- <para>Specifies the X display to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--session <sessionid></option>
-- </term>
-- <listitem>
-- <para>Restores the application for the given session ID.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--cmap</option>
-- </term>
-- <listitem>
-- <para>Forces use of an internal colour map on an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--ncols <count></option>
-- </term>
-- <listitem>
-- <para>Limits the number of colours allowed in an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nograb</option>
-- </term>
-- <listitem>
-- <para>Forces Qt to never grab the mouse or keyboard.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dograb</option>
-- </term>
-- <listitem>
-- <para>Overrides --nograb, which may be implicitly set.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--sync</option>
-- </term>
-- <listitem>
-- <para>Forces synchronous mode (for debugging).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--font <font></option>
-- <option>--fn <font></option></term>
-- <listitem>
-- <para>Sets the default application font.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--background <colour></option>
-- <option>--bg <colour></option></term>
-- <listitem>
-- <para>Sets the default background colour and application
-- pallette.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--foreground <colour></option>
-- <option>--fg <colour></option></term>
-- <listitem>
-- <para>Sets the default foreground colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--button <colour></option>
-- <option>--btn <colour></option></term>
-- <listitem>
-- <para>Sets the default button colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--name <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application name.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--title <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application title.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--visual TrueColor</option>
-- </term>
-- <listitem>
-- <para>Forces the application to use a True Colour visual on 8-bit
-- displays.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--inputstyle <style></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) input style. Possible values are:
-- onthespot, overthespot, offthespot, and root.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--im <server></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) server.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--noxim</option>
-- </term>
-- <listitem>
-- <para>Disables X Input Method (XIM) support.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--remote <server></option>
-- </term>
-- <listitem>
-- <para>Perform the actions on remote server <var>server</var> via SSH.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option><file></option>
-- </term>
-- <listitem>
-- <para>Name of the file (package) to install.</para>
-- </listitem>
-- </varlistentry>
-- </variablelist>
-- </refsect1>
-- <refsect1>
-- <title>AUTHOR</title>
--
-- <para>This manual page was written by &dhusername; <&dhemail;> for
-- the &debian; system (but may be used by others). Permission is
-- granted to copy, distribute and/or modify this document under
-- the terms of the <acronym>GNU</acronym> General Public License
-- version 2 or any later version published by the Free Software Foundation.</para>
--
-- </refsect1>
--</refentry>
--
--<!-- Keep this comment at the end of the file
--Local variables:
--mode: sgml
--sgml-omittag:t
--sgml-shorttag:t
--sgml-minimize-attributes:nil
--sgml-always-quote-attributes:t
--sgml-indent-step:2
--sgml-indent-data:t
--sgml-parent-document:nil
--sgml-default-dtd-file:nil
--sgml-exposed-tags:nil
--sgml-local-catalogs:nil
--sgml-local-ecat-files:nil
--End:
---->
-diff -Nrua kdeadmin-3.4.0.orig/debian/man/ksysv.sgml kdeadmin-3.4.0/debian/man/ksysv.sgml
---- kdeadmin-3.4.0.orig/debian/man/ksysv.sgml 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/man/ksysv.sgml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,333 +0,0 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
--
--<!-- Process this file with docbook-to-man to generate an nroff manual
-- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
-- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-- less'. A typical entry in a Makefile or Makefile.am is:
--
--manpage.1: manpage.sgml
-- docbook-to-man $< > $@
-- -->
--
-- <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-- <!ENTITY dhsurname "<surname>Stone</surname>">
-- <!ENTITY dhdate "<date>October 21, 2001</date>">
-- <!ENTITY dhsection "<manvolnum>8</manvolnum>">
-- <!ENTITY dhemail "<email>daniel@sfarc.net</email>">
-- <!ENTITY dhusername "Daniel Stone">
-- <!ENTITY dhucpackage "<refentrytitle>KSYSV</refentrytitle>">
-- <!ENTITY dhpackage "ksysv">
--
-- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
-- <!ENTITY gnu "<acronym>GNU</acronym>">
--]>
--
--<refentry>
-- <refentryinfo>
-- <address>
-- &dhemail;
-- </address>
-- <author>
-- &dhfirstname;
-- &dhsurname;
-- </author>
-- <copyright>
-- <year>2001</year>
-- <holder>&dhusername;</holder>
-- </copyright>
-- &dhdate;
-- </refentryinfo>
-- <refmeta>
-- &dhucpackage;
--
-- &dhsection;
-- </refmeta>
-- <refnamediv>
-- <refname>&dhpackage;</refname>
--
-- <refpurpose>Views and sets SysV init configuration.</refpurpose>
-- </refnamediv>
-- <refsynopsisdiv>
-- <cmdsynopsis>
-- <command>&dhpackage;</command>
--
-- <arg><option>--help<replaceable></replaceable></option></arg>
-- <arg><option>--help-kde<replaceable></replaceable></option></arg>
-- <arg><option>--help-qt<replaceable></replaceable></option></arg>
-- <arg><option>--version<replaceable> -v</replaceable></option></arg>
-- <arg><option>--license<replaceable></replaceable></option></arg>
-- <arg><option>--author<replaceable></replaceable></option></arg>
-- <arg><option>--caption <caption><replaceable></replaceable></option></arg>
-- <arg><option>--icon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--miniicon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--dcopserver <server><replaceable></replaceable></option></arg>
-- <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-- <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-- <arg><option>--style <style><replaceable></replaceable></option></arg>
-- <arg><option>--geometry <geometry><replaceable></replaceable></option></arg>
-- <arg><option>--display <display><replaceable></replaceable></option></arg>
-- <arg><option>--session <sessionid><replaceable></replaceable></option></arg>
-- <arg><option>--cmap<replaceable></replaceable></option></arg>
-- <arg><option>--ncols <columns><replaceable></replaceable></option></arg>
-- <arg><option>--nograb<replaceable></replaceable></option></arg>
-- <arg><option>--dograb<replaceable></replaceable></option></arg>
-- <arg><option>--sync<replaceable></replaceable></option></arg>
-- <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg>
-- <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg>
-- <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg>
-- <arg><option>--name<replaceable> <name></replaceable></option></arg>
-- <arg><option>--title<replaceable> <title></replaceable></option></arg>
-- <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-- <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg>
-- <arg><option>--im<replaceable> <server></replaceable></option></arg>
-- <arg><option>--noxim<replaceable></replaceable></option></arg>
-- </cmdsynopsis>
-- </refsynopsisdiv>
-- <refsect1>
-- <title>DESCRIPTION</title>
--
-- <para>This manual page documents briefly the
-- <command>&dhpackage;</command> command.</para>
--
-- <para><command>&dhpackage;</command> is an application to configure SysV-like
-- init services.</para>
--
-- </refsect1>
-- <refsect1>
-- <title>OPTIONS</title>
--
-- <para>These programs follow the usual GNU command line syntax,
-- with long options starting with two dashes (`-'). A summary of
-- options is included below. However, the ordering is very strict -
-- --help/-h must come before hostname.</para>
-- <variablelist>
-- <varlistentry>
-- <term><option>-v</option>
-- <option>--version</option>
-- </term>
-- <listitem>
-- <para>Show version information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--author</option>
-- </term>
-- <listitem>
-- <para>Show information about the author.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--license</option>
-- </term>
-- <listitem>
-- <para>Show license information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--caption <caption></option>
-- </term>
-- <listitem>
-- <para>Specify the caption of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--icon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--miniicon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the mini-icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dcopserver <server></option>
-- </term>
-- <listitem>
-- <para>Specify the DCOP server to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nocrashhandler</option>
-- </term>
-- <listitem>
-- <para>Disable KDE crash handler (enables core dumps).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--waitforwm</option>
-- </term>
-- <listitem>
-- <para>Waits for a compatible window manager to start.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--style <style></option>
-- </term>
-- <listitem>
-- <para>Sets the application's GUI style (overrides KDE).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--geometry <geometry></option>
-- </term>
-- <listitem>
-- <para>Sets the geometry of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--display <display></option>
-- </term>
-- <listitem>
-- <para>Specifies the X display to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--session <sessionid></option>
-- </term>
-- <listitem>
-- <para>Restores the application for the given session ID.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--cmap</option>
-- </term>
-- <listitem>
-- <para>Forces use of an internal colour map on an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--ncols <count></option>
-- </term>
-- <listitem>
-- <para>Limits the number of colours allowed in an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nograb</option>
-- </term>
-- <listitem>
-- <para>Forces Qt to never grab the mouse or keyboard.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dograb</option>
-- </term>
-- <listitem>
-- <para>Overrides --nograb, which may be implicitly set.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--sync</option>
-- </term>
-- <listitem>
-- <para>Forces synchronous mode (for debugging).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--font <font></option>
-- <option>--fn <font></option></term>
-- <listitem>
-- <para>Sets the default application font.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--background <colour></option>
-- <option>--bg <colour></option></term>
-- <listitem>
-- <para>Sets the default background colour and application
-- pallette.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--foreground <colour></option>
-- <option>--fg <colour></option></term>
-- <listitem>
-- <para>Sets the default foreground colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--button <colour></option>
-- <option>--btn <colour></option></term>
-- <listitem>
-- <para>Sets the default button colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--name <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application name.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--title <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application title.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--visual TrueColor</option>
-- </term>
-- <listitem>
-- <para>Forces the application to use a True Colour visual on 8-bit
-- displays.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--inputstyle <style></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) input style. Possible values are:
-- onthespot, overthespot, offthespot, and root.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--im <server></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) server.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--noxim</option>
-- </term>
-- <listitem>
-- <para>Disables X Input Method (XIM) support.</para>
-- </listitem>
-- </varlistentry>
-- </variablelist>
-- </refsect1>
-- <refsect1>
-- <title>AUTHOR</title>
--
-- <para>This manual page was written by &dhusername; <&dhemail;> for
-- the &debian; system (but may be used by others). Permission is
-- granted to copy, distribute and/or modify this document under
-- the terms of the <acronym>GNU</acronym> General Public License
-- version 2 or any later version published by the Free Software Foundation.</para>
--
-- </refsect1>
--</refentry>
--
--<!-- Keep this comment at the end of the file
--Local variables:
--mode: sgml
--sgml-omittag:t
--sgml-shorttag:t
--sgml-minimize-attributes:nil
--sgml-always-quote-attributes:t
--sgml-indent-step:2
--sgml-indent-data:t
--sgml-parent-document:nil
--sgml-default-dtd-file:nil
--sgml-exposed-tags:nil
--sgml-local-catalogs:nil
--sgml-local-ecat-files:nil
--End:
---->
-diff -Nrua kdeadmin-3.4.0.orig/debian/man/kuser.sgml kdeadmin-3.4.0/debian/man/kuser.sgml
---- kdeadmin-3.4.0.orig/debian/man/kuser.sgml 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/man/kuser.sgml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,333 +0,0 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
--
--<!-- Process this file with docbook-to-man to generate an nroff manual
-- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
-- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-- less'. A typical entry in a Makefile or Makefile.am is:
--
--manpage.1: manpage.sgml
-- docbook-to-man $< > $@
-- -->
--
-- <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-- <!ENTITY dhsurname "<surname>Stone</surname>">
-- <!ENTITY dhdate "<date>October 21, 2001</date>">
-- <!ENTITY dhsection "<manvolnum>8</manvolnum>">
-- <!ENTITY dhemail "<email>daniel@sfarc.net</email>">
-- <!ENTITY dhusername "Daniel Stone">
-- <!ENTITY dhucpackage "<refentrytitle>KUSER</refentrytitle>">
-- <!ENTITY dhpackage "kuser">
--
-- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
-- <!ENTITY gnu "<acronym>GNU</acronym>">
--]>
--
--<refentry>
-- <refentryinfo>
-- <address>
-- &dhemail;
-- </address>
-- <author>
-- &dhfirstname;
-- &dhsurname;
-- </author>
-- <copyright>
-- <year>2001</year>
-- <holder>&dhusername;</holder>
-- </copyright>
-- &dhdate;
-- </refentryinfo>
-- <refmeta>
-- &dhucpackage;
--
-- &dhsection;
-- </refmeta>
-- <refnamediv>
-- <refname>&dhpackage;</refname>
--
-- <refpurpose>Configures users on the system.</refpurpose>
-- </refnamediv>
-- <refsynopsisdiv>
-- <cmdsynopsis>
-- <command>&dhpackage;</command>
--
-- <arg><option>--help<replaceable></replaceable></option></arg>
-- <arg><option>--help-kde<replaceable></replaceable></option></arg>
-- <arg><option>--help-qt<replaceable></replaceable></option></arg>
-- <arg><option>--version<replaceable> -v</replaceable></option></arg>
-- <arg><option>--license<replaceable></replaceable></option></arg>
-- <arg><option>--author<replaceable></replaceable></option></arg>
-- <arg><option>--caption <caption><replaceable></replaceable></option></arg>
-- <arg><option>--icon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--miniicon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--dcopserver <server><replaceable></replaceable></option></arg>
-- <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-- <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-- <arg><option>--style <style><replaceable></replaceable></option></arg>
-- <arg><option>--geometry <geometry><replaceable></replaceable></option></arg>
-- <arg><option>--display <display><replaceable></replaceable></option></arg>
-- <arg><option>--session <sessionid><replaceable></replaceable></option></arg>
-- <arg><option>--cmap<replaceable></replaceable></option></arg>
-- <arg><option>--ncols <columns><replaceable></replaceable></option></arg>
-- <arg><option>--nograb<replaceable></replaceable></option></arg>
-- <arg><option>--dograb<replaceable></replaceable></option></arg>
-- <arg><option>--sync<replaceable></replaceable></option></arg>
-- <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg>
-- <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg>
-- <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg>
-- <arg><option>--name<replaceable> <name></replaceable></option></arg>
-- <arg><option>--title<replaceable> <title></replaceable></option></arg>
-- <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-- <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg>
-- <arg><option>--im<replaceable> <server></replaceable></option></arg>
-- <arg><option>--noxim<replaceable></replaceable></option></arg>
-- </cmdsynopsis>
-- </refsynopsisdiv>
-- <refsect1>
-- <title>DESCRIPTION</title>
--
-- <para>This manual page documents briefly the
-- <command>&dhpackage;</command> command.</para>
--
-- <para><command>&dhpackage;</command> is an application to configure users on
-- the system.</para>
--
-- </refsect1>
-- <refsect1>
-- <title>OPTIONS</title>
--
-- <para>These programs follow the usual GNU command line syntax,
-- with long options starting with two dashes (`-'). A summary of
-- options is included below. However, the ordering is very strict -
-- --help/-h must come before hostname.</para>
-- <variablelist>
-- <varlistentry>
-- <term><option>-v</option>
-- <option>--version</option>
-- </term>
-- <listitem>
-- <para>Show version information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--author</option>
-- </term>
-- <listitem>
-- <para>Show information about the author.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--license</option>
-- </term>
-- <listitem>
-- <para>Show license information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--caption <caption></option>
-- </term>
-- <listitem>
-- <para>Specify the caption of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--icon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--miniicon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the mini-icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dcopserver <server></option>
-- </term>
-- <listitem>
-- <para>Specify the DCOP server to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nocrashhandler</option>
-- </term>
-- <listitem>
-- <para>Disable KDE crash handler (enables core dumps).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--waitforwm</option>
-- </term>
-- <listitem>
-- <para>Waits for a compatible window manager to start.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--style <style></option>
-- </term>
-- <listitem>
-- <para>Sets the application's GUI style (overrides KDE).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--geometry <geometry></option>
-- </term>
-- <listitem>
-- <para>Sets the geometry of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--display <display></option>
-- </term>
-- <listitem>
-- <para>Specifies the X display to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--session <sessionid></option>
-- </term>
-- <listitem>
-- <para>Restores the application for the given session ID.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--cmap</option>
-- </term>
-- <listitem>
-- <para>Forces use of an internal colour map on an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--ncols <count></option>
-- </term>
-- <listitem>
-- <para>Limits the number of colours allowed in an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nograb</option>
-- </term>
-- <listitem>
-- <para>Forces Qt to never grab the mouse or keyboard.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dograb</option>
-- </term>
-- <listitem>
-- <para>Overrides --nograb, which may be implicitly set.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--sync</option>
-- </term>
-- <listitem>
-- <para>Forces synchronous mode (for debugging).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--font <font></option>
-- <option>--fn <font></option></term>
-- <listitem>
-- <para>Sets the default application font.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--background <colour></option>
-- <option>--bg <colour></option></term>
-- <listitem>
-- <para>Sets the default background colour and application
-- pallette.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--foreground <colour></option>
-- <option>--fg <colour></option></term>
-- <listitem>
-- <para>Sets the default foreground colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--button <colour></option>
-- <option>--btn <colour></option></term>
-- <listitem>
-- <para>Sets the default button colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--name <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application name.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--title <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application title.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--visual TrueColor</option>
-- </term>
-- <listitem>
-- <para>Forces the application to use a True Colour visual on 8-bit
-- displays.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--inputstyle <style></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) input style. Possible values are:
-- onthespot, overthespot, offthespot, and root.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--im <server></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) server.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--noxim</option>
-- </term>
-- <listitem>
-- <para>Disables X Input Method (XIM) support.</para>
-- </listitem>
-- </varlistentry>
-- </variablelist>
-- </refsect1>
-- <refsect1>
-- <title>AUTHOR</title>
--
-- <para>This manual page was written by &dhusername; <&dhemail;> for
-- the &debian; system (but may be used by others). Permission is
-- granted to copy, distribute and/or modify this document under
-- the terms of the <acronym>GNU</acronym> General Public License
-- version 2 or any later version published by the Free Software Foundation.</para>
--
-- </refsect1>
--</refentry>
--
--<!-- Keep this comment at the end of the file
--Local variables:
--mode: sgml
--sgml-omittag:t
--sgml-shorttag:t
--sgml-minimize-attributes:nil
--sgml-always-quote-attributes:t
--sgml-indent-step:2
--sgml-indent-data:t
--sgml-parent-document:nil
--sgml-default-dtd-file:nil
--sgml-exposed-tags:nil
--sgml-local-catalogs:nil
--sgml-local-ecat-files:nil
--End:
---->
-diff -Nrua kdeadmin-3.4.0.orig/debian/man/secpolicy.sgml kdeadmin-3.4.0/debian/man/secpolicy.sgml
---- kdeadmin-3.4.0.orig/debian/man/secpolicy.sgml 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/man/secpolicy.sgml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,333 +0,0 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
--
--<!-- Process this file with docbook-to-man to generate an nroff manual
-- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
-- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-- less'. A typical entry in a Makefile or Makefile.am is:
--
--manpage.1: manpage.sgml
-- docbook-to-man $< > $@
-- -->
--
-- <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-- <!ENTITY dhsurname "<surname>Stone</surname>">
-- <!ENTITY dhdate "<date>October 21, 2001</date>">
-- <!ENTITY dhsection "<manvolnum>8</manvolnum>">
-- <!ENTITY dhemail "<email>daniel@sfarc.net</email>">
-- <!ENTITY dhusername "Daniel Stone">
-- <!ENTITY dhucpackage "<refentrytitle>SECPOLICY</refentrytitle>">
-- <!ENTITY dhpackage "secpolicy">
--
-- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
-- <!ENTITY gnu "<acronym>GNU</acronym>">
--]>
--
--<refentry>
-- <refentryinfo>
-- <address>
-- &dhemail;
-- </address>
-- <author>
-- &dhfirstname;
-- &dhsurname;
-- </author>
-- <copyright>
-- <year>2001</year>
-- <holder>&dhusername;</holder>
-- </copyright>
-- &dhdate;
-- </refentryinfo>
-- <refmeta>
-- &dhucpackage;
--
-- &dhsection;
-- </refmeta>
-- <refnamediv>
-- <refname>&dhpackage;</refname>
--
-- <refpurpose>Views and sets PAM security policies.</refpurpose>
-- </refnamediv>
-- <refsynopsisdiv>
-- <cmdsynopsis>
-- <command>&dhpackage;</command>
--
-- <arg><option>--help<replaceable></replaceable></option></arg>
-- <arg><option>--help-kde<replaceable></replaceable></option></arg>
-- <arg><option>--help-qt<replaceable></replaceable></option></arg>
-- <arg><option>--version<replaceable> -v</replaceable></option></arg>
-- <arg><option>--license<replaceable></replaceable></option></arg>
-- <arg><option>--author<replaceable></replaceable></option></arg>
-- <arg><option>--caption <caption><replaceable></replaceable></option></arg>
-- <arg><option>--icon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--miniicon <icon><replaceable></replaceable></option></arg>
-- <arg><option>--dcopserver <server><replaceable></replaceable></option></arg>
-- <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-- <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-- <arg><option>--style <style><replaceable></replaceable></option></arg>
-- <arg><option>--geometry <geometry><replaceable></replaceable></option></arg>
-- <arg><option>--display <display><replaceable></replaceable></option></arg>
-- <arg><option>--session <sessionid><replaceable></replaceable></option></arg>
-- <arg><option>--cmap<replaceable></replaceable></option></arg>
-- <arg><option>--ncols <columns><replaceable></replaceable></option></arg>
-- <arg><option>--nograb<replaceable></replaceable></option></arg>
-- <arg><option>--dograb<replaceable></replaceable></option></arg>
-- <arg><option>--sync<replaceable></replaceable></option></arg>
-- <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg>
-- <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg>
-- <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg>
-- <arg><option>--name<replaceable> <name></replaceable></option></arg>
-- <arg><option>--title<replaceable> <title></replaceable></option></arg>
-- <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-- <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg>
-- <arg><option>--im<replaceable> <server></replaceable></option></arg>
-- <arg><option>--noxim<replaceable></replaceable></option></arg>
-- </cmdsynopsis>
-- </refsynopsisdiv>
-- <refsect1>
-- <title>DESCRIPTION</title>
--
-- <para>This manual page documents briefly the
-- <command>&dhpackage;</command> command.</para>
--
-- <para><command>&dhpackage;</command> is an application to view and set PAM security
-- policies.</para>
--
-- </refsect1>
-- <refsect1>
-- <title>OPTIONS</title>
--
-- <para>These programs follow the usual GNU command line syntax,
-- with long options starting with two dashes (`-'). A summary of
-- options is included below. However, the ordering is very strict -
-- --help/-h must come before hostname.</para>
-- <variablelist>
-- <varlistentry>
-- <term><option>-v</option>
-- <option>--version</option>
-- </term>
-- <listitem>
-- <para>Show version information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--author</option>
-- </term>
-- <listitem>
-- <para>Show information about the author.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--license</option>
-- </term>
-- <listitem>
-- <para>Show license information.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--caption <caption></option>
-- </term>
-- <listitem>
-- <para>Specify the caption of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--icon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--miniicon <icon></option>
-- </term>
-- <listitem>
-- <para>Specify the mini-icon of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dcopserver <server></option>
-- </term>
-- <listitem>
-- <para>Specify the DCOP server to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nocrashhandler</option>
-- </term>
-- <listitem>
-- <para>Disable KDE crash handler (enables core dumps).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--waitforwm</option>
-- </term>
-- <listitem>
-- <para>Waits for a compatible window manager to start.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--style <style></option>
-- </term>
-- <listitem>
-- <para>Sets the application's GUI style (overrides KDE).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--geometry <geometry></option>
-- </term>
-- <listitem>
-- <para>Sets the geometry of the window.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--display <display></option>
-- </term>
-- <listitem>
-- <para>Specifies the X display to use.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--session <sessionid></option>
-- </term>
-- <listitem>
-- <para>Restores the application for the given session ID.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--cmap</option>
-- </term>
-- <listitem>
-- <para>Forces use of an internal colour map on an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--ncols <count></option>
-- </term>
-- <listitem>
-- <para>Limits the number of colours allowed in an 8-bit display.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--nograb</option>
-- </term>
-- <listitem>
-- <para>Forces Qt to never grab the mouse or keyboard.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--dograb</option>
-- </term>
-- <listitem>
-- <para>Overrides --nograb, which may be implicitly set.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--sync</option>
-- </term>
-- <listitem>
-- <para>Forces synchronous mode (for debugging).</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--font <font></option>
-- <option>--fn <font></option></term>
-- <listitem>
-- <para>Sets the default application font.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--background <colour></option>
-- <option>--bg <colour></option></term>
-- <listitem>
-- <para>Sets the default background colour and application
-- pallette.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--foreground <colour></option>
-- <option>--fg <colour></option></term>
-- <listitem>
-- <para>Sets the default foreground colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--button <colour></option>
-- <option>--btn <colour></option></term>
-- <listitem>
-- <para>Sets the default button colour.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--name <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application name.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--title <name></option>
-- </term>
-- <listitem>
-- <para>Sets the application title.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--visual TrueColor</option>
-- </term>
-- <listitem>
-- <para>Forces the application to use a True Colour visual on 8-bit
-- displays.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--inputstyle <style></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) input style. Possible values are:
-- onthespot, overthespot, offthespot, and root.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--im <server></option>
-- </term>
-- <listitem>
-- <para>Sets X Input Method (XIM) server.</para>
-- </listitem>
-- </varlistentry>
-- <varlistentry>
-- <term><option>--noxim</option>
-- </term>
-- <listitem>
-- <para>Disables X Input Method (XIM) support.</para>
-- </listitem>
-- </varlistentry>
-- </variablelist>
-- </refsect1>
-- <refsect1>
-- <title>AUTHOR</title>
--
-- <para>This manual page was written by &dhusername; <&dhemail;> for
-- the &debian; system (but may be used by others). Permission is
-- granted to copy, distribute and/or modify this document under
-- the terms of the <acronym>GNU</acronym> General Public License
-- version 2 or any later version published by the Free Software Foundation.</para>
--
-- </refsect1>
--</refentry>
--
--<!-- Keep this comment at the end of the file
--Local variables:
--mode: sgml
--sgml-omittag:t
--sgml-shorttag:t
--sgml-minimize-attributes:nil
--sgml-always-quote-attributes:t
--sgml-indent-step:2
--sgml-indent-data:t
--sgml-parent-document:nil
--sgml-default-dtd-file:nil
--sgml-exposed-tags:nil
--sgml-local-catalogs:nil
--sgml-local-ecat-files:nil
--End:
---->
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/02_autotools_update.diff kdeadmin-3.4.0/debian/patches/common/02_autotools_update.diff
---- kdeadmin-3.4.0.orig/debian/patches/common/02_autotools_update.diff 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/02_autotools_update.diff 1970-01-01 01:00:00.000000000 +0100
-@@ -1,1910 +0,0 @@
--diff -Nrua a/admin/compile b/admin/compile
----- a/admin/compile 2002-09-30 14:18:17.000000000 +0200
--+++ b/admin/compile 2005-02-26 06:17:26.726682545 +0100
--@@ -1,8 +1,9 @@
-- #! /bin/sh
---
-- # Wrapper for compilers which do not understand `-c -o'.
--
---# Copyright 1999, 2000 Free Software Foundation, Inc.
--+scriptversion=2005-02-03.08
--+
--+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-- # Written by Tom Tromey <tromey@cygnus.com>.
-- #
-- # This program is free software; you can redistribute it and/or modify
--@@ -24,76 +25,118 @@
-- # configuration script generated by Autoconf, you may include it under
-- # the same distribution terms that you use for the rest of that program.
--
---# Usage:
---# compile PROGRAM [ARGS]...
---# `-o FOO.o' is removed from the args passed to the actual compile.
---
---prog=$1
---shift
--+# This file is maintained in Automake, please report
--+# bugs to <bug-automake@gnu.org> or send patches to
--+# <automake-patches@gnu.org>.
--+
--+case $1 in
--+ '')
--+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
--+ exit 1;
--+ ;;
--+ -h | --h*)
--+ cat <<\EOF
--+Usage: compile [--help] [--version] PROGRAM [ARGS]
--+
--+Wrapper for compilers which do not understand `-c -o'.
--+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
--+arguments, and rename the output as expected.
--+
--+If you are trying to build a whole package this is not the
--+right script to run: please start by reading the file `INSTALL'.
--+
--+Report bugs to <bug-automake@gnu.org>.
--+EOF
--+ exit $?
--+ ;;
--+ -v | --v*)
--+ echo "compile $scriptversion"
--+ exit $?
--+ ;;
--+esac
--
-- ofile=
-- cfile=
---args=
---while test $# -gt 0; do
--- case "$1" in
--- -o)
--- # configure might choose to run compile as `compile cc -o foo foo.c'.
--- # So we do something ugly here.
--- ofile=$2
--- shift
--- case "$ofile" in
--- *.o | *.obj)
--- ;;
--- *)
--- args="$args -o $ofile"
--- ofile=
--- ;;
--- esac
--- ;;
--- *.c)
--- cfile=$1
--- args="$args $1"
--- ;;
--- *)
--- args="$args $1"
--- ;;
--- esac
--- shift
--+eat=
--+
--+for arg
--+do
--+ if test -n "$eat"; then
--+ eat=
--+ else
--+ case $1 in
--+ -o)
--+ # configure might choose to run compile as `compile cc -o foo foo.c'.
--+ # So we strip `-o arg' only if arg is an object.
--+ eat=1
--+ case $2 in
--+ *.o | *.obj)
--+ ofile=$2
--+ ;;
--+ *)
--+ set x "$@" -o "$2"
--+ shift
--+ ;;
--+ esac
--+ ;;
--+ *.c)
--+ cfile=$1
--+ set x "$@" "$1"
--+ shift
--+ ;;
--+ *)
--+ set x "$@" "$1"
--+ shift
--+ ;;
--+ esac
--+ fi
--+ shift
-- done
--
-- if test -z "$ofile" || test -z "$cfile"; then
--- # If no `-o' option was seen then we might have been invoked from a
--- # pattern rule where we don't need one. That is ok -- this is a
--- # normal compilation that the losing compiler can handle. If no
--- # `.c' file was seen then we are probably linking. That is also
--- # ok.
--- exec "$prog" $args
--+ # If no `-o' option was seen then we might have been invoked from a
--+ # pattern rule where we don't need one. That is ok -- this is a
--+ # normal compilation that the losing compiler can handle. If no
--+ # `.c' file was seen then we are probably linking. That is also
--+ # ok.
--+ exec "$@"
-- fi
--
-- # Name of file we expect compiler to create.
---cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
--+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
--
-- # Create the lock directory.
-- # Note: use `[/.-]' here to ensure that we don't use the same name
-- # that we are using for the .o file. Also, base the name on the expected
-- # object file name, since that is what matters with a parallel build.
---lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
--+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-- while true; do
--- if mkdir $lockdir > /dev/null 2>&1; then
--- break
--- fi
--- sleep 1
--+ if mkdir "$lockdir" >/dev/null 2>&1; then
--+ break
--+ fi
--+ sleep 1
-- done
-- # FIXME: race condition here if user kills between mkdir and trap.
---trap "rmdir $lockdir; exit 1" 1 2 15
--+trap "rmdir '$lockdir'; exit 1" 1 2 15
--
-- # Run the compile.
---"$prog" $args
---status=$?
--+"$@"
--+ret=$?
--
-- if test -f "$cofile"; then
--- mv "$cofile" "$ofile"
--+ mv "$cofile" "$ofile"
--+elif test -f "${cofile}bj"; then
--+ mv "${cofile}bj" "$ofile"
-- fi
--
---rmdir $lockdir
---exit $status
--+rmdir "$lockdir"
--+exit $ret
--+
--+# Local Variables:
--+# mode: shell-script
--+# sh-indentation: 2
--+# eval: (add-hook 'write-file-hooks 'time-stamp)
--+# time-stamp-start: "scriptversion="
--+# time-stamp-format: "%:y-%02m-%02d.%02H"
--+# time-stamp-end: "$"
--+# End:
--diff -Nrua a/admin/depcomp b/admin/depcomp
----- a/admin/depcomp 2003-04-16 23:53:18.000000000 +0200
--+++ b/admin/depcomp 2005-02-26 06:17:26.733681321 +0100
--@@ -1,7 +1,9 @@
-- #! /bin/sh
---
-- # depcomp - compile a program generating dependencies as side-effects
---# Copyright 1999, 2000 Free Software Foundation, Inc.
--+
--+scriptversion=2005-02-09.22
--+
--+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
--
-- # This program is free software; you can redistribute it and/or modify
-- # it under the terms of the GNU General Public License as published by
--@@ -25,13 +27,45 @@
--
-- # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
--
--+case $1 in
--+ '')
--+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
--+ exit 1;
--+ ;;
--+ -h | --h*)
--+ cat <<\EOF
--+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
--+
--+Run PROGRAMS ARGS to compile a file, generating dependencies
--+as side-effects.
--+
--+Environment variables:
--+ depmode Dependency tracking mode.
--+ source Source file read by `PROGRAMS ARGS'.
--+ object Object file output by `PROGRAMS ARGS'.
--+ DEPDIR directory where to store dependencies.
--+ depfile Dependency file to output.
--+ tmpdepfile Temporary file to use when outputing dependencies.
--+ libtool Whether libtool is used (yes/no).
--+
--+Report bugs to <bug-automake@gnu.org>.
--+EOF
--+ exit $?
--+ ;;
--+ -v | --v*)
--+ echo "depcomp $scriptversion"
--+ exit $?
--+ ;;
--+esac
--+
-- if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-- echo "depcomp: Variables source, object and depmode must be set" 1>&2
-- exit 1
-- fi
---# `libtool' can also be set to `yes' or `no'.
--
---depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
--+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
--+depfile=${depfile-`echo "$object" |
--+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-- tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
--
-- rm -f "$tmpdepfile"
--@@ -163,19 +197,25 @@
--
-- aix)
-- # The C for AIX Compiler uses -M and outputs the dependencies
--- # in a .u file. This file always lives in the current directory.
--- # Also, the AIX compiler puts `$object:' at the start of each line;
--- # $object doesn't have directory information.
--- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
--+ # in a .u file. In older versions, this file always lives in the
--+ # current directory. Also, the AIX compiler puts `$object:' at the
--+ # start of each line; $object doesn't have directory information.
--+ # Version 6 uses the directory in both cases.
--+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-- tmpdepfile="$stripped.u"
--- outname="$stripped.o"
-- if test "$libtool" = yes; then
-- "$@" -Wc,-M
-- else
-- "$@" -M
-- fi
---
-- stat=$?
--+
--+ if test -f "$tmpdepfile"; then :
--+ else
--+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
--+ tmpdepfile="$stripped.u"
--+ fi
--+
-- if test $stat -eq 0; then :
-- else
-- rm -f "$tmpdepfile"
--@@ -183,6 +223,7 @@
-- fi
--
-- if test -f "$tmpdepfile"; then
--+ outname="$stripped.o"
-- # Each line is of the form `foo.o: dependent.h'.
-- # Do two passes, one to just change these to
-- # `$object: dependent.h' and one to simply `dependent.h:'.
--@@ -198,11 +239,9 @@
-- ;;
--
-- icc)
--- # Must come before tru64.
---
--- # Intel's C compiler understands `-MD -MF file'. However
--+ # Intel's C compiler understands `-MD -MF file'. However on
-- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
--- # will fill foo.d with something like
--+ # ICC 7.0 will fill foo.d with something like
-- # foo.o: sub/foo.c
-- # foo.o: sub/foo.h
-- # which is wrong. We want:
--@@ -210,6 +249,12 @@
-- # sub/foo.o: sub/foo.h
-- # sub/foo.c:
-- # sub/foo.h:
--+ # ICC 7.1 will output
--+ # foo.o: sub/foo.c sub/foo.h
--+ # and will wrap long lines using \ :
--+ # foo.o: sub/foo.c ... \
--+ # sub/foo.h ... \
--+ # ...
--
-- "$@" -MD -MF "$tmpdepfile"
-- stat=$?
--@@ -219,45 +264,70 @@
-- exit $stat
-- fi
-- rm -f "$depfile"
--- # Each line is of the form `foo.o: dependent.h'.
--+ # Each line is of the form `foo.o: dependent.h',
--+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-- # Do two passes, one to just change these to
-- # `$object: dependent.h' and one to simply `dependent.h:'.
--- sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
--- sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
--+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
--+ # Some versions of the HPUX 10.20 sed can't process this invocation
--+ # correctly. Breaking it into two sed invocations is a workaround.
--+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
--+ sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
-- tru64)
--- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
--+ # The Tru64 compiler uses -MD to generate dependencies as a side
-- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
--- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
--+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-- # dependencies in `foo.d' instead, so we check for that too.
-- # Subdirectories are respected.
--+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
--+ test "x$dir" = "x$object" && dir=
--+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
--
--- tmpdepfile1="$object.d"
--- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
-- if test "$libtool" = yes; then
--+ # With Tru64 cc, shared objects can also be used to make a
--+ # static library. This mecanism is used in libtool 1.4 series to
--+ # handle both shared and static libraries in a single compilation.
--+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
--+ #
--+ # With libtool 1.5 this exception was removed, and libtool now
--+ # generates 2 separate objects for the 2 libraries. These two
--+ # compilations output dependencies in in $dir.libs/$base.o.d and
--+ # in $dir$base.o.d. We have to check for both files, because
--+ # one of the two compilations can be disabled. We should prefer
--+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
--+ # automatically cleaned when .libs/ is deleted, while ignoring
--+ # the former would cause a distcleancheck panic.
--+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
--+ tmpdepfile2=$dir$base.o.d # libtool 1.5
--+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
--+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
-- "$@" -Wc,-MD
-- else
--+ tmpdepfile1=$dir$base.o.d
--+ tmpdepfile2=$dir$base.d
--+ tmpdepfile3=$dir$base.d
--+ tmpdepfile4=$dir$base.d
-- "$@" -MD
-- fi
--
-- stat=$?
-- if test $stat -eq 0; then :
-- else
--- rm -f "$tmpdepfile1" "$tmpdepfile2"
--+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-- exit $stat
-- fi
--
--- if test -f "$tmpdepfile1"; then
--- tmpdepfile="$tmpdepfile1"
--- else
--- tmpdepfile="$tmpdepfile2"
--- fi
--+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
--+ do
--+ test -f "$tmpdepfile" && break
--+ done
-- if test -f "$tmpdepfile"; then
-- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
--- # That's a space and a tab in the [].
--- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
--+ # That's a tab and a space in the [].
--+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-- else
-- echo "#dummy" > "$depfile"
-- fi
--@@ -270,34 +340,42 @@
--
-- dashmstdout)
-- # Important note: in order to support this mode, a compiler *must*
--- # always write the proprocessed file to stdout, regardless of -o,
--- # because we must use -o when running libtool.
--- test -z "$dashmflag" && dashmflag=-M
--- ( IFS=" "
--- case " $* " in
--- *" --mode=compile "*) # this is libtool, let us make it quiet
--- for arg
--- do # cycle over the arguments
--- case "$arg" in
--- "--mode=compile")
--- # insert --quiet before "--mode=compile"
--- set fnord "$@" --quiet
--- shift # fnord
--- ;;
--- esac
--- set fnord "$@" "$arg"
--- shift # fnord
--- shift # "$arg"
--- done
--+ # always write the preprocessed file to stdout, regardless of -o.
--+ "$@" || exit $?
--+
--+ # Remove the call to Libtool.
--+ if test "$libtool" = yes; then
--+ while test $1 != '--mode=compile'; do
--+ shift
--+ done
--+ shift
--+ fi
--+
--+ # Remove `-o $object'.
--+ IFS=" "
--+ for arg
--+ do
--+ case $arg in
--+ -o)
--+ shift
--+ ;;
--+ $object)
--+ shift
--+ ;;
--+ *)
--+ set fnord "$@" "$arg"
--+ shift # fnord
--+ shift # $arg
-- ;;
-- esac
--- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
--- ) &
--- proc=$!
--- "$@"
--- stat=$?
--- wait "$proc"
--- if test "$stat" != 0; then exit $stat; fi
--+ done
--+
--+ test -z "$dashmflag" && dashmflag=-M
--+ # Require at least two characters before searching for `:'
--+ # in the target name. This is to cope with DOS-style filenames:
--+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
--+ "$@" $dashmflag |
--+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
-- rm -f "$depfile"
-- cat < "$tmpdepfile" > "$depfile"
-- tr ' ' '
--@@ -315,36 +393,40 @@
-- ;;
--
-- makedepend)
--- # X makedepend
--- (
--- shift
--- cleared=no
--- for arg in "$@"; do
--- case $cleared in no)
--- set ""; shift
--- cleared=yes
--- esac
--- case "$arg" in
--- -D*|-I*)
--- set fnord "$@" "$arg"; shift;;
--- -*)
--- ;;
--- *)
--- set fnord "$@" "$arg"; shift;;
--- esac
--+ "$@" || exit $?
--+ # Remove any Libtool call
--+ if test "$libtool" = yes; then
--+ while test $1 != '--mode=compile'; do
--+ shift
-- done
--- obj_suffix="`echo $object | sed 's/^.*\././'`"
--- touch "$tmpdepfile"
--- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
--- ) &
--- proc=$!
--- "$@"
--- stat=$?
--- wait "$proc"
--- if test "$stat" != 0; then exit $stat; fi
--+ shift
--+ fi
--+ # X makedepend
--+ shift
--+ cleared=no
--+ for arg in "$@"; do
--+ case $cleared in
--+ no)
--+ set ""; shift
--+ cleared=yes ;;
--+ esac
--+ case "$arg" in
--+ -D*|-I*)
--+ set fnord "$@" "$arg"; shift ;;
--+ # Strip any option that makedepend may not understand. Remove
--+ # the object too, otherwise makedepend will parse it as a source file.
--+ -*|$object)
--+ ;;
--+ *)
--+ set fnord "$@" "$arg"; shift ;;
--+ esac
--+ done
--+ obj_suffix="`echo $object | sed 's/^.*\././'`"
--+ touch "$tmpdepfile"
--+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-- rm -f "$depfile"
-- cat < "$tmpdepfile" > "$depfile"
--- tail +3 "$tmpdepfile" | tr ' ' '
--+ sed '1,2d' "$tmpdepfile" | tr ' ' '
-- ' | \
-- ## Some versions of the HPUX 10.20 sed can't process this invocation
-- ## correctly. Breaking it into two sed invocations is a workaround.
--@@ -354,35 +436,39 @@
--
-- cpp)
-- # Important note: in order to support this mode, a compiler *must*
--- # always write the proprocessed file to stdout, regardless of -o,
--- # because we must use -o when running libtool.
--- ( IFS=" "
--- case " $* " in
--- *" --mode=compile "*)
--- for arg
--- do # cycle over the arguments
--- case $arg in
--- "--mode=compile")
--- # insert --quiet before "--mode=compile"
--- set fnord "$@" --quiet
--- shift # fnord
--- ;;
--- esac
--- set fnord "$@" "$arg"
--- shift # fnord
--- shift # "$arg"
--- done
--+ # always write the preprocessed file to stdout.
--+ "$@" || exit $?
--+
--+ # Remove the call to Libtool.
--+ if test "$libtool" = yes; then
--+ while test $1 != '--mode=compile'; do
--+ shift
--+ done
--+ shift
--+ fi
--+
--+ # Remove `-o $object'.
--+ IFS=" "
--+ for arg
--+ do
--+ case $arg in
--+ -o)
--+ shift
--+ ;;
--+ $object)
--+ shift
--+ ;;
--+ *)
--+ set fnord "$@" "$arg"
--+ shift # fnord
--+ shift # $arg
-- ;;
-- esac
--- "$@" -E |
--+ done
--+
--+ "$@" -E |
-- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-- sed '$ s: \\$::' > "$tmpdepfile"
--- ) &
--- proc=$!
--- "$@"
--- stat=$?
--- wait "$proc"
--- if test "$stat" != 0; then exit $stat; fi
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- cat < "$tmpdepfile" >> "$depfile"
--@@ -392,34 +478,27 @@
--
-- msvisualcpp)
-- # Important note: in order to support this mode, a compiler *must*
--- # always write the proprocessed file to stdout, regardless of -o,
--+ # always write the preprocessed file to stdout, regardless of -o,
-- # because we must use -o when running libtool.
--- ( IFS=" "
--- case " $* " in
--- *" --mode=compile "*)
--- for arg
--- do # cycle over the arguments
--- case $arg in
--- "--mode=compile")
--- # insert --quiet before "--mode=compile"
--- set fnord "$@" --quiet
--- shift # fnord
--- ;;
--- esac
--+ "$@" || exit $?
--+ IFS=" "
--+ for arg
--+ do
--+ case "$arg" in
--+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
--+ set fnord "$@"
--+ shift
--+ shift
--+ ;;
--+ *)
-- set fnord "$@" "$arg"
--- shift # fnord
--- shift # "$arg"
--- done
--- ;;
--+ shift
--+ shift
--+ ;;
-- esac
--- "$@" -E |
--- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
--- ) &
--- proc=$!
--- "$@"
--- stat=$?
--- wait "$proc"
--- if test "$stat" != 0; then exit $stat; fi
--+ done
--+ "$@" -E |
--+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
--@@ -439,3 +518,12 @@
-- esac
--
-- exit 0
--+
--+# Local Variables:
--+# mode: shell-script
--+# sh-indentation: 2
--+# eval: (add-hook 'write-file-hooks 'time-stamp)
--+# time-stamp-start: "scriptversion="
--+# time-stamp-format: "%:y-%02m-%02d.%02H"
--+# time-stamp-end: "$"
--+# End:
--diff -Nrua a/admin/install-sh b/admin/install-sh
----- a/admin/install-sh 2003-08-07 11:41:31.000000000 +0200
--+++ b/admin/install-sh 2005-02-26 06:17:26.757677124 +0100
--@@ -1,19 +1,38 @@
-- #!/bin/sh
---#
-- # install - install a program, script, or datafile
---# This comes from X11R5 (mit/util/scripts/install.sh).
--+
--+scriptversion=2005-02-02.21
--+
--+# This originates from X11R5 (mit/util/scripts/install.sh), which was
--+# later released in X11R6 (xc/config/util/install.sh) with the
--+# following copyright and license.
--+#
--+# Copyright (C) 1994 X Consortium
--+#
--+# Permission is hereby granted, free of charge, to any person obtaining a copy
--+# of this software and associated documentation files (the "Software"), to
--+# deal in the Software without restriction, including without limitation the
--+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
--+# sell copies of the Software, and to permit persons to whom the Software is
--+# furnished to do so, subject to the following conditions:
--+#
--+# The above copyright notice and this permission notice shall be included in
--+# all copies or substantial portions of the Software.
-- #
---# Copyright 1991 by the Massachusetts Institute of Technology
--+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
--+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
--+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-- #
---# Permission to use, copy, modify, distribute, and sell this software and its
---# documentation for any purpose is hereby granted without fee, provided that
---# the above copyright notice appear in all copies and that both that
---# copyright notice and this permission notice appear in supporting
---# documentation, and that the name of M.I.T. not be used in advertising or
---# publicity pertaining to distribution of the software without specific,
---# written prior permission. M.I.T. makes no representations about the
---# suitability of this software for any purpose. It is provided "as is"
---# without express or implied warranty.
--+# Except as contained in this notice, the name of the X Consortium shall not
--+# be used in advertising or otherwise to promote the sale, use or other deal-
--+# ings in this Software without prior written authorization from the X Consor-
--+# tium.
--+#
--+#
--+# FSF changes to this file are in the public domain.
-- #
-- # Calling this script install-sh is preferred over install.sh, to prevent
-- # `make' implicit rules from creating a file called install from it
--@@ -23,13 +42,11 @@
-- # from scratch. It can only install one file at a time, a restriction
-- # shared with many OS's install programs.
--
---
-- # set DOITPROG to echo to test this script
--
-- # Don't use :- since 4.3BSD and earlier shells don't like it.
-- doit="${DOITPROG-}"
--
---
-- # put in absolute paths if you don't have them in your path; or use env. vars.
--
-- mvprog="${MVPROG-mv}"
--@@ -41,236 +58,266 @@
-- rmprog="${RMPROG-rm}"
-- mkdirprog="${MKDIRPROG-mkdir}"
--
---transformbasename=""
---transform_arg=""
---instcmd="$mvprog"
-- chmodcmd="$chmodprog 0755"
---chowncmd=""
---chgrpcmd=""
---stripcmd=""
--+chowncmd=
--+chgrpcmd=
--+stripcmd=
-- rmcmd="$rmprog -f"
-- mvcmd="$mvprog"
---src=""
---dst=""
---dir_arg=""
---
---while [ x"$1" != x ]; do
--- case $1 in
--- -c) instcmd=$cpprog
--- shift
--- continue;;
---
--- -d) dir_arg=true
--- shift
--- continue;;
---
--- -m) chmodcmd="$chmodprog $2"
--- shift
--- shift
--- continue;;
---
--- -o) chowncmd="$chownprog $2"
--- shift
--- shift
--- continue;;
---
--- -g) chgrpcmd="$chgrpprog $2"
--- shift
--- shift
--- continue;;
---
--- -s) stripcmd=$stripprog
--- shift
--- continue;;
---
--- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
--- shift
--- continue;;
---
--- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--- shift
--- continue;;
---
--- *) if [ x"$src" = x ]
--- then
--- src=$1
--- else
--- # this colon is to work around a 386BSD /bin/sh bug
--- :
--- dst=$1
--- fi
--- shift
--- continue;;
--- esac
---done
--+src=
--+dst=
--+dir_arg=
--+dstarg=
--+no_target_directory=
--+
--+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
--+ or: $0 [OPTION]... SRCFILES... DIRECTORY
--+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
--+ or: $0 [OPTION]... -d DIRECTORIES...
--+
--+In the 1st form, copy SRCFILE to DSTFILE.
--+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
--+In the 4th, create DIRECTORIES.
--+
--+Options:
--+-c (ignored)
--+-d create directories instead of installing files.
--+-g GROUP $chgrpprog installed files to GROUP.
--+-m MODE $chmodprog installed files to MODE.
--+-o USER $chownprog installed files to USER.
--+-s $stripprog installed files.
--+-t DIRECTORY install into DIRECTORY.
--+-T report an error if DSTFILE is a directory.
--+--help display this help and exit.
--+--version display version info and exit.
--+
--+Environment variables override the default commands:
--+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
--+"
--+
--+while test -n "$1"; do
--+ case $1 in
--+ -c) shift
--+ continue;;
--+
--+ -d) dir_arg=true
--+ shift
--+ continue;;
--+
--+ -g) chgrpcmd="$chgrpprog $2"
--+ shift
--+ shift
--+ continue;;
--+
--+ --help) echo "$usage"; exit $?;;
--+
--+ -m) chmodcmd="$chmodprog $2"
--+ shift
--+ shift
--+ continue;;
--+
--+ -o) chowncmd="$chownprog $2"
--+ shift
--+ shift
--+ continue;;
--+
--+ -s) stripcmd=$stripprog
--+ shift
--+ continue;;
--
---if [ x"$src" = x ]
---then
--- echo "$0: no input file specified" >&2
--- exit 1
---else
--- :
---fi
---
---if [ x"$dir_arg" != x ]; then
--- dst=$src
--- src=""
---
--- if [ -d "$dst" ]; then
--- instcmd=:
--- chmodcmd=""
--- else
--- instcmd=$mkdirprog
--- fi
---else
---
---# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
---# might cause directories to be created, which would be especially bad
---# if $src (and thus $dsttmp) contains '*'.
---
--- if [ -f "$src" ] || [ -d "$src" ]
--- then
--- :
--- else
--- echo "$0: $src does not exist" >&2
--- exit 1
--- fi
---
--- if [ x"$dst" = x ]
--- then
--- echo "$0: no destination specified" >&2
--- exit 1
--- else
--- :
--- fi
---
---# If destination is a directory, append the input filename; if your system
---# does not like double slashes in filenames, you may need to add some logic
---
--- if [ -d "$dst" ]
--- then
--- dst=$dst/`basename "$src"`
--- else
--- :
--- fi
---fi
---
---## this sed command emulates the dirname command
---dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
---
---# Make sure that the destination directory exists.
---# this part is taken from Noah Friedman's mkinstalldirs script
---
---# Skip lots of stat calls in the usual case.
---if [ ! -d "$dstdir" ]; then
---defaultIFS='
--- '
---IFS="${IFS-$defaultIFS}"
---
---oIFS=$IFS
---# Some sh's can't handle IFS=/ for some reason.
---IFS='%'
---set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
---IFS=$oIFS
---
---pathcomp=''
--+ -t) dstarg=$2
--+ shift
--+ shift
--+ continue;;
--
---while [ $# -ne 0 ] ; do
--- pathcomp=$pathcomp$1
--+ -T) no_target_directory=true
-- shift
--+ continue;;
--
--- if [ ! -d "$pathcomp" ] ;
--- then
--- $mkdirprog "$pathcomp"
--- else
--- :
--- fi
--+ --version) echo "$0 $scriptversion"; exit $?;;
--
--- pathcomp=$pathcomp/
--+ *) # When -d is used, all remaining arguments are directories to create.
--+ # When -t is used, the destination is already specified.
--+ test -n "$dir_arg$dstarg" && break
--+ # Otherwise, the last argument is the destination. Remove it from $@.
--+ for arg
--+ do
--+ if test -n "$dstarg"; then
--+ # $@ is not empty: it contains at least $arg.
--+ set fnord "$@" "$dstarg"
--+ shift # fnord
--+ fi
--+ shift # arg
--+ dstarg=$arg
--+ done
--+ break;;
--+ esac
-- done
---fi
---
---if [ x"$dir_arg" != x ]
---then
--- $doit $instcmd "$dst" &&
--
--- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
--- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
--- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
--- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
---else
---
---# If we're going to rename the final executable, determine the name now.
---
--- if [ x"$transformarg" = x ]
--- then
--- dstfile=`basename "$dst"`
--- else
--- dstfile=`basename "$dst" $transformbasename |
--- sed $transformarg`$transformbasename
--- fi
---
---# don't allow the sed command to completely eliminate the filename
---
--- if [ x"$dstfile" = x ]
--- then
--- dstfile=`basename "$dst"`
--- else
--- :
--- fi
---
---# Make a couple of temp file names in the proper directory.
---
--- dsttmp=$dstdir/#inst.$$#
--- rmtmp=$dstdir/#rm.$$#
---
---# Trap to clean up temp files at exit.
---
--- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
--- trap '(exit $?); exit' 1 2 13 15
---
---# Move or copy the file name to the temp name
---
--- $doit $instcmd "$src" "$dsttmp" &&
---
---# and set any options; do chmod last to preserve setuid bits
---
---# If any of these fail, we abort the whole thing. If we want to
---# ignore errors from any of these, just make sure not to ignore
---# errors from the above "$doit $instcmd $src $dsttmp" command.
---
--- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
--- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
--- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
--- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
---
---# Now remove or move aside any old file at destination location. We try this
---# two ways since rm can't unlink itself on some systems and the destination
---# file might be busy for other reasons. In this case, the final cleanup
---# might fail but the new file should still install successfully.
---
---{
--- if [ -f "$dstdir/$dstfile" ]
--- then
--- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
--- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
--- {
--- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
--- (exit 1); exit
--- }
--- else
--- :
--- fi
---} &&
---
---# Now rename the file to the real destination.
--+if test -z "$1"; then
--+ if test -z "$dir_arg"; then
--+ echo "$0: no input file specified." >&2
--+ exit 1
--+ fi
--+ # It's OK to call `install-sh -d' without argument.
--+ # This can happen when creating conditional directories.
--+ exit 0
--+fi
--
--- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
--+for src
--+do
--+ # Protect names starting with `-'.
--+ case $src in
--+ -*) src=./$src ;;
--+ esac
--+
--+ if test -n "$dir_arg"; then
--+ dst=$src
--+ src=
--+
--+ if test -d "$dst"; then
--+ mkdircmd=:
--+ chmodcmd=
--+ else
--+ mkdircmd=$mkdirprog
--+ fi
--+ else
--+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
--+ # might cause directories to be created, which would be especially bad
--+ # if $src (and thus $dsttmp) contains '*'.
--+ if test ! -f "$src" && test ! -d "$src"; then
--+ echo "$0: $src does not exist." >&2
--+ exit 1
--+ fi
--+
--+ if test -z "$dstarg"; then
--+ echo "$0: no destination specified." >&2
--+ exit 1
--+ fi
--+
--+ dst=$dstarg
--+ # Protect names starting with `-'.
--+ case $dst in
--+ -*) dst=./$dst ;;
--+ esac
--
---fi &&
--+ # If destination is a directory, append the input filename; won't work
--+ # if double slashes aren't ignored.
--+ if test -d "$dst"; then
--+ if test -n "$no_target_directory"; then
--+ echo "$0: $dstarg: Is a directory" >&2
--+ exit 1
--+ fi
--+ dst=$dst/`basename "$src"`
--+ fi
--+ fi
--+
--+ # This sed command emulates the dirname command.
--+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
--+
--+ # Make sure that the destination directory exists.
--+
--+ # Skip lots of stat calls in the usual case.
--+ if test ! -d "$dstdir"; then
--+ defaultIFS='
--+ '
--+ IFS="${IFS-$defaultIFS}"
--+
--+ oIFS=$IFS
--+ # Some sh's can't handle IFS=/ for some reason.
--+ IFS='%'
--+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
--+ shift
--+ IFS=$oIFS
--+
--+ pathcomp=
--+
--+ while test $# -ne 0 ; do
--+ pathcomp=$pathcomp$1
--+ shift
--+ if test ! -d "$pathcomp"; then
--+ $mkdirprog "$pathcomp"
--+ # mkdir can fail with a `File exist' error in case several
--+ # install-sh are creating the directory concurrently. This
--+ # is OK.
--+ test -d "$pathcomp" || exit
--+ fi
--+ pathcomp=$pathcomp/
--+ done
--+ fi
--+
--+ if test -n "$dir_arg"; then
--+ $doit $mkdircmd "$dst" \
--+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
--+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
--+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
--+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
--+
--+ else
--+ dstfile=`basename "$dst"`
--+
--+ # Make a couple of temp file names in the proper directory.
--+ dsttmp=$dstdir/_inst.$$_
--+ rmtmp=$dstdir/_rm.$$_
--+
--+ # Trap to clean up those temp files at exit.
--+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
--+ trap '(exit $?); exit' 1 2 13 15
--+
--+ # Copy the file name to the temp name.
--+ $doit $cpprog "$src" "$dsttmp" &&
--+
--+ # and set any options; do chmod last to preserve setuid bits.
--+ #
--+ # If any of these fail, we abort the whole thing. If we want to
--+ # ignore errors from any of these, just make sure not to ignore
--+ # errors from the above "$doit $cpprog $src $dsttmp" command.
--+ #
--+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
--+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
--+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
--+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
--+
--+ # Now rename the file to the real destination.
--+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
--+ || {
--+ # The rename failed, perhaps because mv can't rename something else
--+ # to itself, or perhaps because mv is so ancient that it does not
--+ # support -f.
--+
--+ # Now remove or move aside any old file at destination location.
--+ # We try this two ways since rm can't unlink itself on some
--+ # systems and the destination file might be busy for other
--+ # reasons. In this case, the final cleanup might fail but the new
--+ # file should still install successfully.
--+ {
--+ if test -f "$dstdir/$dstfile"; then
--+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
--+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
--+ || {
--+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
--+ (exit 1); exit 1
--+ }
--+ else
--+ :
--+ fi
--+ } &&
--+
--+ # Now rename the file to the real destination.
--+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
--+ }
--+ }
--+ fi || { (exit 1); exit 1; }
--+done
--
-- # The final little trick to "correctly" pass the exit status to the exit trap.
---
-- {
--- (exit 0); exit
--+ (exit 0); exit 0
-- }
--+
--+# Local variables:
--+# eval: (add-hook 'write-file-hooks 'time-stamp)
--+# time-stamp-start: "scriptversion="
--+# time-stamp-format: "%:y-%02m-%02d.%02H"
--+# time-stamp-end: "$"
--+# End:
--diff -Nrua a/admin/missing b/admin/missing
----- a/admin/missing 2002-10-26 18:44:28.000000000 +0200
--+++ b/admin/missing 2005-02-26 06:17:26.761676424 +0100
--@@ -1,6 +1,10 @@
-- #! /bin/sh
-- # Common stub for a few missing GNU programs while installing.
---# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
--+
--+scriptversion=2005-02-08.22
--+
--+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
--+# Free Software Foundation, Inc.
-- # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
--
-- # This program is free software; you can redistribute it and/or modify
--@@ -38,18 +42,24 @@
-- configure_ac=configure.in
-- fi
--
--+msg="missing on your system"
--+
-- case "$1" in
-- --run)
-- # Try to run requested program, and just exit if it succeeds.
-- run=
-- shift
-- "$@" && exit 0
--+ # Exit code 63 means version mismatch. This often happens
--+ # when the user try to use an ancient version of a tool on
--+ # a file that requires a minimum version. In this case we
--+ # we should proceed has if the program had been absent, or
--+ # if --run hadn't been passed.
--+ if test $? = 63; then
--+ run=:
--+ msg="probably too old"
--+ fi
-- ;;
---esac
---
---# If it does not exist, or fails to run (possibly an outdated version),
---# try to emulate it.
---case "$1" in
--
-- -h|--h|--he|--hel|--help)
-- echo "\
--@@ -74,11 +84,15 @@
-- lex create \`lex.yy.c', if possible, from existing .c
-- makeinfo touch the output file
-- tar try tar, gnutar, gtar, then tar without non-portable flags
--- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
--+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
--+
--+Send bug reports to <bug-automake@gnu.org>."
--+ exit $?
-- ;;
--
-- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
--- echo "missing 0.4 - GNU automake"
--+ echo "missing $scriptversion (GNU Automake)"
--+ exit $?
-- ;;
--
-- -*)
--@@ -87,14 +101,44 @@
-- exit 1
-- ;;
--
--- aclocal*)
--+esac
--+
--+# Now exit if we have it, but it failed. Also exit now if we
--+# don't have it and --version was passed (most likely to detect
--+# the program).
--+case "$1" in
--+ lex|yacc)
--+ # Not GNU programs, they don't have --version.
--+ ;;
--+
--+ tar)
--+ if test -n "$run"; then
--+ echo 1>&2 "ERROR: \`tar' requires --run"
--+ exit 1
--+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
--+ exit 1
--+ fi
--+ ;;
--+
--+ *)
-- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-- # We have it, but it failed.
-- exit 1
--+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
--+ # Could not run --version or --help. This is probably someone
--+ # running `$TOOL --version' or `$TOOL --help' to check whether
--+ # $TOOL exists and not knowing $TOOL uses missing.
--+ exit 1
-- fi
--+ ;;
--+esac
--
--+# If it does not exist, or fails to run (possibly an outdated version),
--+# try to emulate it.
--+case "$1" in
--+ aclocal*)
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' is $msg. You should only need it if
-- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
-- to install the \`Automake' and \`Perl' packages. Grab them from
-- any GNU archive site."
--@@ -102,13 +146,8 @@
-- ;;
--
-- autoconf)
--- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--- # We have it, but it failed.
--- exit 1
--- fi
---
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' is $msg. You should only need it if
-- you modified \`${configure_ac}'. You might want to install the
-- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
-- archive site."
--@@ -116,13 +155,8 @@
-- ;;
--
-- autoheader)
--- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--- # We have it, but it failed.
--- exit 1
--- fi
---
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' is $msg. You should only need it if
-- you modified \`acconfig.h' or \`${configure_ac}'. You might want
-- to install the \`Autoconf' and \`GNU m4' packages. Grab them
-- from any GNU archive site."
--@@ -140,13 +174,8 @@
-- ;;
--
-- automake*)
--- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--- # We have it, but it failed.
--- exit 1
--- fi
---
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' is $msg. You should only need it if
-- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-- You might want to install the \`Automake' and \`Perl' packages.
-- Grab them from any GNU archive site."
--@@ -156,16 +185,11 @@
-- ;;
--
-- autom4te)
--- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--- # We have it, but it failed.
--- exit 1
--- fi
---
-- echo 1>&2 "\
---WARNING: \`$1' is needed, and you do not seem to have it handy on your
--- system. You might have modified some files without having the
--+WARNING: \`$1' is needed, but is $msg.
--+ You might have modified some files without having the
-- proper tools for further handling them.
--- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
--+ You can get \`$1' as part of \`Autoconf' from any GNU
-- archive site."
--
-- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
--@@ -185,7 +209,7 @@
--
-- bison|yacc)
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' $msg. You should only need it if
-- you modified a \`.y' file. You may need the \`Bison' package
-- in order for those modifications to take effect. You can get
-- \`Bison' from any GNU archive site."
--@@ -215,7 +239,7 @@
--
-- lex|flex)
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' is $msg. You should only need it if
-- you modified a \`.l' file. You may need the \`Flex' package
-- in order for those modifications to take effect. You can get
-- \`Flex' from any GNU archive site."
--@@ -237,13 +261,8 @@
-- ;;
--
-- help2man)
--- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
--- # We have it, but it failed.
--- exit 1
--- fi
---
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' is $msg. You should only need it if
-- you modified a dependency of a manual page. You may need the
-- \`Help2man' package in order for those modifications to take
-- effect. You can get \`Help2man' from any GNU archive site."
--@@ -262,32 +281,27 @@
-- ;;
--
-- makeinfo)
--- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
--- # We have makeinfo, but it failed.
--- exit 1
--- fi
---
-- echo 1>&2 "\
---WARNING: \`$1' is missing on your system. You should only need it if
--+WARNING: \`$1' is $msg. You should only need it if
-- you modified a \`.texi' or \`.texinfo' file, or any other file
-- indirectly affecting the aspect of the manual. The spurious
-- call might also be the consequence of using a buggy \`make' (AIX,
-- DU, IRIX). You might want to install the \`Texinfo' package or
-- the \`GNU make' package. Grab either from any GNU archive site."
--+ # The file to touch is that specified with -o ...
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-- if test -z "$file"; then
--- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
--+ # ... or it is the one specified with @setfilename ...
--+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
--+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
--+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-- fi
-- touch $file
-- ;;
--
-- tar)
-- shift
--- if test -n "$run"; then
--- echo 1>&2 "ERROR: \`tar' requires --run"
--- exit 1
--- fi
--
-- # We have already tried tar in the generic part.
-- # Look for gnutar/gtar before invocation to avoid ugly error
--@@ -323,10 +337,10 @@
--
-- *)
-- echo 1>&2 "\
---WARNING: \`$1' is needed, and you do not seem to have it handy on your
--- system. You might have modified some files without having the
--+WARNING: \`$1' is needed, and is $msg.
--+ You might have modified some files without having the
-- proper tools for further handling them. Check the \`README' file,
--- it often tells you about the needed prerequirements for installing
--+ it often tells you about the needed prerequisites for installing
-- this package. You may also peek at any GNU archive site, in case
-- some other package would contain this missing \`$1' program."
-- exit 1
--@@ -334,3 +348,10 @@
-- esac
--
-- exit 0
--+
--+# Local variables:
--+# eval: (add-hook 'write-file-hooks 'time-stamp)
--+# time-stamp-start: "scriptversion="
--+# time-stamp-format: "%:y-%02m-%02d.%02H"
--+# time-stamp-end: "$"
--+# End:
--diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
----- a/admin/mkinstalldirs 2002-10-26 18:53:16.000000000 +0200
--+++ b/admin/mkinstalldirs 2005-02-26 06:17:26.766675550 +0100
--@@ -1,21 +1,33 @@
-- #! /bin/sh
-- # mkinstalldirs --- make directory hierarchy
---# Author: Noah Friedman <friedman@prep.ai.mit.edu>
--+
--+scriptversion=2005-02-02.21
--+
--+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-- # Created: 1993-05-16
---# Public domain
--+# Public domain.
--+#
--+# This file is maintained in Automake, please report
--+# bugs to <bug-automake@gnu.org> or send patches to
--+# <automake-patches@gnu.org>.
--
-- errstatus=0
-- dirmode=""
--
-- usage="\
---Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
--+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
--+
--+Create each directory DIR (with mode MODE, if specified), including all
--+leading file name components.
--+
--+Report bugs to <bug-automake@gnu.org>."
--
-- # process command line arguments
-- while test $# -gt 0 ; do
-- case $1 in
-- -h | --help | --h*) # -h for help
--- echo "$usage" 1>&2
--- exit 0
--+ echo "$usage"
--+ exit $?
-- ;;
-- -m) # -m PERM arg
-- shift
--@@ -23,6 +35,10 @@
-- dirmode=$1
-- shift
-- ;;
--+ --version)
--+ echo "$0 $scriptversion"
--+ exit $?
--+ ;;
-- --) # stop option processing
-- shift
-- break
--@@ -50,17 +66,37 @@
-- 0) exit 0 ;;
-- esac
--
--+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
--+# mkdir -p a/c at the same time, both will detect that a is missing,
--+# one will create a, then the other will try to create a and die with
--+# a "File exists" error. This is a problem when calling mkinstalldirs
--+# from a parallel make. We use --version in the probe to restrict
--+# ourselves to GNU mkdir, which is thread-safe.
-- case $dirmode in
-- '')
--- if mkdir -p -- . 2>/dev/null; then
--+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- echo "mkdir -p -- $*"
-- exec mkdir -p -- "$@"
--+ else
--+ # On NextStep and OpenStep, the `mkdir' command does not
--+ # recognize any option. It will interpret all options as
--+ # directories to create, and then abort because `.' already
--+ # exists.
--+ test -d ./-p && rmdir ./-p
--+ test -d ./--version && rmdir ./--version
-- fi
-- ;;
-- *)
--- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
--+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
--+ test ! -d ./--version; then
-- echo "mkdir -m $dirmode -p -- $*"
-- exec mkdir -m "$dirmode" -p -- "$@"
--+ else
--+ # Clean up after NextStep and OpenStep mkdir.
--+ for d in ./-m ./-p ./--version "./$dirmode";
--+ do
--+ test -d $d && rmdir $d
--+ done
-- fi
-- ;;
-- esac
--@@ -84,17 +120,17 @@
-- mkdir "$pathcomp" || lasterr=$?
--
-- if test ! -d "$pathcomp"; then
--- errstatus=$lasterr
--+ errstatus=$lasterr
-- else
--- if test ! -z "$dirmode"; then
--+ if test ! -z "$dirmode"; then
-- echo "chmod $dirmode $pathcomp"
--- lasterr=""
--- chmod "$dirmode" "$pathcomp" || lasterr=$?
--+ lasterr=""
--+ chmod "$dirmode" "$pathcomp" || lasterr=$?
--
--- if test ! -z "$lasterr"; then
--- errstatus=$lasterr
--- fi
--- fi
--+ if test ! -z "$lasterr"; then
--+ errstatus=$lasterr
--+ fi
--+ fi
-- fi
-- fi
--
--@@ -107,5 +143,8 @@
-- # Local Variables:
-- # mode: shell-script
-- # sh-indentation: 2
--+# eval: (add-hook 'write-file-hooks 'time-stamp)
--+# time-stamp-start: "scriptversion="
--+# time-stamp-format: "%:y-%02m-%02d.%02H"
--+# time-stamp-end: "$"
-- # End:
---# mkinstalldirs ends here
--diff -Nrua a/admin/ylwrap b/admin/ylwrap
----- a/admin/ylwrap 2001-10-05 02:46:36.000000000 +0200
--+++ b/admin/ylwrap 2005-02-26 06:17:26.777673626 +0100
--@@ -1,6 +1,11 @@
-- #! /bin/sh
-- # ylwrap - wrapper for lex/yacc invocations.
---# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
--+
--+scriptversion=2005-02-02.22
--+
--+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
--+# Free Software Foundation, Inc.
--+#
-- # Written by Tom Tromey <tromey@cygnus.com>.
-- #
-- # This program is free software; you can redistribute it and/or modify
--@@ -22,44 +27,65 @@
-- # configuration script generated by Autoconf, you may include it under
-- # the same distribution terms that you use for the rest of that program.
--
---# Usage:
---# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
---# * INPUT is the input file
---# * OUTPUT is file PROG generates
---# * DESIRED is file we actually want
---# * PROGRAM is program to run
---# * ARGS are passed to PROG
---# Any number of OUTPUT,DESIRED pairs may be used.
--+# This file is maintained in Automake, please report
--+# bugs to <bug-automake@gnu.org> or send patches to
--+# <automake-patches@gnu.org>.
--+
--+case "$1" in
--+ '')
--+ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
--+ exit 1
--+ ;;
--+ --basedir)
--+ basedir=$2
--+ shift 2
--+ ;;
--+ -h|--h*)
--+ cat <<\EOF
--+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
--+
--+Wrapper for lex/yacc invocations, renaming files as desired.
--+
--+ INPUT is the input file
--+ OUTPUT is one file PROG generates
--+ DESIRED is the file we actually want instead of OUTPUT
--+ PROGRAM is program to run
--+ ARGS are passed to PROG
--+
--+Any number of OUTPUT,DESIRED pairs may be used.
--+
--+Report bugs to <bug-automake@gnu.org>.
--+EOF
--+ exit $?
--+ ;;
--+ -v|--v*)
--+ echo "ylwrap $scriptversion"
--+ exit $?
--+ ;;
--+esac
--+
--
-- # The input.
-- input="$1"
-- shift
-- case "$input" in
--- [\\/]* | ?:[\\/]*)
--+ [\\/]* | ?:[\\/]*)
-- # Absolute path; do nothing.
-- ;;
--- *)
--+ *)
-- # Relative path. Make it absolute.
-- input="`pwd`/$input"
-- ;;
-- esac
--
---# The directory holding the input.
---input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
---# Quote $INPUT_DIR so we can use it in a regexp.
---# FIXME: really we should care about more than `.' and `\'.
---input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
---
---echo "got $input_rx"
---
-- pairlist=
-- while test "$#" -ne 0; do
--- if test "$1" = "--"; then
--- shift
--- break
--- fi
--- pairlist="$pairlist $1"
--- shift
--+ if test "$1" = "--"; then
--+ shift
--+ break
--+ fi
--+ pairlist="$pairlist $1"
--+ shift
-- done
--
-- # The program to run.
--@@ -67,8 +93,8 @@
-- shift
-- # Make any relative path in $prog absolute.
-- case "$prog" in
--- [\\/]* | ?:[\\/]*) ;;
--- *[\\/]*) prog="`pwd`/$prog" ;;
--+ [\\/]* | ?:[\\/]*) ;;
--+ *[\\/]*) prog="`pwd`/$prog" ;;
-- esac
--
-- # FIXME: add hostname here for parallel makes that run commands on
--@@ -79,65 +105,118 @@
--
-- cd $dirname
--
---$prog ${1+"$@"} "$input"
---status=$?
--+case $# in
--+ 0) $prog "$input" ;;
--+ *) $prog "$@" "$input" ;;
--+esac
--+ret=$?
--
---if test $status -eq 0; then
--- set X $pairlist
--- shift
--- first=yes
--- # Since DOS filename conventions don't allow two dots,
--- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
--- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
--- y_tab_nodot="no"
--- if test -f y_tab.c || test -f y_tab.h; then
--- y_tab_nodot="yes"
--- fi
---
--- while test "$#" -ne 0; do
--- from="$1"
--- # Handle y_tab.c and y_tab.h output by DOS
--- if test $y_tab_nodot = "yes"; then
--- if test $from = "y.tab.c"; then
--- from="y_tab.c"
--- else
--- if test $from = "y.tab.h"; then
--- from="y_tab.h"
--- fi
--- fi
--- fi
--- if test -f "$from"; then
--- # If $2 is an absolute path name, then just use that,
--- # otherwise prepend `../'.
--- case "$2" in
--- [\\/]* | ?:[\\/]*) target="$2";;
--- *) target="../$2";;
--- esac
---
--- # Edit out `#line' or `#' directives. We don't want the
--- # resulting debug information to point at an absolute srcdir;
--- # it is better for it to just mention the .y file with no
--- # path.
--- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
--+if test $ret -eq 0; then
--+ set X $pairlist
--+ shift
--+ first=yes
--+ # Since DOS filename conventions don't allow two dots,
--+ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
--+ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
--+ y_tab_nodot="no"
--+ if test -f y_tab.c || test -f y_tab.h; then
--+ y_tab_nodot="yes"
--+ fi
--+
--+ # The directory holding the input.
--+ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
--+ # Quote $INPUT_DIR so we can use it in a regexp.
--+ # FIXME: really we should care about more than `.' and `\'.
--+ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
--+
--+ while test "$#" -ne 0; do
--+ from="$1"
--+ # Handle y_tab.c and y_tab.h output by DOS
--+ if test $y_tab_nodot = "yes"; then
--+ if test $from = "y.tab.c"; then
--+ from="y_tab.c"
-- else
--- # A missing file is only an error for the first file. This
--- # is a blatant hack to let us support using "yacc -d". If -d
--- # is not specified, we don't want an error when the header
--- # file is "missing".
--- if test $first = yes; then
--- status=1
--- fi
--+ if test $from = "y.tab.h"; then
--+ from="y_tab.h"
--+ fi
-- fi
--- shift
--- shift
--- first=no
--- done
--+ fi
--+ if test -f "$from"; then
--+ # If $2 is an absolute path name, then just use that,
--+ # otherwise prepend `../'.
--+ case "$2" in
--+ [\\/]* | ?:[\\/]*) target="$2";;
--+ *) target="../$2";;
--+ esac
--+
--+ # We do not want to overwrite a header file if it hasn't
--+ # changed. This avoid useless recompilations. However the
--+ # parser itself (the first file) should always be updated,
--+ # because it is the destination of the .y.c rule in the
--+ # Makefile. Divert the output of all other files to a temporary
--+ # file so we can compare them to existing versions.
--+ if test $first = no; then
--+ realtarget="$target"
--+ target="tmp-`echo $target | sed s/.*[\\/]//g`"
--+ fi
--+ # Edit out `#line' or `#' directives.
--+ #
--+ # We don't want the resulting debug information to point at
--+ # an absolute srcdir; it is better for it to just mention the
--+ # .y file with no path.
--+ #
--+ # We want to use the real output file name, not yy.lex.c for
--+ # instance.
--+ #
--+ # We want the include guards to be adjusted too.
--+ FROM=`echo "$from" | sed \
--+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
--+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
--+ TARGET=`echo "$2" | sed \
--+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
--+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
--+
--+ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
--+ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
--+
--+ # Check whether header files must be updated.
--+ if test $first = no; then
--+ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
--+ echo "$2" is unchanged
--+ rm -f "$target"
--+ else
--+ echo updating "$2"
--+ mv -f "$target" "$realtarget"
--+ fi
--+ fi
--+ else
--+ # A missing file is only an error for the first file. This
--+ # is a blatant hack to let us support using "yacc -d". If -d
--+ # is not specified, we don't want an error when the header
--+ # file is "missing".
--+ if test $first = yes; then
--+ ret=1
--+ fi
--+ fi
--+ shift
--+ shift
--+ first=no
--+ done
-- else
--- status=$?
--+ ret=$?
-- fi
--
-- # Remove the directory.
-- cd ..
-- rm -rf $dirname
--
---exit $status
--+exit $ret
--+
--+# Local Variables:
--+# mode: shell-script
--+# sh-indentation: 2
--+# eval: (add-hook 'write-file-hooks 'time-stamp)
--+# time-stamp-start: "scriptversion="
--+# time-stamp-format: "%:y-%02m-%02d.%02H"
--+# time-stamp-end: "$"
--+# End:
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/03_libtool_update.diff kdeadmin-3.4.0/debian/patches/common/03_libtool_update.diff
---- kdeadmin-3.4.0.orig/debian/patches/common/03_libtool_update.diff 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/03_libtool_update.diff 1970-01-01 01:00:00.000000000 +0100
-@@ -1,3753 +0,0 @@
--diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
----- a/admin/libtool.m4.in 2005-02-03 11:19:06.000000000 +0100
--+++ b/admin/libtool.m4.in 2005-02-26 06:17:26.591706156 +0100
--@@ -23,6 +23,7 @@
-- ## the same distribution terms that you use for the rest of that program.
--
-- # serial 47 AC_PROG_LIBTOOL
--+# Debian $Rev: 214 $
--
--
-- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--@@ -82,7 +83,7 @@
-- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--
-- # Always use our own libtool.
---LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
--+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-- AC_SUBST(LIBTOOL)dnl
--
-- # Prevent multiple expansion
--@@ -496,12 +497,11 @@
-- if AC_TRY_EVAL(ac_compile); then
-- case "`/usr/bin/file conftest.o`" in
-- *32-bit*)
--- LINUX_64_MODE="32"
-- case $host in
-- x86_64-*linux*)
-- LD="${LD-ld} -m elf_i386"
-- ;;
--- ppc64-*linux*)
--+ ppc64-*linux*|powerpc64-*linux*)
-- LD="${LD-ld} -m elf32ppclinux"
-- ;;
-- s390x-*linux*)
--@@ -513,7 +513,6 @@
-- esac
-- ;;
-- *64-bit*)
--- LINUX_64_MODE="64"
-- case $host in
-- x86_64-*linux*)
-- LD="${LD-ld} -m elf_x86_64"
--@@ -643,7 +642,7 @@
-- AC_MSG_CHECKING([the maximum length of command line arguments])
-- AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-- i=0
--- testring="ABCD"
--+ teststring="ABCD"
--
-- case $build_os in
-- msdosdjgpp*)
--@@ -672,20 +671,26 @@
-- lt_cv_sys_max_cmd_len=8192;
-- ;;
--
--+ amigaos*)
--+ # On AmigaOS with pdksh, this test takes hours, literally.
--+ # So we just punt and use a minimum line length of 8192.
--+ lt_cv_sys_max_cmd_len=8192;
--+ ;;
--+
-- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
--- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
--- = "XX$testring") >/dev/null 2>&1 &&
--- new_result=`expr "X$testring" : ".*" 2>&1` &&
--+ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
--+ = "XX$teststring") >/dev/null 2>&1 &&
--+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
--- testring=$testring$testring
--+ teststring=$teststring$teststring
-- done
--- testring=
--+ teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
--@@ -835,7 +840,7 @@
-- lt_cv_dlopen_self=yes
-- ])
-- ;;
---
--+
-- *)
-- AC_CHECK_FUNC([shl_load],
-- [lt_cv_dlopen="shl_load"],
--@@ -924,13 +929,6 @@
-- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--- # 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 parallel
--- # builds.
--- chmod -w .
---
-- lt_compiler_flag="-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.
--@@ -954,8 +952,11 @@
-- fi
-- fi
-- chmod u+w .
--- $rm conftest* out/*
--- rmdir out
--+ $rm conftest*
--+ # SGI C++ compiler will create directory out/ii_files/ for
--+ # template instantiation
--+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
--+ $rm out/* && rmdir out
-- cd ..
-- rmdir conftest
-- $rm conftest*
--@@ -1072,7 +1073,7 @@
-- *)
-- AC_MSG_RESULT([no])
-- ;;
--- esac
--+ esac
-- fi
-- ])# AC_LIBTOOL_SYS_LIB_STRIP
--
--@@ -1085,7 +1086,7 @@
-- library_names_spec=
-- libname_spec='lib$name'
-- soname_spec=
---shrext=".so"
--+shrext_cmds=".so"
-- postinstall_cmds=
-- postuninstall_cmds=
-- finish_cmds=
--@@ -1095,7 +1096,20 @@
-- version_type=none
-- dynamic_linker="$host_os ld.so"
-- sys_lib_dlsearch_path_spec="/lib /usr/lib"
---sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--+if test "$GCC" = yes; then
--+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
--+ # if the path contains ";" then we assume it to be the separator
--+ # otherwise default to the standard path separator (i.e. ":") - it is
--+ # assumed that no part of a normal pathname contains ";" but that should
--+ # okay in the real world where ";" in dirpaths is itself problematic.
--+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--+ else
--+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
--+ fi
--+else
--+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--+fi
-- need_lib_prefix=unknown
-- hardcode_into_libs=no
--
--@@ -1160,7 +1174,7 @@
-- amigaos*)
-- library_names_spec='$libname.ixlibrary $libname.a'
-- # Create ${libname}_ixlibrary.a entries in /sys/libs.
--- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
--+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-- ;;
--
-- beos*)
--@@ -1185,7 +1199,7 @@
--
-- cygwin* | mingw* | pw32*)
-- version_type=windows
--- shrext=".dll"
--+ shrext_cmds=".dll"
-- need_version=no
-- need_lib_prefix=no
--
--@@ -1250,7 +1264,7 @@
-- soname_spec='${libname}${release}${major}$shared_ext'
-- shlibpath_overrides_runpath=yes
-- shlibpath_var=DYLD_LIBRARY_PATH
--- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
--+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--@@ -1273,7 +1287,7 @@
-- dynamic_linker=no
-- ;;
--
---freebsd*-gnu*)
--+kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
--@@ -1333,7 +1347,7 @@
-- need_version=no
-- case "$host_cpu" in
-- ia64*)
--- shrext='.so'
--+ shrext_cmds='.so'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.so"
-- shlibpath_var=LD_LIBRARY_PATH
--@@ -1348,7 +1362,7 @@
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- hppa*64*)
--- shrext='.sl'
--+ shrext_cmds='.sl'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
--@@ -1359,7 +1373,7 @@
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-- ;;
-- *)
--- shrext='.sl'
--+ shrext_cmds='.sl'
-- dynamic_linker="$host_os dld.sl"
-- shlibpath_var=SHLIB_PATH
-- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--@@ -1421,22 +1435,19 @@
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--- libsuff=
--- if test "x$LINUX_64_MODE" = x64; then
--- # Some platforms are per default 64-bit, so there's no /lib64
--- if test -d /lib64; then
--- libsuff=64
--- fi
--- fi
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
--- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
--- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-- # This implies no fast_install, which is unacceptable.
-- # Some rework will be needed to allow for fast_install
-- # before this can be enabled.
-- hardcode_into_libs=yes
--
--+ # Append ld.so.conf contents to the search path
--+ if test -f /etc/ld.so.conf; then
--+ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
--+ 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
-- # powerpc, because MkLinux only supported shared libraries with the
-- # GNU dynamic linker. Since this was broken with cross compilers,
--@@ -1446,6 +1457,30 @@
-- 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'
--+ ;;
--+
--+knetbsd*-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='GNU ld.so'
--+ ;;
--+
-- netbsd*)
-- version_type=sunos
-- need_lib_prefix=no
--@@ -1455,7 +1490,7 @@
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- dynamic_linker='NetBSD (a.out) ld.so'
-- else
--- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
--+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- dynamic_linker='NetBSD ld.elf_so'
-- fi
--@@ -1484,7 +1519,7 @@
-- openbsd*)
-- version_type=sunos
-- need_lib_prefix=no
--- need_version=no
--+ need_version=yes
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
--@@ -1504,7 +1539,7 @@
--
-- os2*)
-- libname_spec='$name'
--- shrext=".dll"
--+ shrext_cmds=".dll"
-- need_lib_prefix=no
-- library_names_spec='$libname${shared_ext} $libname.a'
-- dynamic_linker='OS/2 ld.exe'
--@@ -2095,31 +2130,23 @@
-- ;;
--
-- cygwin*)
--- lt_cv_deplibs_check_method=pass_all
--+ # func_win32_libid is a shell function defined in ltmain.sh
--+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--+ lt_cv_file_magic_cmd='func_win32_libid'
-- ;;
---
--+
-- mingw* | pw32*)
--- # win32_libid is a shell function defined in ltmain.sh
--- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--- lt_cv_file_magic_cmd='win32_libid'
--+ # Base MSYS/MinGW do not provide the 'file' command needed by
--+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
--+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-- ;;
--
-- darwin* | rhapsody*)
--- # this will be overwritten by pass_all, but leave it in just in case
--- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
--- lt_cv_file_magic_cmd='/usr/bin/file -L'
--- case "$host_os" in
--- rhapsody* | darwin1.[[012]])
--- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
--- ;;
--- *) # Darwin 1.3 on
--- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
--- ;;
--- esac
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
---freebsd*)
--+freebsd* | kfreebsd*-gnu)
-- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- case $host_cpu in
-- i*86 )
--@@ -2158,42 +2185,21 @@
-- ;;
--
-- irix5* | irix6* | nonstopux*)
--- case $host_os in
--- irix5* | nonstopux*)
--- # this will be overridden with pass_all, but let us keep it just in case
--- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
--- ;;
--- *)
--- case $LD in
--- *-32|*"-32 ") libmagic=32-bit;;
--- *-n32|*"-n32 ") libmagic=N32;;
--- *-64|*"-64 ") libmagic=64-bit;;
--- *) libmagic=never-match;;
--- esac
--- # this will be overridden with pass_all, but let us keep it just in case
--- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
--- ;;
--+ case $LD in
--+ *-32|*"-32 ") libmagic=32-bit;;
--+ *-n32|*"-n32 ") libmagic=N32;;
--+ *-64|*"-64 ") libmagic=64-bit;;
--+ *) libmagic=never-match;;
-- esac
--- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
-- # This must be Linux ELF.
-- linux*)
--- case $host_cpu in
--- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
--- lt_cv_deplibs_check_method=pass_all ;;
--- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
--- arm* )
--- lt_cv_deplibs_check_method=pass_all ;;
--- *)
--- # glibc up to 2.1.1 does not perform some relocations on ARM
--- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
--- esac
--- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
--+ lt_cv_deplibs_check_method=pass_all
-- ;;
--
---netbsd*)
--+netbsd* | netbsdelf*-gnu | knetbsd*-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
--@@ -2222,9 +2228,6 @@
-- ;;
--
-- osf3* | osf4* | osf5*)
--- # this will be overridden with pass_all, but let us keep it just in case
--- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
--- lt_cv_file_magic_test_file=/shlib/libc.so
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--@@ -2234,7 +2237,6 @@
--
-- solaris*)
-- lt_cv_deplibs_check_method=pass_all
--- lt_cv_file_magic_test_file=/lib/libc.so
-- ;;
--
-- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--@@ -2500,7 +2502,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 build 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_shlib, $1)[[ ]]" >/dev/null; then :
-- else
-- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
--@@ -2550,7 +2552,7 @@
-- fi
-- ;;
--
---aix4*)
--+aix4* | aix5*)
-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-- test "$enable_shared" = yes && enable_static=no
-- fi
--@@ -2560,29 +2562,29 @@
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case "$host_os" in
-- rhapsody* | darwin1.[[012]])
--- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-- else
--- case ${MACOSX_DEPLOYMENT_TARGET} in
--- 10.[012])
--- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--- ;;
--- 10.*)
--- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
--- ;;
--- esac
--+ case ${MACOSX_DEPLOYMENT_TARGET} in
--+ 10.[[012]])
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--+ ;;
--+ 10.*)
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--+ ;;
--+ esac
-- fi
-- ;;
-- esac
-- output_verbose_link_cmd='echo'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
--- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--@@ -2590,8 +2592,8 @@
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
--- fi
--- ;;
--+ fi
--+ ;;
-- esac
-- AC_MSG_RESULT([$enable_shared])
--
--@@ -2699,8 +2701,8 @@
-- # Check if GNU C++ uses GNU ld as the underlying linker, since the
-- # archiving commands below assume that GNU ld is being used.
-- if test "$with_gnu_ld" = yes; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--@@ -2726,7 +2728,7 @@
-- # linker, instead of GNU ld. If possible, this setting should
-- # overridden to take advantage of the native linker features on
-- # the platform it is being used on.
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- fi
--
-- # Commands to make compiler produce verbose output that lists
--@@ -2756,8 +2758,22 @@
-- exp_sym_flag='-Bexport'
-- no_entry_flag=""
-- else
--- # KDE requires run time linking. Make it the default.
--- aix_use_runtimelinking=yes
--+ aix_use_runtimelinking=no
--+
--+ # Test if we are trying to use run time linking or normal
--+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--+ # need to do runtime linking.
--+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
--+ for ld_flag in $LDFLAGS; do
--+ case $ld_flag in
--+ *-brtl*)
--+ aix_use_runtimelinking=yes
--+ break
--+ ;;
--+ esac
--+ done
--+ esac
--+
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
--@@ -2803,15 +2819,16 @@
-- shared_flag='-G'
-- else
-- if test "$aix_use_runtimelinking" = yes; then
--- shared_flag='-qmkshrobj ${wl}-G'
--+ shared_flag='${wl}-G'
-- else
--- shared_flag='-qmkshrobj'
--+ shared_flag='${wl}-bM:SRE'
-- fi
-- fi
-- fi
--
--- # Let the compiler handle the export list.
--- _LT_AC_TAGVAR(always_export_symbols, $1)=no
--+ # It seems that -bexpall does not export symbols beginning with
--+ # underscore (_), so it is better to generate a list of symbols to export.
--+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-- if test "$aix_use_runtimelinking" = yes; then
-- # Warning - without using the other runtime loading flags (-brtl),
-- # -berok will link without error, but may produce a broken library.
--@@ -2820,13 +2837,12 @@
-- _LT_AC_SYS_LIBPATH_AIX
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--
--- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-- else
-- if test "$host_cpu" = ia64; then
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-- else
-- # Determine the default libpath from the value encoded in an empty executable.
-- _LT_AC_SYS_LIBPATH_AIX
--@@ -2841,7 +2857,7 @@
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-- fi
-- fi
-- ;;
--@@ -2858,12 +2874,12 @@
-- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-- # as there is no search path for DLLs.
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- _LT_AC_TAGVAR(always_export_symbols, $1)=no
-- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--@@ -2872,7 +2888,7 @@
-- echo EXPORTS > $output_objdir/$soname.def;
-- cat $export_symbols >> $output_objdir/$soname.def;
-- fi~
--- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
--@@ -2883,20 +2899,20 @@
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case "$host_os" in
-- rhapsody* | darwin1.[[012]])
--- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-- ;;
-- *) # Darwin 1.3 on
-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-- else
--- case ${MACOSX_DEPLOYMENT_TARGET} in
--- 10.[012])
--- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--- ;;
--- 10.*)
--- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
--- ;;
--- esac
--+ case ${MACOSX_DEPLOYMENT_TARGET} in
--+ 10.[[012]])
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--+ ;;
--+ 10.*)
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--+ ;;
--+ esac
-- fi
-- ;;
-- esac
--@@ -2906,19 +2922,19 @@
-- lt_int_apple_cc_single_mod=yes
-- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
--- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
--- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--@@ -2953,7 +2969,7 @@
-- freebsd-elf*)
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- ;;
--- freebsd*)
--+ freebsd* | kfreebsd*-gnu)
-- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-- # conventions
-- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
--@@ -2975,7 +2991,7 @@
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-- aCC)
--- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
--@@ -2984,11 +3000,11 @@
-- # explicitly linking system object files so we need to strip them
-- # from the output so that they don't get included in the library
-- # dependencies.
--- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-- ;;
-- *)
-- if test "$GXX" = yes; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- else
-- # FIXME: insert proper C++ library support
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
--@@ -3045,7 +3061,7 @@
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-- ;;
-- *)
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-- ;;
-- esac
-- # Commands to make compiler produce verbose output that lists
--@@ -3066,7 +3082,7 @@
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-- ;;
-- *)
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-- ;;
-- esac
-- fi
--@@ -3081,7 +3097,7 @@
-- case $cc_basename in
-- CC)
-- # SGI C++
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--
-- # Archives containing C++ object files must be created using
-- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
--@@ -3092,9 +3108,9 @@
-- *)
-- if test "$GXX" = yes; then
-- if test "$with_gnu_ld" = no; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-- else
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-- fi
-- fi
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--@@ -3111,8 +3127,8 @@
-- # KCC will only create a shared library if the output file
-- # ends with ".so" (or ".sl" for HP-UX), so rename the library
-- # to its proper name (with version) after linking.
--- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
--@@ -3134,16 +3150,16 @@
-- # Intel C++
-- with_gnu_ld=yes
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-- ;;
-- cxx)
-- # Compaq C++
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--
-- runpath_var=LD_RUN_PATH
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--@@ -3181,7 +3197,7 @@
-- ;;
-- esac
-- ;;
--- netbsd*)
--+ netbsd* | netbsdelf*-gnu | knetbsd*-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=
--@@ -3200,7 +3216,7 @@
-- # KCC will only create a shared library if the output file
-- # ends with ".so" (or ".sl" for HP-UX), so rename the library
-- # to its proper name (with version) after linking.
--- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--@@ -3217,7 +3233,7 @@
-- ;;
-- cxx)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--@@ -3235,7 +3251,7 @@
-- *)
-- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--@@ -3260,7 +3276,7 @@
-- # KCC will only create a shared library if the output file
-- # ends with ".so" (or ".sl" for HP-UX), so rename the library
-- # to its proper name (with version) after linking.
--- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--@@ -3276,10 +3292,10 @@
-- ;;
-- cxx)
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-- echo "-hidden">> $lib.exp~
--- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
--+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-- $rm $lib.exp'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--@@ -3298,7 +3314,7 @@
-- *)
-- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--@@ -3355,9 +3371,9 @@
-- CC)
-- # Sun C++ 4.2, 5.x and Centerline C++
-- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
--+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--@@ -3391,7 +3407,7 @@
-- ;;
-- gcx)
-- # Green Hills C++ Compiler
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--
-- # The C++ compiler must be used to create the archive.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
--@@ -3401,9 +3417,9 @@
-- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-- if $CC --version | grep -v '^2\.7' > /dev/null; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
--+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
--@@ -3412,9 +3428,9 @@
-- else
-- # g++ 2.7 appears to require `-G' NOT `-shared' on this
-- # platform.
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
--+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
--@@ -3582,7 +3598,7 @@
-- fi
-- ;;
--
--- *.$objext|*.$libext)
--+ *.$objext)
-- # This assumes that the test object file only shows up
-- # once in the compiler output.
-- if test "$p" = "conftest.$objext"; then
--@@ -3691,7 +3707,7 @@
-- postinstall_cmds='$RANLIB $lib'
-- fi
-- ;;
---aix4*)
--+aix4* | aix5*)
-- test "$enable_shared" = yes && enable_static=no
-- ;;
-- esac
--@@ -3833,11 +3849,12 @@
-- # without removal of \ escapes.
-- if test -n "${ZSH_VERSION+set}" ; then
-- setopt NO_GLOB_SUBST
--- fi
--+ 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.
--- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
--+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
--+ SED SHELL STRIP \
-- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-- deplibs_check_method reload_flag reload_cmds need_locks \
--@@ -3887,7 +3904,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) | \
--+ _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 | \
--@@ -4018,7 +4035,7 @@
-- NM=$lt_NM
--
-- # A symbol stripping program
---STRIP=$STRIP
--+STRIP=$lt_STRIP
--
-- # Used to examine libraries when file_magic_cmd begins "file"
-- MAGIC_CMD=$MAGIC_CMD
--@@ -4049,7 +4066,7 @@
-- libext="$libext"
--
-- # Shared library suffix (normally ".so").
---shrext='$shrext'
--+shrext_cmds='$shrext_cmds'
--
-- # Executable file suffix (normally "").
-- exeext="$exeext"
--@@ -4293,7 +4310,10 @@
-- # If there is no Makefile yet, we rely on a make rule to execute
-- # `config.status --recheck' to rerun these tests and create the
-- # libtool script then.
--- test -f Makefile && make "$ltmain"
--+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--+ if test -f "$ltmain_in"; then
--+ test -f Makefile && make "$ltmain"
--+ fi
-- fi
-- ])# AC_LIBTOOL_CONFIG
--
--@@ -4366,7 +4386,7 @@
-- symcode='[[BCDEGQRST]]'
-- ;;
-- solaris* | sysv5*)
--- symcode='[[BDT]]'
--+ symcode='[[BDRT]]'
-- ;;
-- sysv4)
-- symcode='[[DFNSTU]]'
--@@ -4384,7 +4404,7 @@
-- # If we're using GNU nm, then use its standard symbol codes.
-- case `$NM -V 2>&1` in
-- *GNU* | *'with BFD'*)
--- symcode='[[ABCDGISTW]]' ;;
--+ symcode='[[ABCDGIRSTW]]' ;;
-- esac
--
-- # Try without a prefix undercore, then with it.
--@@ -4599,7 +4619,7 @@
-- ;;
-- esac
-- ;;
--- freebsd*)
--+ freebsd* | kfreebsd*-gnu)
-- # FreeBSD uses GNU C++
-- ;;
-- hpux9* | hpux10* | hpux11*)
--@@ -4650,7 +4670,7 @@
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--- ;;
--+ ;;
-- cxx)
-- # Compaq C++
-- # Make sure the PIC flag is empty. It appears that all Alpha
--@@ -4675,7 +4695,7 @@
-- ;;
-- esac
-- ;;
--- netbsd*)
--+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-- ;;
-- osf3* | osf4* | osf5*)
-- case $cc_basename in
--@@ -4986,6 +5006,9 @@
-- cygwin* | mingw*)
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-- ;;
--+ linux*)
--+ _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'
-- ;;
--@@ -5010,7 +5033,7 @@
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-- _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-- _LT_AC_TAGVAR(module_cmds, $1)=
--- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
--+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-- _LT_AC_TAGVAR(always_export_symbols, $1)=no
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-- # include_expsyms should be a list of space-separated symbols to be *always*
--@@ -5084,7 +5107,7 @@
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-- # support --undefined. This deserves some investigation. FIXME
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
--@@ -5094,13 +5117,13 @@
-- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-- # as there is no search path for DLLs.
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- _LT_AC_TAGVAR(always_export_symbols, $1)=no
-- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
--
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--@@ -5109,19 +5132,19 @@
-- echo EXPORTS > $output_objdir/$soname.def;
-- cat $export_symbols >> $output_objdir/$soname.def;
-- fi~
--- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-- else
-- ld_shlibs=no
-- fi
-- ;;
--
--- netbsd*)
--+ netbsd* | netbsdelf*-gnu | knetbsd*-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=
-- else
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- fi
-- ;;
--
--@@ -5139,8 +5162,8 @@
--
-- EOF
-- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
--@@ -5153,10 +5176,36 @@
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
--
--+ linux*)
--+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
--+ supports_anon_versioning=no
--+ case `$LD -v 2>/dev/null` in
--+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
--+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
--+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
--+ *\ 2.11.*) ;; # other 2.11 versions
--+ *) supports_anon_versioning=yes ;;
--+ esac
--+ if test $supports_anon_versioning = yes; then
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
--+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--+$echo "local: *; };" >> $output_objdir/$libname.ver~
--+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--+ else
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
--+ fi
--+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
--+ else
--+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
--+ fi
--+ ;;
--+
-- *)
-- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
--@@ -5206,9 +5255,20 @@
-- else
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-- fi
--+ aix_use_runtimelinking=no
--+
--+ # Test if we are trying to use run time linking or normal
--+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--+ # need to do runtime linking.
--+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
--+ for ld_flag in $LDFLAGS; do
--+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
--+ aix_use_runtimelinking=yes
--+ break
--+ fi
--+ done
--+ esac
--
--- # KDE requires run time linking. Make it the default.
--- aix_use_runtimelinking=yes
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
--@@ -5254,29 +5314,29 @@
-- shared_flag='-G'
-- else
-- if test "$aix_use_runtimelinking" = yes; then
--- shared_flag='-qmkshrobj ${wl}-G'
--+ shared_flag='${wl}-G'
-- else
--- shared_flag='-qmkshrobj'
--+ shared_flag='${wl}-bM:SRE'
-- fi
-- fi
-- fi
--
--- # Let the compiler handle the export list.
--- _LT_AC_TAGVAR(always_export_symbols, $1)=no
--+ # It seems that -bexpall does not export symbols beginning with
--+ # underscore (_), so it is better to generate a list of symbols to export.
--+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-- if test "$aix_use_runtimelinking" = yes; then
-- # Warning - without using the other runtime loading flags (-brtl),
-- # -berok will link without error, but may produce a broken library.
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-- # Determine the default libpath from the value encoded in an empty executable.
--- _LT_AC_SYS_LIBPATH_AIX
--- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--+ _LT_AC_SYS_LIBPATH_AIX
--+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-- else
-- if test "$host_cpu" = ia64; then
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-- else
-- # Determine the default libpath from the value encoded in an empty executable.
-- _LT_AC_SYS_LIBPATH_AIX
--@@ -5291,7 +5351,7 @@
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-- # This is similar to how AIX traditionally builds it's shared libraries.
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-- fi
-- fi
-- ;;
--@@ -5314,13 +5374,13 @@
-- # hardcode_libdir_flag_spec is actually meaningless, as there is
-- # no search path for DLLs.
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
--- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-- # Tell ltmain to make .lib files, not .a files.
-- libext=lib
-- # Tell ltmain to make .dll files, not .so files.
--- shrext=".dll"
--+ shrext_cmds=".dll"
-- # FIXME: Setting linknames here is a bad hack.
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-- # The linker will automatically build a .lib file if we build a DLL.
-- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-- # FIXME: Should let the user specify the lib program.
--@@ -5334,21 +5394,21 @@
-- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-- case "$host_os" in
-- rhapsody* | darwin1.[[012]])
--- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-- ;;
-- *) # Darwin 1.3 on
--- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--- else
--- case ${MACOSX_DEPLOYMENT_TARGET} in
--- 10.[012])
--- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--- ;;
--- 10.*)
--- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
--- ;;
--- esac
--- fi
--+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--+ else
--+ case ${MACOSX_DEPLOYMENT_TARGET} in
--+ 10.[[012]])
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
--+ ;;
--+ 10.*)
--+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
--+ ;;
--+ esac
--+ fi
-- ;;
-- esac
-- lt_int_apple_cc_single_mod=no
--@@ -5357,26 +5417,26 @@
-- lt_int_apple_cc_single_mod=yes
-- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- else
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-- fi
--- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
--- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
--- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--- else
--+ else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
--- fi
--+ fi
-- ;;
--
-- dgux*)
--@@ -5409,8 +5469,8 @@
-- ;;
--
-- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--- freebsd*)
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
--+ freebsd* | kfreebsd*-gnu)
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--@@ -5418,7 +5478,7 @@
--
-- hpux9*)
-- if test "$GCC" = yes; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-- fi
--@@ -5436,10 +5496,10 @@
-- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-- case "$host_cpu" in
-- hppa*64*|ia64*)
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- ;;
-- *)
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-- ;;
-- esac
-- else
--@@ -5486,7 +5546,7 @@
--
-- irix5* | irix6* | nonstopux*)
-- if test "$GCC" = yes; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--@@ -5496,7 +5556,7 @@
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- ;;
--
--- netbsd*)
--+ netbsd* | netbsdelf*-gnu | knetbsd*-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
--@@ -5519,7 +5579,7 @@
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- else
--@@ -5529,7 +5589,7 @@
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- ;;
-- *)
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- ;;
-- esac
--@@ -5540,14 +5600,14 @@
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-- ;;
--
-- osf3*)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--@@ -5559,7 +5619,7 @@
-- osf4* | osf5*) # as osf3* with the addition of -msym flag
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- else
-- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--@@ -5584,9 +5644,9 @@
-- solaris*)
-- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-- if test "$GCC" = yes; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
--+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--@@ -5606,7 +5666,7 @@
-- if test "x$host_vendor" = xsequent; then
-- # Use $CC to link under sequent, because it throws in some extra .o
-- # files that make .init and .fini sections work.
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-- fi
--@@ -5666,9 +5726,9 @@
-- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
-- if test "$GCC" = yes; then
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
--- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- fi
-- runpath_var='LD_RUN_PATH'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--@@ -5726,7 +5786,7 @@
-- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
---
--+
-- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-- soname=conftest
-- lib=conftest
--@@ -5885,7 +5945,7 @@
-- fi
-- done
-- done
---])
-- SED=$lt_cv_path_SED
--+])
-- AC_MSG_RESULT([$SED])
-- ])
--diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
----- a/admin/ltmain.sh 2005-01-03 15:24:20.000000000 +0100
--+++ b/admin/ltmain.sh 2005-02-26 06:17:26.633698810 +0100
--@@ -1,7 +1,7 @@
-- # ltmain.sh - Provide generalized library-building support services.
-- # NOTE: Changing this file will not affect anything until you rerun configure.
-- #
---# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
--+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-- # Free Software Foundation, Inc.
-- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-- #
--@@ -24,6 +24,29 @@
-- # configuration script generated by Autoconf, you may include it under
-- # the same distribution terms that you use for the rest of that program.
--
--+basename="s,^.*/,,g"
--+
--+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
--+# is ksh but when the shell is invoked as "sh" and the current value of
--+# the _XPG environment variable is not equal to 1 (one), the special
--+# positional parameter $0, within a function call, is the name of the
--+# function.
--+progpath="$0"
--+
--+# The name of this program:
--+progname=`echo "$progpath" | $SED $basename`
--+modename="$progname"
--+
--+# Global variables:
--+EXIT_SUCCESS=0
--+EXIT_FAILURE=1
--+
--+PROGRAM=ltmain.sh
--+PACKAGE=libtool
--+VERSION=1.5.6
--+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $"
--+
--+
-- # Check that we have a working $echo.
-- if test "X$1" = X--no-reexec; then
-- # Discard the --no-reexec flag, and continue.
--@@ -36,7 +59,7 @@
-- :
-- else
-- # Restart under the correct shell, and then maybe $echo will work.
--- exec $SHELL "$0" --no-reexec ${1+"$@"}
--+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-- fi
--
-- if test "X$1" = X--fallback-echo; then
--@@ -45,19 +68,9 @@
-- cat <<EOF
-- $*
-- EOF
--- exit 0
--+ exit $EXIT_SUCCESS
-- fi
--
---# The name of this program.
---progname=`$echo "$0" | ${SED} 's%^.*/%%'`
---modename="$progname"
---
---# Constants.
---PROGRAM=ltmain.sh
---PACKAGE=libtool
---VERSION=1.5a
---TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
---
-- default_mode=
-- help="Try \`$progname --help' for more information."
-- magic="%%%MAGIC variable%%%"
--@@ -94,12 +107,13 @@
-- fi
--
-- # Make sure IFS has a sensible default
---: ${IFS=" "}
--+: ${IFS="
--+"}
--
-- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-- $echo "$modename: not configured to build any kind of library" 1>&2
-- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Global variables.
--@@ -118,10 +132,13 @@
-- # Shell function definitions:
-- # This seems to be the best place for them
--
--+# func_win32_libid arg
--+# return the library type of file 'arg'
--+#
-- # Need a lot of goo to handle *both* DLLs and import libs
-- # Has to be a shell function in order to 'eat' the argument
-- # that is supplied when $file_magic_command is called.
---win32_libid () {
--+func_win32_libid () {
-- win32_libid_type="unknown"
-- win32_fileres=`file -L $1 2>/dev/null`
-- case $win32_fileres in
--@@ -130,7 +147,7 @@
-- ;;
-- *ar\ archive*) # could be an import, or static
-- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
--- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
--+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-- win32_nmres=`eval $NM -f posix -A $1 | \
-- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-- if test "X$win32_nmres" = "Ximport" ; then
--@@ -140,7 +157,7 @@
-- fi
-- fi
-- ;;
--- *DLL*)
--+ *DLL*)
-- win32_libid_type="x86 DLL"
-- ;;
-- *executable*) # but shell scripts are "executable" too...
--@@ -154,9 +171,76 @@
-- $echo $win32_libid_type
-- }
--
--+
--+# func_infer_tag arg
--+# Infer tagged configuration to use if any are available and
--+# if one wasn't chosen via the "--tag" command line option.
--+# Only attempt this if the compiler in the base compile
--+# command doesn't match the default compiler.
--+# arg is usually of the form 'gcc ...'
--+func_infer_tag () {
--+ if test -n "$available_tags" && test -z "$tagname"; then
--+ CC_quoted=
--+ for arg in $CC; do
--+ case $arg in
--+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
--+ arg="\"$arg\""
--+ ;;
--+ esac
--+ CC_quoted="$CC_quoted $arg"
--+ done
--+ case $@ in
--+ # Blanks in the command may have been stripped by the calling shell,
--+ # but not from the CC environment variable when configure was run.
--+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
--+ # Blanks at the start of $base_compile will cause this to fail
--+ # if we don't check for them as well.
--+ *)
--+ for z in $available_tags; do
--+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
--+ # Evaluate the configuration.
--+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
--+ CC_quoted=
--+ for arg in $CC; do
--+ # Double-quote args containing other shell metacharacters.
--+ case $arg in
--+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
--+ arg="\"$arg\""
--+ ;;
--+ esac
--+ CC_quoted="$CC_quoted $arg"
--+ done
--+ case "$@ " in
--+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
--+ # The compiler in the base compile command matches
--+ # the one in the tagged configuration.
--+ # Assume this is the tagged configuration we want.
--+ tagname=$z
--+ break
--+ ;;
--+ esac
--+ fi
--+ done
--+ # If $tagname still isn't set, then no tagged configuration
--+ # was found and let the user know that the "--tag" command
--+ # line option must be used.
--+ if test -z "$tagname"; then
--+ $echo "$modename: unable to infer tagged configuration"
--+ $echo "$modename: specify a tag with \`--tag'" 1>&2
--+ exit $EXIT_FAILURE
--+# else
--+# $echo "$modename: using $tagname tagged configuration"
--+ fi
--+ ;;
--+ esac
--+ fi
--+}
-- # End of Shell function definitions
-- #####################################
--
--+# Darwin sucks
--+eval std_shrext=\"$shrext_cmds\"
--+
-- # Parse our command line options once, thoroughly.
-- while test "$#" -gt 0
-- do
--@@ -176,12 +260,13 @@
-- ;;
-- tag)
-- tagname="$arg"
--+ preserve_args="${preserve_args}=$arg"
--
-- # Check whether tagname contains only valid characters
-- case $tagname in
-- *[!-_A-Za-z0-9,/]*)
-- $echo "$progname: invalid tag name: $tagname" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
--@@ -191,10 +276,10 @@
-- # not specially marked.
-- ;;
-- *)
--- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
--+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-- taglist="$taglist $tagname"
-- # Evaluate the configuration.
--- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
--+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-- else
-- $echo "$progname: ignoring unknown tag $tagname" 1>&2
-- fi
--@@ -223,21 +308,22 @@
-- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
-- $echo "This is free software; see the source for copying conditions. There is NO"
-- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- --config)
--- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
--+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-- # Now print the configurations for the tags.
-- for tagname in $taglist; do
--- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
--+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-- done
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- --debug)
-- $echo "$progname: enabling shell trace mode"
-- set -x
--+ preserve_args="$preserve_args $arg"
-- ;;
--
-- --dry-run | -n)
--@@ -256,7 +342,7 @@
-- else
-- $echo "disable static libraries"
-- fi
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- --finish) mode="finish" ;;
--@@ -268,6 +354,7 @@
--
-- --quiet | --silent)
-- show=:
--+ preserve_args="$preserve_args $arg"
-- ;;
--
-- --tag) prevopt="--tag" prev=tag ;;
--@@ -275,6 +362,7 @@
-- set tag "$optarg" ${1+"$@"}
-- shift
-- prev=tag
--+ preserve_args="$preserve_args --tag"
-- ;;
--
-- -dlopen)
--@@ -285,7 +373,7 @@
-- -*)
-- $echo "$modename: unrecognized option \`$arg'" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
--
-- *)
--@@ -298,7 +386,7 @@
-- if test -n "$prevopt"; then
-- $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # If this variable is set in any of the actions, the command in it
--@@ -354,7 +442,7 @@
-- if test -n "$execute_dlfiles" && test "$mode" != execute; then
-- $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Change the help message to a mode-specific one.
--@@ -369,9 +457,11 @@
-- # Get the compilation command and the source file.
-- base_compile=
-- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
--+ suppress_opt=yes
-- suppress_output=
-- arg_mode=normal
-- libobj=
--+ later=
--
-- for arg
-- do
--@@ -394,24 +484,19 @@
-- -o)
-- if test -n "$libobj" ; then
-- $echo "$modename: you cannot specify \`-o' more than once" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- arg_mode=target
-- continue
-- ;;
--
--- -static)
--- build_old_libs=yes
--- continue
--- ;;
---
--- -prefer-pic)
--- pic_mode=yes
--+ -static | -prefer-pic | -prefer-non-pic)
--+ later="$later $arg"
-- continue
-- ;;
--
--- -prefer-non-pic)
--- pic_mode=no
--+ -no-suppress)
--+ suppress_opt=no
-- continue
-- ;;
--
--@@ -424,7 +509,7 @@
-- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-- lastarg=
-- save_ifs="$IFS"; IFS=','
--- for arg in $args; do
--+ for arg in $args; do
-- IFS="$save_ifs"
--
-- # Double-quote args containing other shell metacharacters.
--@@ -474,11 +559,11 @@
-- case $arg_mode in
-- arg)
-- $echo "$modename: you must specify an argument for -Xcompile"
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- target)
-- $echo "$modename: you must specify a target with \`-o'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- *)
-- # Get the name of the library object.
--@@ -511,50 +596,30 @@
-- *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-- *)
-- $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
--- # Infer tagged configuration to use if any are available and
--- # if one wasn't chosen via the "--tag" command line option.
--- # Only attempt this if the compiler in the base compile
--- # command doesn't match the default compiler.
--- if test -n "$available_tags" && test -z "$tagname"; then
--- case $base_compile in
--- # Blanks in the command may have been stripped by the calling shell,
--- # but not from the CC environment variable when configure was run.
--- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
--- # Blanks at the start of $base_compile will cause this to fail
--- # if we don't check for them as well.
--- *)
--- for z in $available_tags; do
--- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
--- # Evaluate the configuration.
--- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
--- case "$base_compile " in
--- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
--- # The compiler in the base compile command matches
--- # the one in the tagged configuration.
--- # Assume this is the tagged configuration we want.
--- tagname=$z
--- break
--- ;;
--- esac
--- fi
--- done
--- # If $tagname still isn't set, then no tagged configuration
--- # was found and let the user know that the "--tag" command
--- # line option must be used.
--- if test -z "$tagname"; then
--- $echo "$modename: unable to infer tagged configuration"
--- $echo "$modename: specify a tag with \`--tag'" 1>&2
--- exit 1
---# else
---# $echo "$modename: using $tagname tagged configuration"
--- fi
--+ func_infer_tag $base_compile
--+
--+ for arg in $later; do
--+ case $arg in
--+ -static)
--+ build_old_libs=yes
--+ continue
--+ ;;
--+
--+ -prefer-pic)
--+ pic_mode=yes
--+ continue
--+ ;;
--+
--+ -prefer-non-pic)
--+ pic_mode=no
--+ continue
-- ;;
-- esac
--- fi
--+ done
--
-- objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
--@@ -568,7 +633,7 @@
-- if test -z "$base_compile"; then
-- $echo "$modename: you must specify a compilation command" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Delete any leftover library objects.
--@@ -579,7 +644,7 @@
-- fi
--
-- $run $rm $removelist
--- trap "$run $rm $removelist; exit 1" 1 2 15
--+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
--
-- # On Cygwin there's no "real" PIC flag so we must build both object types
-- case $host_os in
--@@ -598,7 +663,7 @@
-- output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-- lockfile="$output_obj.lock"
-- removelist="$removelist $output_obj $lockfile"
--- trap "$run $rm $removelist; exit 1" 1 2 15
--+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-- else
-- output_obj=
-- need_locks=no
--@@ -608,7 +673,7 @@
-- # Lock this critical section if it is needed
-- # We use this script file to make the link, it avoids creating a new file
-- if test "$need_locks" = yes; then
--- until $run ln "$0" "$lockfile" 2>/dev/null; do
--+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-- $show "Waiting for $lockfile to be removed"
-- sleep 2
-- done
--@@ -626,7 +691,7 @@
-- compiler."
--
-- $run $rm $removelist
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- $echo $srcfile > "$lockfile"
-- fi
--@@ -681,7 +746,7 @@
-- if $run eval "$command"; then :
-- else
-- test -n "$output_obj" && $run $rm $removelist
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- if test "$need_locks" = warn &&
--@@ -701,7 +766,7 @@
-- compiler."
--
-- $run $rm $removelist
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Just move the object if needed, then go on to compile the next one
--@@ -722,7 +787,9 @@
-- EOF
--
-- # Allow error messages only from the first compilation.
--- suppress_output=' >/dev/null 2>&1'
--+ if test "$suppress_opt" = yes; then
--+ suppress_output=' >/dev/null 2>&1'
--+ fi
-- else
-- # No PIC object so indicate it doesn't exist in the libtool
-- # object file.
--@@ -751,7 +818,7 @@
-- if $run eval "$command"; then :
-- else
-- $run $rm $removelist
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- if test "$need_locks" = warn &&
--@@ -771,7 +838,7 @@
-- compiler."
--
-- $run $rm $removelist
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Just move the object if needed
--@@ -809,7 +876,7 @@
-- $run $rm "$lockfile"
-- fi
--
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- # libtool link mode
--@@ -835,7 +902,7 @@
-- ;;
-- esac
-- libtool_args="$nonopt"
--- base_compile="$nonopt"
--+ base_compile="$nonopt $@"
-- compile_command="$nonopt"
-- finalize_command="$nonopt"
--
--@@ -847,7 +914,6 @@
-- old_convenience=
-- deplibs=
-- old_deplibs=
--- add_flags=
-- compiler_flags=
-- linker_flags=
-- dllsearchpath=
--@@ -868,6 +934,7 @@
-- no_install=no
-- objs=
-- non_pic_objects=
--+ precious_files_regex=
-- prefer_static_libs=no
-- preload=no
-- prev=
--@@ -881,6 +948,8 @@
-- vinfo=
-- vinfo_number=no
--
--+ func_infer_tag $base_compile
--+
-- # We need to know -static, to get the right output filenames.
-- for arg
-- do
--@@ -912,7 +981,6 @@
-- # Go through the arguments, transforming them on the way.
-- while test "$#" -gt 0; do
-- arg="$1"
--- base_compile="$base_compile $arg"
-- shift
-- case $arg in
-- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
--@@ -976,7 +1044,7 @@
-- export_symbols="$arg"
-- if test ! -f "$arg"; then
-- $echo "$modename: symbol file \`$arg' does not exist"
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- prev=
-- continue
--@@ -991,6 +1059,11 @@
-- prev=
-- continue
-- ;;
--+ precious_regex)
--+ precious_files_regex="$arg"
--+ prev=
--+ continue
--+ ;;
-- release)
-- release="-$arg"
-- prev=
--@@ -1023,7 +1096,7 @@
-- test "$pic_object" = none && \
-- test "$non_pic_object" = none; then
-- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Extract subdirectory from the argument.
--@@ -1076,7 +1149,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
--- exit 1
--+ exit $EXIT_FAILURE
-- else
-- # Dry-run case.
--
--@@ -1097,7 +1170,7 @@
-- done
-- else
-- $echo "$modename: link input file \`$save_arg' does not exist"
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- arg=$save_arg
-- prev=
--@@ -1109,7 +1182,7 @@
-- [\\/]* | [A-Za-z]:[\\/]*) ;;
-- *)
-- $echo "$modename: only absolute run-paths are allowed" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
-- if test "$prev" = rpath; then
--@@ -1149,16 +1222,8 @@
-- finalize_command="$finalize_command $qarg"
-- continue
-- ;;
--- framework)
--- case $host in
--- *-*-darwin*)
--- case "$deplibs " in
--- *" $qarg.ltframework "*) ;;
--- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
--- ;;
--- esac
--- ;;
--- esac
--+ shrext)
--+ shrext_cmds="$arg"
-- prev=
-- continue
-- ;;
--@@ -1210,7 +1275,7 @@
-- -export-symbols | -export-symbols-regex)
-- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-- $echo "$modename: more than one -exported-symbols argument is not allowed"
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- if test "X$arg" = "X-export-symbols"; then
-- prev=expsyms
--@@ -1246,7 +1311,7 @@
-- absdir=`cd "$dir" && pwd`
-- if test -z "$absdir"; then
-- $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- dir="$absdir"
-- ;;
--@@ -1276,9 +1341,6 @@
-- # 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*)
-- # These systems don't actually have a C library (as such)
-- test "X$arg" = "X-lc" && continue
--@@ -1289,15 +1351,12 @@
-- ;;
-- *-*-rhapsody* | *-*-darwin1.[012])
-- # Rhapsody C and math libraries are in the System framework
--- deplibs="$deplibs System.ltframework"
--+ deplibs="$deplibs -framework System"
-- continue
-- 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*)
-- # Do not include libc_r directly, use -pthread flag.
-- continue
-- ;;
--@@ -1307,6 +1366,11 @@
-- continue
-- ;;
--
--+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--+ deplibs="$deplibs $arg"
--+ continue
--+ ;;
--+
-- -module)
-- module=yes
-- continue
--@@ -1371,6 +1435,11 @@
--
-- -o) prev=output ;;
--
--+ -precious-files-regex)
--+ prev=precious_regex
--+ continue
--+ ;;
--+
-- -release)
-- prev=release
-- continue
--@@ -1393,7 +1462,7 @@
-- [\\/]* | [A-Za-z]:[\\/]*) ;;
-- *)
-- $echo "$modename: only absolute run-paths are allowed" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
-- case "$xrpath " in
--@@ -1479,11 +1548,6 @@
-- continue
-- ;;
--
--- -framework)
--- prev=framework
--- continue
--- ;;
---
-- # Some other compiler flag.
-- -* | +*)
-- # Unknown arguments in both finalize_command and compile_command need
--@@ -1494,7 +1558,6 @@
-- arg="\"$arg\""
-- ;;
-- esac
--- add_flags="$add_flags $arg"
-- ;;
--
-- *.$objext)
--@@ -1522,7 +1585,7 @@
-- test "$pic_object" = none && \
-- test "$non_pic_object" = none; then
-- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Extract subdirectory from the argument.
--@@ -1575,7 +1638,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
--- exit 1
--+ exit $EXIT_FAILURE
-- else
-- # Dry-run case.
--
--@@ -1629,7 +1692,6 @@
-- arg="\"$arg\""
-- ;;
-- esac
--- add_flags="$add_flags $arg"
-- ;;
-- esac # arg
--
--@@ -1643,48 +1705,7 @@
-- if test -n "$prev"; then
-- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--- fi
---
--- # Infer tagged configuration to use if any are available and
--- # if one wasn't chosen via the "--tag" command line option.
--- # Only attempt this if the compiler in the base link
--- # command doesn't match the default compiler.
--- if test -n "$available_tags" && test -z "$tagname"; then
--- case $base_compile in
--- # Blanks in the command may have been stripped by the calling shell,
--- # but not from the CC environment variable when configure was run.
--- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
--- # Blanks at the start of $base_compile will cause this to fail
--- # if we don't check for them as well.
--- *)
--- for z in $available_tags; do
--- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
--- # Evaluate the configuration.
--- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
--- case $base_compile in
--- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
--- # The compiler in $compile_command matches
--- # the one in the tagged configuration.
--- # Assume this is the tagged configuration we want.
--- tagname=$z
--- break
--- ;;
--- esac
--- fi
--- done
--- # If $tagname still isn't set, then no tagged configuration
--- # was found and let the user know that the "--tag" command
--- # line option must be used.
--- if test -z "$tagname"; then
--- $echo "$modename: unable to infer tagged configuration"
--- $echo "$modename: specify a tag with \`--tag'" 1>&2
--- exit 1
---# else
---# $echo "$modename: using $tagname tagged configuration"
--- fi
--- ;;
--- esac
--+ exit $EXIT_FAILURE
-- fi
--
-- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
--@@ -1728,7 +1749,7 @@
-- "")
-- $echo "$modename: you must specify an output file" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- *.$libext) linkmode=oldlib ;;
-- *.lo | *.$objext) linkmode=obj ;;
--@@ -1738,7 +1759,7 @@
--
-- case $host in
-- *cygwin* | *mingw* | *pw32*)
--- # don't eliminate duplcations in $postdeps and $predeps
--+ # don't eliminate duplications in $postdeps and $predeps
-- duplicate_compiler_generated_deps=yes
-- ;;
-- *)
--@@ -1791,7 +1812,7 @@
-- *.la) ;;
-- *)
-- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
-- done
--@@ -1817,7 +1838,10 @@
-- 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
--@@ -1829,18 +1853,23 @@
-- lib=
-- found=no
-- case $deplib in
--+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--+ if test "$linkmode,$pass" = "prog,link"; then
--+ compile_deplibs="$deplib $compile_deplibs"
--+ finalize_deplibs="$deplib $finalize_deplibs"
--+ else
--+ deplibs="$deplib $deplibs"
--+ fi
--+ continue
--+ ;;
-- -l*)
-- if test "$linkmode" != lib && test "$linkmode" != prog; then
-- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-- continue
-- fi
--- if test "$pass" = conv && test "$allow_undefined" = yes; then
--- deplibs="$deplib $deplibs"
--- continue
--- fi
-- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
--- for search_ext in .la $shrext .so .a; do
--+ for search_ext in .la $std_shrext .so .a; do
-- # Search the libtool library
-- lib="$searchdir/lib${name}${search_ext}"
-- if test -f "$lib"; then
--@@ -1901,18 +1930,6 @@
-- fi
-- fi
-- ;; # -l
--- *.ltframework)
--- if test "$linkmode,$pass" = "prog,link"; then
--- compile_deplibs="$deplib $compile_deplibs"
--- finalize_deplibs="$deplib $finalize_deplibs"
--- else
--- deplibs="$deplib $deplibs"
--- if test "$linkmode" = lib ; then
--- newdependency_libs="$deplib $newdependency_libs"
--- fi
--- fi
--- continue
--- ;;
-- -L*)
-- case $linkmode in
-- lib)
--@@ -1928,11 +1945,11 @@
-- fi
-- if test "$pass" = scan; then
-- deplibs="$deplib $deplibs"
--- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-- else
-- compile_deplibs="$deplib $compile_deplibs"
-- finalize_deplibs="$deplib $finalize_deplibs"
-- fi
--+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-- ;;
-- *)
-- $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
--@@ -2011,14 +2028,14 @@
-- if test "$found" = yes || test -f "$lib"; then :
-- else
-- $echo "$modename: cannot find the library \`$lib'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Check to see that this really is a libtool archive.
-- if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-- else
-- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
--@@ -2041,13 +2058,6 @@
-- *) . ./$lib ;;
-- esac
--
--- case $host in
--- *-*-darwin*)
--- # Convert "-framework foo" to "foo.ltframework" in dependency_libs
--- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
--- ;;
--- esac
---
-- if test "$linkmode,$pass" = "lib,link" ||
-- test "$linkmode,$pass" = "prog,scan" ||
-- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
--@@ -2058,33 +2068,32 @@
-- if test "$pass" = conv; then
-- # Only check for convenience libraries
-- deplibs="$lib $deplibs"
--- tmp_libs=
--- for deplib in $dependency_libs; do
--- #echo "Adding $deplib to \$deplibs"
--- deplibs="$deplib $deplibs"
--- if test "X$duplicate_deps" = "Xyes" ; then
--- case "$tmp_libs " in
--- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--- esac
--- fi
--- tmp_libs="$tmp_libs $deplib"
--- done
-- if test -z "$libdir"; then
-- if test -z "$old_library"; then
-- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- # It is a libtool convenience library, so add in its objects.
-- convenience="$convenience $ladir/$objdir/$old_library"
-- old_convenience="$old_convenience $ladir/$objdir/$old_library"
--+ tmp_libs=
--+ for deplib in $dependency_libs; do
--+ deplibs="$deplib $deplibs"
--+ if test "X$duplicate_deps" = "Xyes" ; then
--+ case "$tmp_libs " in
--+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--+ esac
--+ fi
--+ tmp_libs="$tmp_libs $deplib"
--+ done
-- elif test "$linkmode" != prog && test "$linkmode" != lib; then
-- $echo "$modename: \`$lib' is not a convenience library" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- continue
-- fi # $pass = conv
--
---
--+
-- # Get the name of the library we link against.
-- linklib=
-- for l in $old_library $library_names; do
--@@ -2092,16 +2101,18 @@
-- done
-- if test -z "$linklib"; then
-- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # This library was specified with -dlopen.
-- if test "$pass" = dlopen; then
-- if test -z "$libdir"; then
-- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
--+ if test -z "$dlname" ||
--+ test "$dlopen_support" != yes ||
--+ test "$build_libtool_libs" = no; then
-- # 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
--@@ -2150,7 +2161,7 @@
-- if test "$pass" = dlpreopen; then
-- if test -z "$libdir"; then
-- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- # Prefer using a static library (so that no silly _DYNAMIC symbols
-- # are required to link).
--@@ -2177,7 +2188,7 @@
-- continue
-- fi
--
---
--+
-- if test "$linkmode" = prog && test "$pass" != link; then
-- newlib_search_path="$newlib_search_path $ladir"
-- deplibs="$lib $deplibs"
--@@ -2264,17 +2275,18 @@
-- need_relink=yes
-- fi
-- # This is a shared library
---
--- # Warn about portability, can't link against -module's on some systems (darwin)
--- if test "$shouldnotlink" = yes && test "$pass" = link ; then
--+
--+ # Warn about portability, can't link against -module's on
--+ # some systems (darwin)
--+ if test "$shouldnotlink" = yes && test "$pass" = link ; then
-- $echo
-- if test "$linkmode" = prog; then
-- $echo "*** Warning: Linking the executable $output against the loadable module"
-- else
-- $echo "*** Warning: Linking the shared library $output against the loadable module"
-- fi
--- $echo "*** $linklib is not portable!"
--- fi
--+ $echo "*** $linklib is not portable!"
--+ fi
-- if test "$linkmode" = lib &&
-- test "$hardcode_into_libs" = yes; then
-- # Hardcode the library path.
--@@ -2332,9 +2344,10 @@
-- else
-- $show "extracting exported symbol list from \`$soname'"
-- save_ifs="$IFS"; IFS='~'
--- eval cmds=\"$extract_expsyms_cmds\"
--+ cmds=$extract_expsyms_cmds
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
-- done
--@@ -2345,9 +2358,10 @@
-- if test -f "$output_objdir/$newlib"; then :; else
-- $show "generating import library for \`$soname'"
-- save_ifs="$IFS"; IFS='~'
--- eval cmds=\"$old_archive_from_expsyms_cmds\"
--+ cmds=$old_archive_from_expsyms_cmds
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
-- done
--@@ -2370,9 +2384,9 @@
-- case $host in
-- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-- *-*-darwin* )
--- # if the lib is a module then we can not link against it, someone
--- # is ignoring the new warnings I added
--- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
--+ # if the lib is a module then we can not link against
--+ # it, someone is ignoring the new warnings I added
--+ if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-- $echo "** Warning, lib $linklib is a module, not a shared library"
-- if test -z "$old_library" ; then
-- $echo
--@@ -2380,7 +2394,7 @@
-- $echo "** The link will probably fail, sorry"
-- else
-- add="$dir/$old_library"
--- fi
--+ fi
-- fi
-- esac
-- elif test "$hardcode_minus_L" = no; then
--@@ -2405,7 +2419,7 @@
-- if test -n "$inst_prefix_dir"; then
-- case "$libdir" in
-- [\\/]*)
--- add_dir="-L$inst_prefix_dir$libdir $add_dir"
--+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
-- ;;
-- esac
-- fi
--@@ -2422,7 +2436,7 @@
--
-- if test "$lib_linked" != yes; then
-- $echo "$modename: configuration error: unsupported hardcode properties"
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- if test -n "$add_shlibpath"; then
--@@ -2465,7 +2479,8 @@
-- esac
-- add="-l$name"
-- elif test "$hardcode_automatic" = yes; then
--- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
--+ if test -n "$inst_prefix_dir" &&
--+ test -f "$inst_prefix_dir$libdir/$linklib" ; then
-- add="$inst_prefix_dir$libdir/$linklib"
-- else
-- add="$libdir/$linklib"
--@@ -2477,7 +2492,7 @@
-- if test -n "$inst_prefix_dir"; then
-- case "$libdir" in
-- [\\/]*)
--- add_dir="-L$inst_prefix_dir$libdir $add_dir"
--+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
-- ;;
-- esac
-- fi
--@@ -2544,9 +2559,10 @@
-- fi # link shared/static library?
--
-- if test "$linkmode" = lib; then
--- #if test -n "$dependency_libs" &&
--- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
--- # test "$link_static" = yes; }; then
--+ if test -n "$dependency_libs" &&
--+ { test "$hardcode_into_libs" != yes ||
--+ test "$build_old_libs" = yes ||
--+ test "$link_static" = yes; }; then
-- # Extract -R from dependency_libs
-- temp_deplibs=
-- for libdir in $dependency_libs; do
--@@ -2560,7 +2576,7 @@
-- esac
-- done
-- dependency_libs="$temp_deplibs"
--- #fi
--+ fi
--
-- newlib_search_path="$newlib_search_path $absdir"
-- # Link against this library
--@@ -2602,20 +2618,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
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- if test "$absdir" != "$libdir"; then
--- # Sure, some shells/systems don't implement the -ef.
--- # Those will have to live with the warning.
--- test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
--- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
--+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-- fi
-- path="$absdir"
-- fi
-- depdepl=
-- case $host in
-- *-*-darwin*)
--- # we do not want to link against static libs, but need to link against shared
--+ # we do not want to link against static libs,
--+ # but need to link against shared
-- 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,52 +2637,42 @@
-- done
-- if test -f "$path/$depdepl" ; then
-- depdepl="$path/$depdepl"
--- fi
--+ fi
-- # do not add paths which are already there
-- case " $newlib_search_path " in
-- *" $path "*) ;;
-- *) newlib_search_path="$newlib_search_path $path";;
-- esac
--- path=""
-- fi
--+ path=""
-- ;;
-- *)
--- path="-L$path"
--- ;;
--- esac
---
--+ path="-L$path"
--+ ;;
--+ esac
-- ;;
--- -l*)
--+ -l*)
-- case $host in
-- *-*-darwin*)
--- # Again, we only want to link against shared libraries
--- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
--- for tmp in $newlib_search_path ; do
--- if test -f "$tmp/lib$tmp_libs.dylib" ; then
--- eval depdepl="$tmp/lib$tmp_libs.dylib"
--- break
--- fi
--- done
--- path=""
--+ # Again, we only want to link against shared libraries
--+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
--+ for tmp in $newlib_search_path ; do
--+ if test -f "$tmp/lib$tmp_libs.dylib" ; then
--+ eval depdepl="$tmp/lib$tmp_libs.dylib"
--+ break
--+ fi
--+ done
--+ path=""
-- ;;
-- *) continue ;;
--- esac
--- ;;
---
--- *.ltframework)
--- case $host in
--- *-*-darwin*)
--- depdepl="$deplib"
--- ;;
-- esac
-- ;;
---
-- *) continue ;;
-- esac
-- case " $deplibs " in
-- *" $depdepl "*) ;;
--- *) deplibs="$deplibs $depdepl" ;;
--- esac
--+ *) deplibs="$depdepl $deplibs" ;;
--+ esac
-- case " $deplibs " in
-- *" $path "*) ;;
-- *) deplibs="$deplibs $path" ;;
--@@ -2758,7 +2762,8 @@
-- eval $var=\"$tmp_libs\"
-- done # for var
-- fi
--- # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
--+ # Last step: remove runtime libs from dependency_libs
--+ # (they stay in deplibs)
-- tmp_libs=
-- for i in $dependency_libs ; do
-- case " $predeps $postdeps $compiler_lib_search_path " in
--@@ -2818,19 +2823,19 @@
-- case $outputname in
-- lib*)
-- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
--- eval shared_ext=\"$shrext\"
--+ eval shared_ext=\"$shrext_cmds\"
-- eval libname=\"$libname_spec\"
-- ;;
-- *)
-- if test "$module" = no; then
-- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- if test "$need_lib_prefix" != no; then
-- # Add the "lib" prefix for modules if required
-- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
--- eval shared_ext=\"$shrext\"
--+ eval shared_ext=\"$shrext_cmds\"
-- eval libname=\"$libname_spec\"
-- else
-- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
--@@ -2841,7 +2846,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
--- exit 1
--+ exit $EXIT_FAILURE
-- else
-- $echo
-- $echo "*** Warning: Linking the shared library $output against the non-libtool"
--@@ -2889,13 +2894,13 @@
-- if test -n "$8"; then
-- $echo "$modename: too many parameters to \`-version-info'" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # convert absolute version numbers to libtool ages
-- # this retains compatibility with .la files and attempts
-- # to make the code below a bit more comprehensible
---
--+
-- case $vinfo_number in
-- yes)
-- number_major="$2"
--@@ -2924,6 +2929,11 @@
-- age="$number_minor"
-- revision="$number_minor"
-- ;;
--+ *)
--+ $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)
--@@ -2939,7 +2949,7 @@
-- *)
-- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
--@@ -2948,7 +2958,7 @@
-- *)
-- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
--@@ -2957,14 +2967,14 @@
-- *)
-- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
-- if test "$age" -gt "$current"; then
-- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Calculate the version variables.
--@@ -3053,7 +3063,7 @@
-- *)
-- $echo "$modename: unknown library version type \`$version_type'" 1>&2
-- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
--@@ -3107,6 +3117,12 @@
-- *.$objext)
-- ;;
-- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
--+ if test "X$precious_files_regex" != "X"; then
--+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
--+ then
--+ continue
--+ fi
--+ fi
-- removelist="$removelist $p"
-- ;;
-- *) ;;
--@@ -3143,7 +3159,7 @@
-- *) finalize_rpath="$finalize_rpath $libdir" ;;
-- esac
-- done
--- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
--+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-- dependency_libs="$temp_xrpath $dependency_libs"
-- fi
-- fi
--@@ -3176,17 +3192,11 @@
-- ;;
-- *-*-rhapsody* | *-*-darwin1.[012])
-- # Rhapsody C library is in the System framework
--- deplibs="$deplibs System.ltframework"
--+ deplibs="$deplibs -framework System"
-- ;;
-- *-*-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*)
-- # Do not include libc due to us having libc/libc_r.
-- test "X$arg" = "X-lc" && continue
--@@ -3475,7 +3485,7 @@
-- case $host in
-- *-*-rhapsody* | *-*-darwin1.[012])
-- # On Rhapsody replace the C library is the System framework
--- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
--+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-- ;;
-- esac
--
--@@ -3521,13 +3531,6 @@
-- fi
-- fi
-- fi
--- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
--- case $host in
--- *-*-darwin*)
--- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--- ;;
--- esac
-- # Done checking deplibs!
-- deplibs=$newdeplibs
-- fi
--@@ -3544,7 +3547,7 @@
-- hardcode_libdirs=
-- dep_rpath=
-- rpath="$finalize_rpath"
--- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
--+ test "$mode" != relink && rpath="$compile_rpath$rpath"
-- for libdir in $rpath; do
-- if test -n "$hardcode_libdir_flag_spec"; then
-- if test -n "$hardcode_libdir_separator"; then
--@@ -3599,7 +3602,7 @@
-- fi
--
-- # Get the real and link names of the library.
--- eval shared_ext=\"$shrext\"
--+ eval shared_ext=\"$shrext_cmds\"
-- eval library_names=\"$library_names_spec\"
-- set dummy $library_names
-- realname="$2"
--@@ -3629,10 +3632,11 @@
-- $show "generating symbol list for \`$libname.la'"
-- export_symbols="$output_objdir/$libname.exp"
-- $run $rm $export_symbols
--- eval cmds=\"$export_symbols_cmds\"
--+ cmds=$export_symbols_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- if len=`expr "X$cmd" : ".*"` &&
-- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-- $show "$cmd"
--@@ -3662,12 +3666,12 @@
-- for test_deplib in $deplibs; do
-- case " $convenience " in
-- *" $test_deplib "*) ;;
--- *)
--+ *)
-- tmp_deplibs="$tmp_deplibs $test_deplib"
-- ;;
-- esac
-- done
--- deplibs="$tmp_deplibs"
--+ deplibs="$tmp_deplibs"
--
-- if test -n "$convenience"; then
-- if test -n "$whole_archive_flag_spec"; then
--@@ -3746,31 +3750,26 @@
-- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-- fi
--
--- # Add all flags from the command line. We here create a library,
--- # but those flags were only added to compile_command and
--- # finalize_command, which are only used when creating executables.
--- # So do it by hand here.
--- compiler_flags="$compiler_flags $add_flags"
--- # Only add it to commands which use CC, instead of LD, i.e.
--- # only to $compiler_flags
--- #linker_flags="$linker_flags $add_flags"
---
-- # Do each of the archive commands.
-- if test "$module" = yes && test -n "$module_cmds" ; then
-- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
--- eval cmds=\"$module_expsym_cmds\"
--+ eval test_cmds=\"$module_expsym_cmds\"
--+ cmds=$module_expsym_cmds
-- else
--- eval cmds=\"$module_cmds\"
--+ eval test_cmds=\"$module_cmds\"
--+ cmds=$module_cmds
-- fi
-- else
-- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
--- eval cmds=\"$archive_expsym_cmds\"
--+ eval test_cmds=\"$archive_expsym_cmds\"
--+ cmds=$archive_expsym_cmds
-- else
--- eval cmds=\"$archive_cmds\"
--+ eval test_cmds=\"$archive_cmds\"
--+ cmds=$archive_cmds
-- fi
-- fi
--
--- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
--+ if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-- :
-- else
--@@ -3871,19 +3870,28 @@
-- # value of $libobjs for piecewise linking.
--
-- # Do each of the archive commands.
--+ if test "$module" = yes && test -n "$module_cmds" ; then
--+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
--+ cmds=$module_expsym_cmds
--+ else
--+ cmds=$module_cmds
--+ fi
--+ else
-- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
--- eval cmds=\"$archive_expsym_cmds\"
--+ cmds=$archive_expsym_cmds
-- else
--- eval cmds=\"$archive_cmds\"
--+ cmds=$archive_cmds
--+ fi
-- fi
--
-- # Append the command to remove the reloadable object files
-- # to the just-reset $cmds.
--- eval cmds=\"\$cmds~$rm $delfiles\"
--+ eval cmds=\"\$cmds~\$rm $delfiles\"
-- fi
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
-- done
--@@ -3892,7 +3900,7 @@
-- # Restore the uninstalled library and exit
-- if test "$mode" = relink; then
-- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
--- exit 0
--+ exit $EXIT_SUCCESS
-- fi
--
-- # Create links to the real library.
--@@ -3940,7 +3948,7 @@
-- *.lo)
-- if test -n "$objs$old_deplibs"; then
-- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- libobj="$output"
-- obj=`$echo "X$output" | $Xsed -e "$lo2o"`
--@@ -4034,10 +4042,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"
--- eval cmds=\"$reload_cmds\"
--+ cmds=$reload_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
-- done
--@@ -4050,7 +4059,7 @@
-- $run ${rm}r $gentop
-- fi
--
--- exit 0
--+ exit $EXIT_SUCCESS
-- fi
--
-- if test "$build_libtool_libs" != yes; then
--@@ -4063,17 +4072,18 @@
-- # accidentally link it into a program.
-- # $show "echo timestamp > $libobj"
-- # $run eval "echo timestamp > $libobj" || exit $?
--- exit 0
--+ exit $EXIT_SUCCESS
-- fi
--
-- if test -n "$pic_flag" || test "$pic_mode" != default; then
-- # Only do commands if we really have different PIC objects.
-- reload_objs="$libobjs $reload_conv_objs"
-- output="$libobj"
--- eval cmds=\"$reload_cmds\"
--+ cmds=$reload_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
-- done
--@@ -4085,7 +4095,7 @@
-- $run ${rm}r $gentop
-- fi
--
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- prog)
--@@ -4110,21 +4120,18 @@
-- case $host in
-- *-*-rhapsody* | *-*-darwin1.[012])
-- # On Rhapsody replace the C library is the System framework
--- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
--- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
--+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
--+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-- ;;
-- esac
--
-- case $host in
--- *-*-darwin*)
--+ *darwin*)
-- # Don't allow lazy linking, it breaks C++ global constructors
-- if test "$tagname" = CXX ; then
-- compile_command="$compile_command ${wl}-bind_at_load"
-- finalize_command="$finalize_command ${wl}-bind_at_load"
-- fi
--- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
--- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-- ;;
-- esac
--
--@@ -4406,7 +4413,7 @@
-- ;;
-- *)
-- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
-- else
--@@ -4419,17 +4426,6 @@
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-- fi
--
--- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
--- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
--- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
--- # This does not apply on AIX for ia64, which uses a SysV linker.
--- case "$host" in
--- ia64-*-aix5*) ;;
--- *-*-aix4* | *-*-aix5*)
--- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
--- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
--- esac
---
-- 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 +4501,7 @@
-- # Link the executable and exit
-- $show "$link_command"
-- $run eval "$link_command" || exit $?
--- exit 0
--+ exit $EXIT_SUCCESS
-- fi
--
-- if test "$hardcode_action" = relink; then
--@@ -4560,10 +4556,10 @@
-- fi
--
-- # Quote $echo for shipping.
--- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
--- case $0 in
--- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
--- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
--+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
--+ case $progpath in
--+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
--+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-- esac
-- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-- else
--@@ -4589,7 +4585,7 @@
-- cwrappersource=`$echo ${objdir}/lt-${output}.c`
-- cwrapper=`$echo ${output}.exe`
-- $rm $cwrappersource $cwrapper
--- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
--+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
--
-- cat > $cwrappersource <<EOF
--
--@@ -4598,7 +4594,7 @@
--
-- The $output program cannot be directly executed until all the libtool
-- libraries that it depends on are installed.
---
--+
-- This wrapper executable should never be moved out of the build directory.
-- If it is, it will not operate correctly.
--
--@@ -4630,7 +4626,7 @@
-- #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-- defined (__OS2__)
-- #define HAVE_DOS_BASED_FILE_SYSTEM
---#ifndef DIR_SEPARATOR_2
--+#ifndef DIR_SEPARATOR_2
-- #define DIR_SEPARATOR_2 '\\'
-- #endif
-- #endif
--@@ -4661,7 +4657,7 @@
-- {
-- char **newargz;
-- int i;
---
--+
-- program_name = (char *) xstrdup ((char *) basename (argv[0]));
-- newargz = XMALLOC(char *, argc+2);
-- EOF
--@@ -4674,7 +4670,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 */
--- strendzap(newargz[1],".exe");
--+ strendzap(newargz[1],".exe");
-- for (i = 1; i < argc; i++)
-- newargz[i+1] = xstrdup(argv[i]);
-- newargz[argc+1] = NULL;
--@@ -4697,7 +4693,7 @@
-- return p;
-- }
--
---char *
--+char *
-- xstrdup (const char *string)
-- {
-- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
--@@ -4711,7 +4707,7 @@
--
-- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-- /* Skip over the disk name in MSDOS pathnames. */
--- if (isalpha (name[0]) && name[1] == ':')
--+ if (isalpha (name[0]) && name[1] == ':')
-- name += 2;
-- #endif
--
--@@ -4721,7 +4717,7 @@
-- return (char *) base;
-- }
--
---char *
--+char *
-- fnqualify(const char *path)
-- {
-- size_t size;
--@@ -4749,7 +4745,7 @@
-- }
--
-- char *
---strendzap(char *str, const char *pat)
--+strendzap(char *str, const char *pat)
-- {
-- size_t len, patlen;
--
--@@ -4769,7 +4765,7 @@
-- }
--
-- static void
---lt_error_core (int exit_status, const char * mode,
--+lt_error_core (int exit_status, const char * mode,
-- const char * message, va_list ap)
-- {
-- fprintf (stderr, "%s: %s: ", program_name, mode);
--@@ -4798,7 +4794,7 @@
-- ;;
-- esac
-- $rm $output
--- trap "$rm $output; exit 1" 1 2 15
--+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
--
-- $echo > $output "\
-- #! $SHELL
--@@ -4898,7 +4894,7 @@
-- else
-- $echo \"\$relink_command_output\" >&2
-- $rm \"\$progdir/\$file\"
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- fi
--
--@@ -4953,29 +4949,27 @@
-- ;;
--
-- *)
--- # Need to set LD_LIBRARY_PATH, to the value already
--- # computed within libtool.
-- $echo >> $output "\
--- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
--+ exec \$progdir/\$program \${1+\"\$@\"}
-- "
-- ;;
-- esac
-- $echo >> $output "\
-- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- else
-- # The program doesn't exist.
-- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-- \$echo \"This script is just a wrapper for \$program.\" 1>&2
-- $echo \"See the $PACKAGE documentation for more information.\" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- fi\
-- "
-- chmod +x $output
-- fi
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
-- esac
--
--@@ -5059,17 +5053,15 @@
-- done
-- fi
--
--- compiler_flags="$compiler_flags $add_flags"
---
-- # Do each command in the archive commands.
-- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
--- eval cmds=\"$old_archive_from_new_cmds\"
--+ cmds=$old_archive_from_new_cmds
-- else
-- eval cmds=\"$old_archive_cmds\"
--
-- if len=`expr "X$cmds" : ".*"` &&
-- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
--- :
--+ cmds=$old_archive_cmds
-- else
-- # the command line is too long to link in one step, link in parts
-- $echo "using piecewise archive linking..."
--@@ -5096,7 +5088,7 @@
-- for obj in $save_oldobjs
-- do
-- last_oldobj=$obj
--- done
--+ done
-- for obj in $save_oldobjs
-- do
-- oldobjs="$objlist $obj"
--@@ -5110,7 +5102,7 @@
-- oldobjs=$objlist
-- if test "$obj" = "$last_oldobj" ; then
-- RANLIB=$save_RANLIB
--- fi
--+ fi
-- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-- objlist=
--@@ -5121,12 +5113,13 @@
-- if test "X$oldobjs" = "X" ; then
-- eval cmds=\"\$concat_cmds\"
-- else
--- eval cmds=\"\$concat_cmds~$old_archive_cmds\"
--+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-- fi
-- fi
-- fi
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
--+ eval cmd=\"$cmd\"
-- IFS="$save_ifs"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
--@@ -5158,11 +5151,13 @@
-- fi
-- done
-- # Quote the link command for shipping.
--- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
--+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-- if test "$hardcode_automatic" = yes ; then
--- relink_command=
--- fi
--+ relink_command=
--+ fi
--+
--+
-- # Only create the output if not a dry run.
-- if test -z "$run"; then
-- for installed in no yes; do
--@@ -5180,7 +5175,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
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- newdependency_libs="$newdependency_libs $libdir/$name"
-- ;;
--@@ -5194,7 +5189,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
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- newdlfiles="$newdlfiles $libdir/$name"
-- done
--@@ -5205,11 +5200,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
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- newdlprefiles="$newdlprefiles $libdir/$name"
-- done
-- dlprefiles="$newdlprefiles"
--+ else
--+ newdlfiles=
--+ for lib in $dlfiles; do
--+ case $lib in
--+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
--+ *) abs=`pwd`"/$lib" ;;
--+ esac
--+ newdlfiles="$newdlfiles $abs"
--+ done
--+ dlfiles="$newdlfiles"
--+ newdlprefiles=
--+ for lib in $dlprefiles; do
--+ case $lib in
--+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
--+ *) abs=`pwd`"/$lib" ;;
--+ esac
--+ newdlprefiles="$newdlprefiles $abs"
--+ done
--+ dlprefiles="$newdlprefiles"
-- fi
-- $rm $output
-- # place dlname in correct position for cygwin
--@@ -5253,7 +5267,7 @@
--
-- # Directory that this library needs to be installed in:
-- libdir='$install_libdir'"
--- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
--+ if test "$installed" = no && test "$need_relink" = yes; then
-- $echo >> $output "\
-- relink_command=\"$relink_command\""
-- fi
--@@ -5266,7 +5280,7 @@
-- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-- ;;
-- esac
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- # libtool install mode
--@@ -5355,13 +5369,13 @@
-- if test -z "$install_prog"; then
-- $echo "$modename: you must specify an install program" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- if test -n "$prev"; then
-- $echo "$modename: the \`$prev' option requires an argument" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- if test -z "$files"; then
--@@ -5371,7 +5385,7 @@
-- $echo "$modename: you must specify a destination" 1>&2
-- fi
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Strip any trailing slash from the destination.
--@@ -5392,7 +5406,7 @@
-- if test "$#" -gt 2; then
-- $echo "$modename: \`$dest' is not a directory" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- fi
-- case $destdir in
--@@ -5404,7 +5418,7 @@
-- *)
-- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
-- done
--@@ -5433,7 +5447,7 @@
-- else
-- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- library_names=
--@@ -5475,7 +5489,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
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- if test -n "$inst_prefix_dir"; then
--@@ -5490,7 +5504,7 @@
-- if $run eval "$relink_command"; then :
-- else
-- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- fi
--
--@@ -5525,10 +5539,11 @@
--
-- # Do each command in the postinstall commands.
-- lib="$destdir/$realname"
--- eval cmds=\"$postinstall_cmds\"
--+ cmds=$postinstall_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
-- done
--@@ -5568,7 +5583,7 @@
-- *)
-- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
--@@ -5586,7 +5601,7 @@
-- $show "$install_prog $staticobj $staticdest"
-- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-- fi
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- *)
--@@ -5640,7 +5655,7 @@
-- # Check the variables that should have been set.
-- if test -z "$notinst_deplibs"; then
-- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- finalize=yes
--@@ -5681,8 +5696,12 @@
-- tmpdir="/tmp"
-- test -n "$TMPDIR" && tmpdir="$TMPDIR"
-- tmpdir="$tmpdir/libtool-$$"
--- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
--+ save_umask=`umask`
--+ umask 0077
--+ if $mkdir "$tmpdir"; then
--+ umask $save_umask
-- else
--+ umask $save_umask
-- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-- continue
-- fi
--@@ -5741,16 +5760,17 @@
-- $show "$install_prog $file $oldlib"
-- $run eval "$install_prog \$file \$oldlib" || exit $?
--
--- if test -n "$stripme" && test -n "$striplib"; then
--+ if test -n "$stripme" && test -n "$old_striplib"; then
-- $show "$old_striplib $oldlib"
-- $run eval "$old_striplib $oldlib" || exit $?
-- fi
--
-- # Do each command in the postinstall commands.
--- eval cmds=\"$old_postinstall_cmds\"
--+ cmds=$old_postinstall_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || exit $?
-- done
--@@ -5764,9 +5784,9 @@
-- if test -n "$current_libdirs"; then
-- # Maybe just do a dry run.
-- test -n "$run" && current_libdirs=" -n$current_libdirs"
--- exec_cmd='$SHELL $0 --finish$current_libdirs'
--+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-- else
--- exit 0
--+ exit $EXIT_SUCCESS
-- fi
-- ;;
--
--@@ -5785,10 +5805,11 @@
-- for libdir in $libdirs; do
-- if test -n "$finish_cmds"; then
-- # Do each command in the finish commands.
--- eval cmds=\"$finish_cmds\"
--+ cmds=$finish_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd" || admincmds="$admincmds
-- $cmd"
--@@ -5805,7 +5826,7 @@
-- fi
--
-- # Exit here if they wanted silent mode.
--- exit 0
--+ test "$show" = : && exit $EXIT_SUCCESS
--
-- $echo "----------------------------------------------------------------------"
-- $echo "Libraries have been installed in:"
--@@ -5841,7 +5862,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 "----------------------------------------------------------------------"
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- # libtool execute mode
--@@ -5853,7 +5874,7 @@
-- if test -z "$cmd"; then
-- $echo "$modename: you must specify a COMMAND" 1>&2
-- $echo "$help"
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Handle -dlopen flags immediately.
--@@ -5861,7 +5882,7 @@
-- if test ! -f "$file"; then
-- $echo "$modename: \`$file' is not a file" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- dir=
--@@ -5872,7 +5893,7 @@
-- else
-- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # Read the libtool library.
--@@ -5899,7 +5920,7 @@
-- dir="$dir/$objdir"
-- else
-- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- ;;
--
--@@ -5979,7 +6000,7 @@
-- $echo "export $shlibpath_var"
-- fi
-- $echo "$cmd$args"
--- exit 0
--+ exit $EXIT_SUCCESS
-- fi
-- ;;
--
--@@ -6007,7 +6028,7 @@
-- if test -z "$rm"; then
-- $echo "$modename: you must specify an RM program" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- rmdirs=
--@@ -6062,10 +6083,11 @@
-- if test "$mode" = uninstall; then
-- if test -n "$library_names"; then
-- # Do each command in the postuninstall commands.
--- eval cmds=\"$postuninstall_cmds\"
--+ cmds=$postuninstall_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd"
-- if test "$?" -ne 0 && test "$rmforce" != yes; then
--@@ -6077,10 +6099,11 @@
--
-- if test -n "$old_library"; then
-- # Do each command in the old_postuninstall commands.
--- eval cmds=\"$old_postuninstall_cmds\"
--+ cmds=$old_postuninstall_cmds
-- save_ifs="$IFS"; IFS='~'
-- for cmd in $cmds; do
-- IFS="$save_ifs"
--+ eval cmd=\"$cmd\"
-- $show "$cmd"
-- $run eval "$cmd"
-- if test "$?" -ne 0 && test "$rmforce" != yes; then
--@@ -6119,7 +6142,7 @@
-- if test "$mode" = clean ; then
-- noexename=$name
-- case $file in
--- *.exe)
--+ *.exe)
-- file=`$echo $file|${SED} 's,.exe$,,'`
-- noexename=`$echo $name|${SED} 's,.exe$,,'`
-- # $file with .exe has already been added to rmfiles,
--@@ -6164,20 +6187,20 @@
-- "")
-- $echo "$modename: you must specify a MODE" 1>&2
-- $echo "$generic_help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
-- if test -z "$exec_cmd"; then
-- $echo "$modename: invalid operation mode \`$mode'" 1>&2
-- $echo "$generic_help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
-- fi # test -z "$show_help"
--
-- if test -n "$exec_cmd"; then
-- eval exec $exec_cmd
--- exit 1
--+ exit $EXIT_FAILURE
-- fi
--
-- # We need to display help for each of the modes.
--@@ -6213,7 +6236,7 @@
-- a more detailed description of MODE.
--
-- Report bugs to <bug-libtool@gnu.org>."
--- exit 0
--+ exit $EXIT_SUCCESS
-- ;;
--
-- clean)
--@@ -6325,6 +6348,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
--+ -precious-files-regex REGEX
--+ don't remove output files matching REGEX
-- -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 +6391,14 @@
-- *)
-- $echo "$modename: invalid operation mode \`$mode'" 1>&2
-- $echo "$help" 1>&2
--- exit 1
--+ exit $EXIT_FAILURE
-- ;;
-- esac
--
-- $echo
-- $echo "Try \`$modename --help' for more information about other modes."
--
---exit 0
--+exit $EXIT_SUCCESS
--
-- # The TAGs below are defined such that we never get into a situation
-- # in which we disable both kinds of libraries. Given conflicting
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/04_am_maintainer_mode.diff kdeadmin-3.4.0/debian/patches/common/04_am_maintainer_mode.diff
---- kdeadmin-3.4.0.orig/debian/patches/common/04_am_maintainer_mode.diff 2005-03-04 21:29:47.765425292 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/04_am_maintainer_mode.diff 1970-01-01 01:00:00.000000000 +0100
-@@ -1,11 +0,0 @@
----- a/admin/configure.in.min
--+++ b/admin/configure.in.min
--@@ -38,6 +38,8 @@
-- dnl Automake doc recommends to do this only here. (Janos)
-- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
--
--+AM_MAINTAINER_MODE
--+
-- KDE_SET_PREFIX
--
-- dnl generate the config header
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/05_pedantic-errors.diff kdeadmin-3.4.0/debian/patches/common/05_pedantic-errors.diff
---- kdeadmin-3.4.0.orig/debian/patches/common/05_pedantic-errors.diff 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/05_pedantic-errors.diff 1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
----- a/admin/acinclude.m4.in
--+++ b/admin/acinclude.m4.in
--@@ -2087,9 +2087,6 @@
-- save_CXXFLAGS="$CXXFLAGS"
-- kde_safe_LIBS="$LIBS"
-- LIBS="$LIBS $X_EXTRA_LIBS"
---if test "$GXX" = "yes"; then
---CXXFLAGS="$CXXFLAGS -pedantic-errors"
---fi
-- AC_TRY_COMPILE([
-- $2
-- ],
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/06_automake-1.9.diff kdeadmin-3.4.0/debian/patches/common/06_automake-1.9.diff
---- kdeadmin-3.4.0.orig/debian/patches/common/06_automake-1.9.diff 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/06_automake-1.9.diff 1970-01-01 01:00:00.000000000 +0100
-@@ -1,11 +0,0 @@
----- a/admin/detect-autoconf.sh
--+++ b/admin/detect-autoconf.sh
--@@ -11,7 +11,7 @@
-- # needed to compile KDE. Do not forget to include the name/version #
-- # separator if one is present, e.g. -1.2 where - is the separator.
-- KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
---KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
--+KDE_AUTOMAKE_VERS="-1.9 -1.7 17 -1.6"
--
-- # We don't use variable here for remembering the type ... strings. Local
-- # variables are not that portable, but we fear namespace issues with our
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/07_disable_no_undefined.diff kdeadmin-3.4.0/debian/patches/common/07_disable_no_undefined.diff
---- kdeadmin-3.4.0.orig/debian/patches/common/07_disable_no_undefined.diff 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/07_disable_no_undefined.diff 1970-01-01 01:00:00.000000000 +0100
-@@ -1,18 +0,0 @@
----- a/admin/acinclude.m4.in
--+++ b/admin/acinclude.m4.in
--@@ -1665,15 +1665,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)
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/README kdeadmin-3.4.0/debian/patches/common/README
---- kdeadmin-3.4.0.orig/debian/patches/common/README 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/README 1970-01-01 01:00:00.000000000 +0100
-@@ -1,14 +0,0 @@
--Common patches across KDE Debian packages
--=========================================
--
-- These directory should contain patches to the admin/ subdir of KDE
-- modules that are meant to be applied to all packaged modules. As the
-- admin/ subdir is shared across modules (and so, it's identical for all
-- modules at a certain version), I think it makes sense to have these
-- patches in a central location, and update them here.
--
-- The script update.sh takes care of automatically updating the patches
-- that update autotools and libtool. You need to pass the location of an
-- admin/ directory as the first argument.
--
-- -- Adeodato Simó, 2005-02-26
-diff -Nrua kdeadmin-3.4.0.orig/debian/patches/common/update.sh kdeadmin-3.4.0/debian/patches/common/update.sh
---- kdeadmin-3.4.0.orig/debian/patches/common/update.sh 2005-03-04 21:29:47.766425201 +0100
-+++ kdeadmin-3.4.0/debian/patches/common/update.sh 1970-01-01 01:00:00.000000000 +0100
-@@ -1,47 +0,0 @@
--#!/bin/sh
--
--ADMIN="$1"
--
--test -d "$ADMIN" || {
-- echo >&2 "Error, admin dir '$ADMIN' does not exist."
-- exit 1
--}
--
--rm -rf a b
--mkdir a b
--
--cp -a "$ADMIN" a/admin
--
--############################################################
--PATCH=03_libtool_update.diff
--rm -rf b/admin; cp -a a/admin b
--
--cp -f /usr/share/libtool/libtool.m4 b/admin/libtool.m4.in
--cp -f /usr/share/libtool/ltmain.sh b/admin/ltmain.sh
--
--diff -Nrua a b >$PATCH
--############################################################
--
--
--############################################################
--PATCH=02_autotools_update.diff
--AUTOMAKE_DIR=/usr/share/automake-1.9
--rm -rf b/admin; cp -a a/admin b
--
--( cd b/admin
-- for file in *; do
-- case "$file" in
-- config.guess|config.sub)
-- continue
-- ;;
-- esac
-- if test -r "$AUTOMAKE_DIR/$file"; then
-- cp -f "$AUTOMAKE_DIR/$file" "$file"
-- fi
-- done
--)
--
--diff -Nrua a b >$PATCH
--############################################################
--
--rm -rf a b
-diff -Nrua kdeadmin-3.4.0.orig/debian/rules kdeadmin-3.4.0/debian/rules
---- kdeadmin-3.4.0.orig/debian/rules 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/rules 1970-01-01 01:00:00.000000000 +0100
-@@ -1,30 +0,0 @@
--#! /usr/bin/make -f
--
--include /usr/share/cdbs/1/rules/debhelper.mk
--include debian/cdbs/kde.mk
--include /usr/share/cdbs/1/rules/simple-patchsys.mk
--include /usr/share/cdbs/1/rules/utils.mk
--
--DEB_KDE_ENABLE_FINAL := yes
--
--DEB_CONFIGURE_EXTRA_FLAGS := \
-- --without-rpm --with-pam=kde --with-shadow --with-nis \
-- --with-private-groups
--
--common-build-arch:: debian/stamp-man-pages
--debian/stamp-man-pages:
--# Generate man pages for the programs
-- for f in debian/man/*.sgml; do \
-- docbook-to-man $$f > debian/man/`basename $$f .sgml`.1; \
-- done
-- touch debian/stamp-man-pages
--
--clean::
-- rm -f debian/man/*.1
-- rm -f debian/stamp-man-pages
--
--DEB_INSTALL_DOCS_ALL :=
--
--binary-install/lilo-config::
-- install -p -D -m644 debian/lilo-config.lintian \
-- debian/lilo-config/usr/share/lintian/overrides/lilo-config
-diff -Nrua kdeadmin-3.4.0.orig/debian/secpolicy.install kdeadmin-3.4.0/debian/secpolicy.install
---- kdeadmin-3.4.0.orig/debian/secpolicy.install 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/secpolicy.install 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--debian/tmp/usr/bin/secpolicy
-diff -Nrua kdeadmin-3.4.0.orig/debian/secpolicy.manpages kdeadmin-3.4.0/debian/secpolicy.manpages
---- kdeadmin-3.4.0.orig/debian/secpolicy.manpages 2005-03-04 21:29:47.767425110 +0100
-+++ kdeadmin-3.4.0/debian/secpolicy.manpages 1970-01-01 01:00:00.000000000 +0100
-@@ -1 +0,0 @@
--debian/man/secpolicy.1
-diff -Nrua kdeadmin-3.4.0.orig/debian/secpolicy.menu kdeadmin-3.4.0/debian/secpolicy.menu
---- kdeadmin-3.4.0.orig/debian/secpolicy.menu 2005-03-04 21:29:47.768425019 +0100
-+++ kdeadmin-3.4.0/debian/secpolicy.menu 1970-01-01 01:00:00.000000000 +0100
-@@ -1,6 +0,0 @@
--?package(secpolicy):\
-- needs="X11"\
-- section="Apps/System"\
-- hints="KDE"\
-- title="KDE PAM Security Policy Editor"\
-- command="/usr/bin/secpolicy"
-diff -Nrua kdeadmin-3.4.0.orig/doc/kcron/Makefile.in kdeadmin-3.4.0/doc/kcron/Makefile.in
---- kdeadmin-3.4.0.orig/doc/kcron/Makefile.in 2005-03-04 21:29:47.714429933 +0100
-+++ kdeadmin-3.4.0/doc/kcron/Makefile.in 2005-03-04 21:30:24.061122026 +0100
+diff -Nrua kdeadmin-3.4.0.orig/doc/Makefile.in kdeadmin-3.4.0/doc/Makefile.in
+--- kdeadmin-3.4.0.orig/doc/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/doc/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -19798,7 +7607,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -166,6 +166,9 @@
+@@ -182,6 +182,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19808,8 +7617,15 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
- all: docs-am all-am
+@@ -332,13 +335,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kcron kdat kpackage ksysv kuser
++SUBDIRS =. kdat kcron ksysv kuser kpackage
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -19817,7 +7633,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -357,9 +360,9 @@
+@@ -376,9 +379,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19829,18 +7645,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -504,7 +507,7 @@
- .NOEXPORT:
+@@ -398,7 +401,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -410,7 +419,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -418,7 +427,13 @@
- #>+ 2
--KDE_DIST=index.docbook Makefile.in print.png newvariable.png kcron.png newtask.png Makefile.am index.cache.bz2 kcronstart.png
-+KDE_DIST=Makefile.in print.png newvariable.png kcron.png index.docbook newtask.png Makefile.am index.cache.bz2 kcronstart.png
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kcron.png kcronstart.png newtask.png newvariable.png print.png
-diff -Nrua kdeadmin-3.4.0.orig/doc/kdat/Makefile.in kdeadmin-3.4.0/doc/kdat/Makefile.in
---- kdeadmin-3.4.0.orig/doc/kdat/Makefile.in 2005-03-04 21:29:47.715429842 +0100
-+++ kdeadmin-3.4.0/doc/kdat/Makefile.in 2005-03-04 21:30:24.066121571 +0100
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -439,7 +454,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdeadmin-3.4.0.orig/doc/kcron/Makefile.in kdeadmin-3.4.0/doc/kcron/Makefile.in
+--- kdeadmin-3.4.0.orig/doc/kcron/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/doc/kcron/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -19884,18 +7739,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -504,7 +507,7 @@
+@@ -504,10 +507,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
+-KDE_DIST=index.docbook Makefile.in print.png newvariable.png kcron.png newtask.png Makefile.am index.cache.bz2 kcronstart.png
++KDE_DIST=print.png Makefile.in newvariable.png kcron.png index.docbook newtask.png Makefile.am kcronstart.png index.cache.bz2
#>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nrua kdeadmin-3.4.0.orig/doc/kpackage/Makefile.in kdeadmin-3.4.0/doc/kpackage/Makefile.in
---- kdeadmin-3.4.0.orig/doc/kpackage/Makefile.in 2005-03-04 21:29:47.718429569 +0100
-+++ kdeadmin-3.4.0/doc/kpackage/Makefile.in 2005-03-04 21:30:24.073120934 +0100
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kcron.png kcronstart.png newtask.png newvariable.png print.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -534,20 +537,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron
+- @for base in index.docbook kcron.png kcronstart.png newtask.png newvariable.png print.png ; do \
++ @for base in kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kcron.png kcronstart.png newtask.png newvariable.png print.png ; do \
++ for base in kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcron/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kcron.png kcronstart.png newtask.png newvariable.png print.png ; do \
++ for file in kcron.png newvariable.png kcronstart.png index.docbook newtask.png print.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nrua kdeadmin-3.4.0.orig/doc/kdat/Makefile.in kdeadmin-3.4.0/doc/kdat/Makefile.in
+--- kdeadmin-3.4.0.orig/doc/kdat/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/doc/kdat/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -19943,14 +7826,14 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=searchl.png Makefile.in search.png right-prop.png slackloc.png right-change.png install.png left.png debloc.png right-files.png searchf.png bsdloc.png index.docbook rpmloc.png debaptloc.png Makefile.am handle.png uninstall.png index.cache.bz2
-+KDE_DIST=searchl.png Makefile.in search.png right-prop.png slackloc.png right-change.png install.png left.png debloc.png right-files.png searchf.png bsdloc.png rpmloc.png index.docbook debaptloc.png handle.png Makefile.am uninstall.png index.cache.bz2
+-KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
#>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bsdloc.png debaptloc.png debloc.png handle.png index.docbook install.png left.png right-change.png right-files.png right-prop.png rpmloc.png slackloc.png uninstall.png search.png searchf.png searchl.png
-diff -Nrua kdeadmin-3.4.0.orig/doc/ksysv/Makefile.in kdeadmin-3.4.0/doc/ksysv/Makefile.in
---- kdeadmin-3.4.0.orig/doc/ksysv/Makefile.in 2005-03-04 21:29:47.718429569 +0100
-+++ kdeadmin-3.4.0/doc/ksysv/Makefile.in 2005-03-04 21:30:24.078120479 +0100
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
+diff -Nrua kdeadmin-3.4.0.orig/doc/kpackage/Makefile.in kdeadmin-3.4.0/doc/kpackage/Makefile.in
+--- kdeadmin-3.4.0.orig/doc/kpackage/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/doc/kpackage/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -19994,9 +7877,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/doc/kuser/Makefile.in kdeadmin-3.4.0/doc/kuser/Makefile.in
---- kdeadmin-3.4.0.orig/doc/kuser/Makefile.in 2005-03-04 21:29:47.719429478 +0100
-+++ kdeadmin-3.4.0/doc/kuser/Makefile.in 2005-03-04 21:30:24.084119933 +0100
+@@ -504,10 +507,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=searchl.png Makefile.in search.png right-prop.png slackloc.png right-change.png install.png left.png debloc.png right-files.png searchf.png bsdloc.png index.docbook rpmloc.png debaptloc.png Makefile.am handle.png uninstall.png index.cache.bz2
++KDE_DIST=searchl.png Makefile.in search.png right-prop.png slackloc.png right-change.png install.png debloc.png left.png right-files.png searchf.png bsdloc.png index.docbook rpmloc.png debaptloc.png Makefile.am handle.png uninstall.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bsdloc.png debaptloc.png debloc.png handle.png index.docbook install.png left.png right-change.png right-files.png right-prop.png rpmloc.png slackloc.png uninstall.png search.png searchf.png searchl.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -534,20 +537,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage
+- @for base in bsdloc.png debaptloc.png debloc.png handle.png index.docbook install.png left.png right-change.png right-files.png right-prop.png rpmloc.png slackloc.png uninstall.png search.png searchf.png searchl.png ; do \
++ @for base in debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in bsdloc.png debaptloc.png debloc.png handle.png index.docbook install.png left.png right-change.png right-files.png right-prop.png rpmloc.png slackloc.png uninstall.png search.png searchf.png searchl.png ; do \
++ for base in debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpackage/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in bsdloc.png debaptloc.png debloc.png handle.png index.docbook install.png left.png right-change.png right-files.png right-prop.png rpmloc.png slackloc.png uninstall.png search.png searchf.png searchl.png ; do \
++ for file in debaptloc.png install.png slackloc.png rpmloc.png left.png right-change.png handle.png bsdloc.png right-files.png uninstall.png search.png debloc.png searchf.png searchl.png right-prop.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nrua kdeadmin-3.4.0.orig/doc/ksysv/Makefile.in kdeadmin-3.4.0/doc/ksysv/Makefile.in
+--- kdeadmin-3.4.0.orig/doc/ksysv/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/doc/ksysv/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20040,9 +7960,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/doc/Makefile.in kdeadmin-3.4.0/doc/Makefile.in
---- kdeadmin-3.4.0.orig/doc/Makefile.in 2005-03-04 21:29:47.719429478 +0100
-+++ kdeadmin-3.4.0/doc/Makefile.in 2005-03-04 21:30:24.055122572 +0100
+diff -Nrua kdeadmin-3.4.0.orig/doc/kuser/Makefile.in kdeadmin-3.4.0/doc/kuser/Makefile.in
+--- kdeadmin-3.4.0.orig/doc/kuser/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/doc/kuser/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20055,7 +7975,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -182,6 +182,9 @@
+@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20065,8 +7985,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -338,7 +341,7 @@
- all: docs-am all-recursive
+@@ -319,7 +322,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -20074,7 +7994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -376,9 +379,9 @@
+@@ -357,9 +360,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20086,57 +8006,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -398,7 +401,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -410,7 +419,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -418,7 +427,13 @@
+@@ -507,7 +510,7 @@
+ KDE_DIST=Makefile.in kuser.png index.docbook Makefile.am index.cache.bz2
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -439,7 +454,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kuser.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kuser.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -534,20 +537,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser
+- @for base in index.docbook kuser.png ; do \
++ @for base in kuser.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kuser.png ; do \
++ for base in kuser.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kuser/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kuser.png ; do \
++ for file in kuser.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
diff -Nrua kdeadmin-3.4.0.orig/kcron/Makefile.in kdeadmin-3.4.0/kcron/Makefile.in
---- kdeadmin-3.4.0.orig/kcron/Makefile.in 2005-03-04 21:29:47.723429114 +0100
-+++ kdeadmin-3.4.0/kcron/Makefile.in 2005-03-04 21:30:24.115117112 +0100
+--- kdeadmin-3.4.0.orig/kcron/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/kcron/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20203,9 +8108,70 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -860,18 +863,18 @@
+ mocs: ktvariable.moc
+
+ #>+ 3
+-kttask.moc: $(srcdir)/kttask.h
+- $(MOC) $(srcdir)/kttask.h -o kttask.moc
++ktapp.moc: $(srcdir)/ktapp.h
++ $(MOC) $(srcdir)/ktapp.h -o ktapp.moc
+
+ #>+ 2
+-mocs: kttask.moc
++mocs: ktapp.moc
+
+ #>+ 3
+-ktapp.moc: $(srcdir)/ktapp.h
+- $(MOC) $(srcdir)/ktapp.h -o ktapp.moc
++kttask.moc: $(srcdir)/kttask.h
++ $(MOC) $(srcdir)/kttask.h -o kttask.moc
+
+ #>+ 2
+-mocs: ktapp.moc
++mocs: kttask.moc
+
+ #>+ 3
+ ktprintopt.moc: $(srcdir)/ktprintopt.h
+@@ -889,7 +892,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ktvariable.moc kttask.moc ktapp.moc ktprintopt.moc ktview.moc
++ -rm -f ktvariable.moc ktapp.moc kttask.moc ktprintopt.moc ktview.moc
+
+ #>+ 2
+ KDE_DIST=README.hacking README.translators cr16-app-kcron.png kcronui.rc cr32-app-kcron.png configure.in.in Makefile.in
+@@ -899,14 +902,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcron.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcron.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcron.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcron.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcron.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcron.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcron.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcron.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcron.png
+
+ #>+ 15
+ force-reedit:
+@@ -947,7 +950,7 @@
+
+
+ #>+ 11
+-kcron.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cthost.cpp $(srcdir)/ctcron.cpp $(srcdir)/ctmonth.cpp $(srcdir)/ctdom.cpp $(srcdir)/ctdow.cpp $(srcdir)/cttask.cpp $(srcdir)/ctvariable.cpp $(srcdir)/kticon.cpp $(srcdir)/ktapp.cpp $(srcdir)/ktview.cpp $(srcdir)/ktlistitem.cpp $(srcdir)/ktlistcron.cpp $(srcdir)/ktlisttask.cpp $(srcdir)/ktlisttasks.cpp $(srcdir)/ktlistvar.cpp $(srcdir)/ktlistvars.cpp $(srcdir)/kttask.cpp $(srcdir)/ktvariable.cpp $(srcdir)/ktprint.cpp $(srcdir)/ktprintopt.cpp $(srcdir)/main.cpp ktvariable.moc ktapp.moc kttask.moc ktprintopt.moc ktview.moc
++kcron.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cthost.cpp $(srcdir)/ctcron.cpp $(srcdir)/ctmonth.cpp $(srcdir)/ctdom.cpp $(srcdir)/ctdow.cpp $(srcdir)/cttask.cpp $(srcdir)/ctvariable.cpp $(srcdir)/kticon.cpp $(srcdir)/ktapp.cpp $(srcdir)/ktview.cpp $(srcdir)/ktlistitem.cpp $(srcdir)/ktlistcron.cpp $(srcdir)/ktlisttask.cpp $(srcdir)/ktlisttasks.cpp $(srcdir)/ktlistvar.cpp $(srcdir)/ktlistvars.cpp $(srcdir)/kttask.cpp $(srcdir)/ktvariable.cpp $(srcdir)/ktprint.cpp $(srcdir)/ktprintopt.cpp $(srcdir)/main.cpp ktvariable.moc kttask.moc ktapp.moc ktprintopt.moc ktview.moc
+ @echo 'creating kcron.all_cpp.cpp ...'; \
+ rm -f kcron.all_cpp.files kcron.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcron.all_cpp.final; \
diff -Nrua kdeadmin-3.4.0.orig/kdat/Makefile.in kdeadmin-3.4.0/kdat/Makefile.in
---- kdeadmin-3.4.0.orig/kdat/Makefile.in 2005-03-04 21:29:47.731428386 +0100
-+++ kdeadmin-3.4.0/kdat/Makefile.in 2005-03-04 21:30:24.146114291 +0100
+--- kdeadmin-3.4.0.orig/kdat/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/kdat/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20320,9 +8286,82 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -989,11 +1004,11 @@
+ mocs: TapeInfoWidget.moc
+
+ #>+ 3
+-Options.moc: $(srcdir)/Options.h
+- $(MOC) $(srcdir)/Options.h -o Options.moc
++BackupProfileManager.moc: $(srcdir)/BackupProfileManager.h
++ $(MOC) $(srcdir)/BackupProfileManager.h -o BackupProfileManager.moc
+
+ #>+ 2
+-mocs: Options.moc
++mocs: BackupProfileManager.moc
+
+ #>+ 3
+ InfoShellWidget.moc: $(srcdir)/InfoShellWidget.h
+@@ -1003,11 +1018,11 @@
+ mocs: InfoShellWidget.moc
+
+ #>+ 3
+-BackupProfileManager.moc: $(srcdir)/BackupProfileManager.h
+- $(MOC) $(srcdir)/BackupProfileManager.h -o BackupProfileManager.moc
++Options.moc: $(srcdir)/Options.h
++ $(MOC) $(srcdir)/Options.h -o Options.moc
+
+ #>+ 2
+-mocs: BackupProfileManager.moc
++mocs: Options.moc
+
+ #>+ 3
+ VerifyOptDlg.moc: $(srcdir)/VerifyOptDlg.h
+@@ -1031,18 +1046,18 @@
+ mocs: BackupProfileWidget.moc
+
+ #>+ 3
+-TapeManager.moc: $(srcdir)/TapeManager.h
+- $(MOC) $(srcdir)/TapeManager.h -o TapeManager.moc
++FormatOptDlg.moc: $(srcdir)/FormatOptDlg.h
++ $(MOC) $(srcdir)/FormatOptDlg.h -o FormatOptDlg.moc
+
+ #>+ 2
+-mocs: TapeManager.moc
++mocs: FormatOptDlg.moc
+
+ #>+ 3
+-FormatOptDlg.moc: $(srcdir)/FormatOptDlg.h
+- $(MOC) $(srcdir)/FormatOptDlg.h -o FormatOptDlg.moc
++TapeManager.moc: $(srcdir)/TapeManager.h
++ $(MOC) $(srcdir)/TapeManager.h -o TapeManager.moc
+
+ #>+ 2
+-mocs: FormatOptDlg.moc
++mocs: TapeManager.moc
+
+ #>+ 3
+ FileInfoWidget.moc: $(srcdir)/FileInfoWidget.h
+@@ -1144,7 +1159,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f TapeInfoWidget.moc Options.moc InfoShellWidget.moc BackupProfileManager.moc VerifyOptDlg.moc VerifyDlg.moc BackupProfileWidget.moc TapeManager.moc FormatOptDlg.moc FileInfoWidget.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
++ -rm -f TapeInfoWidget.moc BackupProfileManager.moc InfoShellWidget.moc Options.moc VerifyOptDlg.moc VerifyDlg.moc BackupProfileWidget.moc FormatOptDlg.moc TapeManager.moc FileInfoWidget.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
+
+ #>+ 2
+ KDE_DIST=OptionsDlgWidget.ui.h large-kdat.png CREDITS KDat.kdoc OptionsDlgWidget.ui RELEASE_NOTES configure.in.in Makefile.in kdat.desktop Makefile.am
+@@ -1196,7 +1211,7 @@
+
+
+ #>+ 11
+-kdat.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Archive.cpp $(srcdir)/ArchiveInfoWidget.cpp $(srcdir)/BackupDlg.cpp $(srcdir)/BackupOptDlg.cpp $(srcdir)/BackupProfile.cpp $(srcdir)/BackupProfileInfoWidget.cpp $(srcdir)/BackupProfileManager.cpp $(srcdir)/BackupProfileWidget.cpp $(srcdir)/ErrorHandler.cpp $(srcdir)/File.cpp $(srcdir)/FileInfoWidget.cpp $(srcdir)/ImageCache.cpp $(srcdir)/IndexDlg.cpp $(srcdir)/InfoShellWidget.cpp $(srcdir)/KDat.cpp $(srcdir)/LoggerWidget.cpp $(srcdir)/Node.cpp $(srcdir)/Options.cpp $(srcdir)/OptionsDlg.cpp $(srcdir)/Range.cpp $(srcdir)/Tape.cpp $(srcdir)/TapeDrive.cpp $(srcdir)/TapeFileInfoWidget.cpp $(srcdir)/TapeInfoWidget.cpp $(srcdir)/TapeManager.cpp $(srcdir)/FormatOptDlg.cpp $(srcdir)/TarParser.cpp $(srcdir)/Util.cpp $(srcdir)/VerifyDlg.cpp $(srcdir)/VerifyOptDlg.cpp $(srcdir)/ktreeview.cpp $(srcdir)/main.cpp OptionsDlgWidget.cpp TapeInfoWidget.moc BackupProfileManager.moc InfoShellWidget.moc Options.moc BackupProfileWidget.moc VerifyDlg.moc VerifyOptDlg.moc FileInfoWidget.moc FormatOptDlg.moc TapeManager.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc OptionsDlgWidget.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
++kdat.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Archive.cpp $(srcdir)/ArchiveInfoWidget.cpp $(srcdir)/BackupDlg.cpp $(srcdir)/BackupOptDlg.cpp $(srcdir)/BackupProfile.cpp $(srcdir)/BackupProfileInfoWidget.cpp $(srcdir)/BackupProfileManager.cpp $(srcdir)/BackupProfileWidget.cpp $(srcdir)/ErrorHandler.cpp $(srcdir)/File.cpp $(srcdir)/FileInfoWidget.cpp $(srcdir)/ImageCache.cpp $(srcdir)/IndexDlg.cpp $(srcdir)/InfoShellWidget.cpp $(srcdir)/KDat.cpp $(srcdir)/LoggerWidget.cpp $(srcdir)/Node.cpp $(srcdir)/Options.cpp $(srcdir)/OptionsDlg.cpp $(srcdir)/Range.cpp $(srcdir)/Tape.cpp $(srcdir)/TapeDrive.cpp $(srcdir)/TapeFileInfoWidget.cpp $(srcdir)/TapeInfoWidget.cpp $(srcdir)/TapeManager.cpp $(srcdir)/FormatOptDlg.cpp $(srcdir)/TarParser.cpp $(srcdir)/Util.cpp $(srcdir)/VerifyDlg.cpp $(srcdir)/VerifyOptDlg.cpp $(srcdir)/ktreeview.cpp $(srcdir)/main.cpp OptionsDlgWidget.cpp TapeInfoWidget.moc Options.moc InfoShellWidget.moc BackupProfileManager.moc BackupProfileWidget.moc VerifyDlg.moc VerifyOptDlg.moc FileInfoWidget.moc TapeManager.moc FormatOptDlg.moc BackupDlg.moc ArchiveInfoWidget.moc Node.moc OptionsDlgWidget.moc TarParser.moc OptionsDlg.moc IndexDlg.moc TapeDrive.moc LoggerWidget.moc ktreeview.moc BackupOptDlg.moc KDat.moc TapeFileInfoWidget.moc BackupProfileInfoWidget.moc
+ @echo 'creating kdat.all_cpp.cpp ...'; \
+ rm -f kdat.all_cpp.files kdat.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kdat.all_cpp.final; \
diff -Nrua kdeadmin-3.4.0.orig/kdat/pics/Makefile.in kdeadmin-3.4.0/kdat/pics/Makefile.in
---- kdeadmin-3.4.0.orig/kdat/pics/Makefile.in 2005-03-04 21:29:47.725428932 +0100
-+++ kdeadmin-3.4.0/kdat/pics/Makefile.in 2005-03-04 21:30:24.157113290 +0100
+--- kdeadmin-3.4.0.orig/kdat/pics/Makefile.in 2005-03-04 07:09:28.000000000 -0500
++++ kdeadmin-3.4.0/kdat/pics/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20366,78 +8405,154 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/deb/Makefile.in kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in
---- kdeadmin-3.4.0.orig/kfile-plugins/deb/Makefile.in 2005-03-04 21:29:47.731428386 +0100
-+++ kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in 2005-03-04 21:30:24.172111925 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
+@@ -503,91 +506,91 @@
+ .NOEXPORT:
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
#>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-KDE_DIST=cr16-app-kdat_select_none.png lo16-app-kdat_select_none.png cr16-app-kdat_select_all.png lo16-app-kdat_restore.png cr16-app-kdat_select_some.png lo16-app-kdat_select_some.png lo16-app-kdat_verify.png cr48-app-kdat.png lo16-app-kdat.png cr16-app-kdat_eject.png cr32-app-kdat_restore.png lo16-app-kdat_mounted.png cr16-app-kdat_verify.png cr32-app-kdat_backup.png lo32-app-kdat.png cr16-app-kdat_mounted.png lo16-app-kdat_archive.png cr16-app-kdat.png lo16-app-kdat_unmounted.png lo16-app-kdat_backup.png cr32-app-kdat_verify.png Makefile.in cr32-app-kdat.png lo16-app-kdat_eject.png cr16-app-kdat_restore.png cr16-app-kdat_unmounted.png cr16-app-kdat_backup.png cr16-app-kdat_archive.png lo16-app-kdat_select_all.png Makefile.am
++KDE_DIST=cr16-app-kdat_select_none.png lo16-app-kdat_select_none.png cr16-app-kdat_select_all.png lo16-app-kdat_restore.png cr16-app-kdat_select_some.png lo16-app-kdat_select_some.png lo16-app-kdat_verify.png cr48-app-kdat.png lo16-app-kdat.png cr16-app-kdat_eject.png cr32-app-kdat_restore.png lo16-app-kdat_mounted.png cr16-app-kdat_verify.png cr32-app-kdat_backup.png lo32-app-kdat.png cr16-app-kdat_mounted.png lo16-app-kdat_archive.png cr16-app-kdat.png lo16-app-kdat_unmounted.png cr32-app-kdat_verify.png lo16-app-kdat_backup.png Makefile.in cr32-app-kdat.png lo16-app-kdat_eject.png cr16-app-kdat_restore.png cr16-app-kdat_unmounted.png cr16-app-kdat_backup.png cr16-app-kdat_archive.png lo16-app-kdat_select_all.png Makefile.am
+
#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_deb_la_SOURCES)
- DIST_SOURCES = $(kfile_deb_la_SOURCES)
-@@ -214,6 +214,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+ docs-am:
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -419,9 +422,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 80
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
++ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/lo32-app-kdat.png $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
++ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
+ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_archive.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_archive.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_restore.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_all.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_all.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_verify.png
+ $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_backup.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_restore.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_archive.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_verify.png
+- $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
+- $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_archive.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_eject.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_restore.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_backup.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_verify.png
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_all.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_all.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_none.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
+- $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_unmounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_select_some.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat.png $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_backup.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_restore.png
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_verify.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_verify.png
+- $(mkinstalldirs) $(DESTDIR)$(kdaticondir)/locolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/lo32-app-kdat.png $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_mounted.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
++ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat_restore.png $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_restore.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/lo32-app-kdat.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kdat.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdat.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kdat.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kdat.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/lo32-app-kdat.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kdat.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_archive.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_restore.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_all.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_verify.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_backup.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_restore.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
+ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_verify.png
+- -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/48x48/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_eject.png
+ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_archive.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_backup.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_eject.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_restore.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat_backup.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_unmounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_none.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_verify.png
+ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_all.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_none.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_select_some.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_unmounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_select_some.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/32x32/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_mounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_backup.png
++ -rm -f $(DESTDIR)$(kdaticondir)/crystalsvg/16x16/apps/kdat_restore.png
+ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_verify.png
+- -rm -f $(DESTDIR)$(kdaticondir)/locolor/32x32/apps/kdat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_mounted.png
++ -rm -f $(DESTDIR)$(kdaticondir)/locolor/16x16/apps/kdat_restore.png
++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kdat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kdat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kdat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdat.png
+
+ #>+ 15
+ force-reedit:
diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/Makefile.in kdeadmin-3.4.0/kfile-plugins/Makefile.in
---- kdeadmin-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 21:29:47.732428295 +0100
-+++ kdeadmin-3.4.0/kfile-plugins/Makefile.in 2005-03-04 21:30:24.162112835 +0100
+--- kdeadmin-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kfile-plugins/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20529,9 +8644,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/rpm/Makefile.in kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in
---- kdeadmin-3.4.0.orig/kfile-plugins/rpm/Makefile.in 2005-03-04 21:29:47.731428386 +0100
-+++ kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in 2005-03-04 21:30:24.182111015 +0100
+diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/deb/Makefile.in kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in
+--- kdeadmin-3.4.0.orig/kfile-plugins/deb/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kfile-plugins/deb/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20565,8 +8680,8 @@
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_rpm_la_SOURCES)
- DIST_SOURCES = $(kfile_rpm_la_SOURCES)
+ SOURCES = $(kfile_deb_la_SOURCES)
+ DIST_SOURCES = $(kfile_deb_la_SOURCES)
@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -20598,9 +8713,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeadmin-3.4.0.orig/kpackage/icon/Makefile.in kdeadmin-3.4.0/kpackage/icon/Makefile.in
---- kdeadmin-3.4.0.orig/kpackage/icon/Makefile.in 2005-03-04 21:29:47.732428295 +0100
-+++ kdeadmin-3.4.0/kpackage/icon/Makefile.in 2005-03-04 21:30:24.250104827 +0100
+diff -Nrua kdeadmin-3.4.0.orig/kfile-plugins/rpm/Makefile.in kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in
+--- kdeadmin-3.4.0.orig/kfile-plugins/rpm/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kfile-plugins/rpm/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20613,7 +8728,30 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -166,6 +166,9 @@
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfile_rpm_la_SOURCES)
+ DIST_SOURCES = $(kfile_rpm_la_SOURCES)
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20623,16 +8761,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,7 +321,7 @@
- all: docs-am all-am
+@@ -381,7 +384,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -356,9 +359,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20642,11 +8780,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
diff -Nrua kdeadmin-3.4.0.orig/kpackage/Makefile.in kdeadmin-3.4.0/kpackage/Makefile.in
---- kdeadmin-3.4.0.orig/kpackage/Makefile.in 2005-03-04 21:29:47.739427658 +0100
-+++ kdeadmin-3.4.0/kpackage/Makefile.in 2005-03-04 21:30:24.244105373 +0100
+--- kdeadmin-3.4.0.orig/kpackage/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20761,9 +8899,156 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -878,18 +893,18 @@
+ .NOEXPORT:
+
+ #>+ 3
+-search.moc: $(srcdir)/search.h
+- $(MOC) $(srcdir)/search.h -o search.moc
++procbuf.moc: $(srcdir)/procbuf.h
++ $(MOC) $(srcdir)/procbuf.h -o procbuf.moc
+
+ #>+ 2
+-mocs: search.moc
++mocs: procbuf.moc
+
+ #>+ 3
+-procbuf.moc: $(srcdir)/procbuf.h
+- $(MOC) $(srcdir)/procbuf.h -o procbuf.moc
++search.moc: $(srcdir)/search.h
++ $(MOC) $(srcdir)/search.h -o search.moc
+
+ #>+ 2
+-mocs: procbuf.moc
++mocs: search.moc
+
+ #>+ 3
+ options.moc: $(srcdir)/options.h
+@@ -934,18 +949,18 @@
+ mocs: kpTerm.moc
+
+ #>+ 3
+-rpmInterface.moc: $(srcdir)/rpmInterface.h
+- $(MOC) $(srcdir)/rpmInterface.h -o rpmInterface.moc
++packageProperties.moc: $(srcdir)/packageProperties.h
++ $(MOC) $(srcdir)/packageProperties.h -o packageProperties.moc
+
+ #>+ 2
+-mocs: rpmInterface.moc
++mocs: packageProperties.moc
+
+ #>+ 3
+-packageProperties.moc: $(srcdir)/packageProperties.h
+- $(MOC) $(srcdir)/packageProperties.h -o packageProperties.moc
++rpmInterface.moc: $(srcdir)/rpmInterface.h
++ $(MOC) $(srcdir)/rpmInterface.h -o rpmInterface.moc
+
+ #>+ 2
+-mocs: packageProperties.moc
++mocs: rpmInterface.moc
+
+ #>+ 3
+ kissInterface.moc: $(srcdir)/kissInterface.h
+@@ -1040,10 +1055,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f search.moc procbuf.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpackage.moc kpTerm.moc rpmInterface.moc packageProperties.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc gentooInterface.moc debDpkgInterface.moc findf.moc kio.moc packageDisplay.moc updateLoc.moc debInterface.moc pkgOptions.moc
++ -rm -f procbuf.moc search.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpackage.moc kpTerm.moc packageProperties.moc rpmInterface.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc gentooInterface.moc debDpkgInterface.moc findf.moc kio.moc packageDisplay.moc updateLoc.moc debInterface.moc pkgOptions.moc
+
+ #>+ 2
+-KDE_DIST=kpackage.desktop debInterface.h pkgInterface.h kpackage.h findf.h kio.h packageDisplay.h managementWidget.h options.h kplview.h packageProperties.h procbuf.h updateLoc.h kpPty.h slackInterface.h kpackageui.rc CHANGES kpTerm.h rpmInterface.h search.h fbsdInterface.h debAptInterface.h gentooInterface.h pkgOptions.h kissInterface.h utils.h cache.h Makefile.in packageInfo.h debDpkgInterface.h Makefile.am
++KDE_DIST=kpackage.desktop debInterface.h pkgInterface.h kpackage.h findf.h kio.h packageDisplay.h managementWidget.h options.h kplview.h packageProperties.h procbuf.h updateLoc.h kpPty.h slackInterface.h kpackageui.rc CHANGES kpTerm.h rpmInterface.h search.h fbsdInterface.h debAptInterface.h gentooInterface.h pkgOptions.h kissInterface.h cache.h utils.h Makefile.in packageInfo.h debDpkgInterface.h Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -1087,7 +1102,7 @@
+
+
+ #>+ 11
+-kpackage.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpackage.cpp $(srcdir)/managementWidget.cpp $(srcdir)/packageDisplay.cpp $(srcdir)/packageProperties.cpp $(srcdir)/findf.cpp $(srcdir)/search.cpp $(srcdir)/options.cpp $(srcdir)/pkgOptions.cpp $(srcdir)/packageInfo.cpp $(srcdir)/cache.cpp $(srcdir)/main.cpp $(srcdir)/utils.cpp $(srcdir)/kio.cpp $(srcdir)/debInterface.cpp $(srcdir)/debDpkgInterface.cpp $(srcdir)/debAptInterface.cpp $(srcdir)/updateLoc.cpp $(srcdir)/procbuf.cpp $(srcdir)/kplview.cpp $(srcdir)/pkgInterface.cpp $(srcdir)/rpmInterface.cpp $(srcdir)/kissInterface.cpp $(srcdir)/slackInterface.cpp $(srcdir)/fbsdInterface.cpp $(srcdir)/gentooInterface.cpp $(srcdir)/kpPty.cpp $(srcdir)/kpTerm.cpp procbuf.moc search.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpackage.moc kpTerm.moc packageProperties.moc rpmInterface.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc debDpkgInterface.moc gentooInterface.moc findf.moc packageDisplay.moc kio.moc debInterface.moc updateLoc.moc pkgOptions.moc
++kpackage.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpackage.cpp $(srcdir)/managementWidget.cpp $(srcdir)/packageDisplay.cpp $(srcdir)/packageProperties.cpp $(srcdir)/findf.cpp $(srcdir)/search.cpp $(srcdir)/options.cpp $(srcdir)/pkgOptions.cpp $(srcdir)/packageInfo.cpp $(srcdir)/cache.cpp $(srcdir)/main.cpp $(srcdir)/utils.cpp $(srcdir)/kio.cpp $(srcdir)/debInterface.cpp $(srcdir)/debDpkgInterface.cpp $(srcdir)/debAptInterface.cpp $(srcdir)/updateLoc.cpp $(srcdir)/procbuf.cpp $(srcdir)/kplview.cpp $(srcdir)/pkgInterface.cpp $(srcdir)/rpmInterface.cpp $(srcdir)/kissInterface.cpp $(srcdir)/slackInterface.cpp $(srcdir)/fbsdInterface.cpp $(srcdir)/gentooInterface.cpp $(srcdir)/kpPty.cpp $(srcdir)/kpTerm.cpp search.moc procbuf.moc options.moc kplview.moc fbsdInterface.moc slackInterface.moc kpackage.moc kpTerm.moc rpmInterface.moc packageProperties.moc kissInterface.moc pkgInterface.moc debAptInterface.moc kpPty.moc managementWidget.moc debDpkgInterface.moc gentooInterface.moc findf.moc packageDisplay.moc kio.moc debInterface.moc updateLoc.moc pkgOptions.moc
+ @echo 'creating kpackage.all_cpp.cpp ...'; \
+ rm -f kpackage.all_cpp.files kpackage.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kpackage.all_cpp.final; \
+diff -Nrua kdeadmin-3.4.0.orig/kpackage/icon/Makefile.in kdeadmin-3.4.0/kpackage/icon/Makefile.in
+--- kdeadmin-3.4.0.orig/kpackage/icon/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/icon/Makefile.in 2005-03-04 23:09:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -166,6 +166,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -318,7 +321,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -356,9 +359,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+@@ -508,22 +511,22 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpackage.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpackage.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpackage.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpackage.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpackage.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpackage.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kpackage.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpackage.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpackage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpackage.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpackage.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kpackage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpackage.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpackage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kpackage.png
+
+ #>+ 15
diff -Nrua kdeadmin-3.4.0.orig/kpackage/mimetypes/Makefile.in kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in
---- kdeadmin-3.4.0.orig/kpackage/mimetypes/Makefile.in 2005-03-04 21:29:47.737427840 +0100
-+++ kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in 2005-03-04 21:30:24.255104372 +0100
+--- kdeadmin-3.4.0.orig/kpackage/mimetypes/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20808,8 +9093,8 @@
mostlyclean-libtool:
diff -Nrua kdeadmin-3.4.0.orig/kpackage/pics/Makefile.in kdeadmin-3.4.0/kpackage/pics/Makefile.in
---- kdeadmin-3.4.0.orig/kpackage/pics/Makefile.in 2005-03-04 21:29:47.738427749 +0100
-+++ kdeadmin-3.4.0/kpackage/pics/Makefile.in 2005-03-04 21:30:24.260103917 +0100
+--- kdeadmin-3.4.0.orig/kpackage/pics/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/pics/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20853,9 +9138,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -532,7 +535,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=dnew.png bupdated.png snew.png deb.png cross.png kupdated.png bnew.png dupdated.png rupdated.png rpm.png rnew.png slack.png ptick.png noball.png supdated.png Makefile.in dbad.png tick.png question.png kiss.png bsd.png knew.png Makefile.am
++KDE_DIST=dnew.png bupdated.png snew.png deb.png cross.png kupdated.png bnew.png dupdated.png rupdated.png rpm.png rnew.png slack.png noball.png ptick.png supdated.png Makefile.in dbad.png tick.png question.png kiss.png bsd.png knew.png Makefile.am
+
+ #>+ 2
+ docs-am:
diff -Nrua kdeadmin-3.4.0.orig/kpackage/toolbar/Makefile.in kdeadmin-3.4.0/kpackage/toolbar/Makefile.in
---- kdeadmin-3.4.0.orig/kpackage/toolbar/Makefile.in 2005-03-04 21:29:47.738427749 +0100
-+++ kdeadmin-3.4.0/kpackage/toolbar/Makefile.in 2005-03-04 21:30:24.265103462 +0100
+--- kdeadmin-3.4.0.orig/kpackage/toolbar/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kpackage/toolbar/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -20900,8 +9194,8 @@
mostlyclean-libtool:
diff -Nrua kdeadmin-3.4.0.orig/ksysv/Makefile.in kdeadmin-3.4.0/ksysv/Makefile.in
---- kdeadmin-3.4.0.orig/ksysv/Makefile.in 2005-03-04 21:29:47.744427203 +0100
-+++ kdeadmin-3.4.0/ksysv/Makefile.in 2005-03-04 21:30:24.317098730 +0100
+--- kdeadmin-3.4.0.orig/ksysv/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/ksysv/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21029,9 +9323,115 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1088,18 +1103,18 @@
+ mocs: ServiceDlg.moc
+
+ #>+ 3
+-ksvdrag.moc: $(srcdir)/ksvdrag.h
+- $(MOC) $(srcdir)/ksvdrag.h -o ksvdrag.moc
++ksvdraglist.moc: $(srcdir)/ksvdraglist.h
++ $(MOC) $(srcdir)/ksvdraglist.h -o ksvdraglist.moc
+
+ #>+ 2
+-mocs: ksvdrag.moc
++mocs: ksvdraglist.moc
+
+ #>+ 3
+-ksvdraglist.moc: $(srcdir)/ksvdraglist.h
+- $(MOC) $(srcdir)/ksvdraglist.h -o ksvdraglist.moc
++ksvdrag.moc: $(srcdir)/ksvdrag.h
++ $(MOC) $(srcdir)/ksvdrag.h -o ksvdrag.moc
+
+ #>+ 2
+-mocs: ksvdraglist.moc
++mocs: ksvdrag.moc
+
+ #>+ 3
+ RunlevelAuthIcon.moc: $(srcdir)/RunlevelAuthIcon.h
+@@ -1123,18 +1138,18 @@
+ mocs: TopWidget.moc
+
+ #>+ 3
+-trash.moc: $(srcdir)/trash.h
+- $(MOC) $(srcdir)/trash.h -o trash.moc
++PreferencesDialog.moc: $(srcdir)/PreferencesDialog.h
++ $(MOC) $(srcdir)/PreferencesDialog.h -o PreferencesDialog.moc
+
+ #>+ 2
+-mocs: trash.moc
++mocs: PreferencesDialog.moc
+
+ #>+ 3
+-PreferencesDialog.moc: $(srcdir)/PreferencesDialog.h
+- $(MOC) $(srcdir)/PreferencesDialog.h -o PreferencesDialog.moc
++trash.moc: $(srcdir)/trash.h
++ $(MOC) $(srcdir)/trash.h -o trash.moc
+
+ #>+ 2
+-mocs: PreferencesDialog.moc
++mocs: trash.moc
+
+ #>+ 3
+ ActionList.moc: $(srcdir)/ActionList.h
+@@ -1159,7 +1174,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc ServiceDlg.moc ksvdrag.moc ksvdraglist.moc RunlevelAuthIcon.moc ksvpathconfig.moc TopWidget.moc trash.moc PreferencesDialog.moc ActionList.moc ksvlookandfeel.moc kscroller.moc
++ -rm -f ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc ServiceDlg.moc ksvdraglist.moc ksvdrag.moc RunlevelAuthIcon.moc ksvpathconfig.moc TopWidget.moc PreferencesDialog.moc trash.moc ActionList.moc ksvlookandfeel.moc kscroller.moc
+
+ #>+ 2
+ KDE_DIST=x-ksysv-log.desktop pathconfig.ui cr16-app-ksysv.png cr48-app-ksysv.png configwizard.ui x-ksysv.desktop miscconfig.ui ksysv.desktop configure.in.in Makefile.in genui.sh cr32-app-ksysv.png lookandfeelconfig.ui ksysvui.rc Makefile.am
+@@ -1177,17 +1192,17 @@
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysv.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysv.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysv.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysv.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-ksysv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysv.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysv.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysv.png
+
+ #>+ 15
+ force-reedit:
+@@ -1228,7 +1243,7 @@
+
+
+ #>+ 11
+-ksysv.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ActionList.cpp $(srcdir)/IOCore.cpp $(srcdir)/ksvdraglist.cpp $(srcdir)/RunlevelAuthIcon.cpp $(srcdir)/OldView.cpp $(srcdir)/Properties.cpp $(srcdir)/SpinBox.cpp $(srcdir)/ServiceDlg.cpp $(srcdir)/TopWidget.cpp $(srcdir)/Data.cpp $(srcdir)/ksv_conf.cpp $(srcdir)/ksvapplication.cpp $(srcdir)/kdltooltip.cpp $(srcdir)/ksv_core.cpp $(srcdir)/ksvdrag.cpp $(srcdir)/kscroller.cpp $(srcdir)/ksv_service.cpp $(srcdir)/PreferencesDialog.cpp $(srcdir)/trash.cpp $(srcdir)/ksvpathconfig.cpp $(srcdir)/ksvmiscconfig.cpp $(srcdir)/ksvlookandfeel.cpp $(srcdir)/ksvconfigwizard.cpp $(srcdir)/kbusymanager.cpp pathconfig.cpp miscconfig.cpp lookandfeelconfig.cpp configwizard.cpp ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc lookandfeelconfig.moc ServiceDlg.moc ksvdrag.moc ksvdraglist.moc RunlevelAuthIcon.moc ksvpathconfig.moc miscconfig.moc TopWidget.moc PreferencesDialog.moc trash.moc ksvlookandfeel.moc ActionList.moc pathconfig.moc kscroller.moc configwizard.moc
++ksysv.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ActionList.cpp $(srcdir)/IOCore.cpp $(srcdir)/ksvdraglist.cpp $(srcdir)/RunlevelAuthIcon.cpp $(srcdir)/OldView.cpp $(srcdir)/Properties.cpp $(srcdir)/SpinBox.cpp $(srcdir)/ServiceDlg.cpp $(srcdir)/TopWidget.cpp $(srcdir)/Data.cpp $(srcdir)/ksv_conf.cpp $(srcdir)/ksvapplication.cpp $(srcdir)/kdltooltip.cpp $(srcdir)/ksv_core.cpp $(srcdir)/ksvdrag.cpp $(srcdir)/kscroller.cpp $(srcdir)/ksv_service.cpp $(srcdir)/PreferencesDialog.cpp $(srcdir)/trash.cpp $(srcdir)/ksvpathconfig.cpp $(srcdir)/ksvmiscconfig.cpp $(srcdir)/ksvlookandfeel.cpp $(srcdir)/ksvconfigwizard.cpp $(srcdir)/kbusymanager.cpp pathconfig.cpp miscconfig.cpp lookandfeelconfig.cpp configwizard.cpp ksvconfigwizard.moc ksvmiscconfig.moc OldView.moc Properties.moc ksvapplication.moc SpinBox.moc lookandfeelconfig.moc ServiceDlg.moc ksvdraglist.moc ksvdrag.moc RunlevelAuthIcon.moc ksvpathconfig.moc miscconfig.moc TopWidget.moc trash.moc PreferencesDialog.moc ksvlookandfeel.moc ActionList.moc pathconfig.moc kscroller.moc configwizard.moc
+ @echo 'creating ksysv.all_cpp.cpp ...'; \
+ rm -f ksysv.all_cpp.files ksysv.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> ksysv.all_cpp.final; \
+@@ -1281,11 +1296,11 @@
+ nmcheck-am: nmcheck
+ ksvmiscconfig.lo: ksvmiscconfig.moc
+ ServiceDlg.lo: ServiceDlg.moc
+-ksvdraglist.o: ksvdraglist.moc
+ SpinBox.lo: SpinBox.moc
++ksvdraglist.o: ksvdraglist.moc
+ TopWidget.lo: TopWidget.moc
+-ksvdraglist.lo: ksvdraglist.moc
+ ServiceDlg.o: ServiceDlg.moc
++ksvdraglist.lo: ksvdraglist.moc
+ ksvlookandfeel.lo: ksvlookandfeel.moc
+ OldView.lo: OldView.moc
+ ksvdrag.lo: ksvdrag.moc
diff -Nrua kdeadmin-3.4.0.orig/ksysv/pics/Makefile.in kdeadmin-3.4.0/ksysv/pics/Makefile.in
---- kdeadmin-3.4.0.orig/ksysv/pics/Makefile.in 2005-03-04 21:29:47.739427658 +0100
-+++ kdeadmin-3.4.0/ksysv/pics/Makefile.in 2005-03-04 21:30:24.323098184 +0100
+--- kdeadmin-3.4.0.orig/ksysv/pics/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/ksysv/pics/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21076,8 +9476,8 @@
mostlyclean-libtool:
diff -Nrua kdeadmin-3.4.0.orig/ksysv/toolbar/Makefile.in kdeadmin-3.4.0/ksysv/toolbar/Makefile.in
---- kdeadmin-3.4.0.orig/ksysv/toolbar/Makefile.in 2005-03-04 21:29:47.744427203 +0100
-+++ kdeadmin-3.4.0/ksysv/toolbar/Makefile.in 2005-03-04 21:30:24.329097638 +0100
+--- kdeadmin-3.4.0.orig/ksysv/toolbar/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/ksysv/toolbar/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21121,55 +9521,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeadmin-3.4.0.orig/kuser/icon/Makefile.in kdeadmin-3.4.0/kuser/icon/Makefile.in
---- kdeadmin-3.4.0.orig/kuser/icon/Makefile.in 2005-03-04 21:29:47.749426748 +0100
-+++ kdeadmin-3.4.0/kuser/icon/Makefile.in 2005-03-04 21:30:24.374093543 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -166,6 +166,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -318,7 +321,7 @@
- all: docs-am all-am
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -356,9 +359,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
diff -Nrua kdeadmin-3.4.0.orig/kuser/Makefile.in kdeadmin-3.4.0/kuser/Makefile.in
---- kdeadmin-3.4.0.orig/kuser/Makefile.in 2005-03-04 21:29:47.750426657 +0100
-+++ kdeadmin-3.4.0/kuser/Makefile.in 2005-03-04 21:30:24.368094089 +0100
+--- kdeadmin-3.4.0.orig/kuser/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kuser/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21297,9 +9651,171 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -975,13 +990,6 @@
+ mocs: addUser.moc
+
+ #>+ 3
+-pwddlg.moc: $(srcdir)/pwddlg.h
+- $(MOC) $(srcdir)/pwddlg.h -o pwddlg.moc
+-
+-#>+ 2
+-mocs: pwddlg.moc
+-
+-#>+ 3
+ propdlg.moc: $(srcdir)/propdlg.h
+ $(MOC) $(srcdir)/propdlg.h -o propdlg.moc
+
+@@ -996,18 +1004,18 @@
+ mocs: editGroup.moc
+
+ #>+ 3
+-kuserldap.moc: $(srcdir)/kuserldap.h
+- $(MOC) $(srcdir)/kuserldap.h -o kuserldap.moc
++pwddlg.moc: $(srcdir)/pwddlg.h
++ $(MOC) $(srcdir)/pwddlg.h -o pwddlg.moc
+
+ #>+ 2
+-mocs: kuserldap.moc
++mocs: pwddlg.moc
+
+ #>+ 3
+-delUser.moc: $(srcdir)/delUser.h
+- $(MOC) $(srcdir)/delUser.h -o delUser.moc
++kuserldap.moc: $(srcdir)/kuserldap.h
++ $(MOC) $(srcdir)/kuserldap.h -o kuserldap.moc
+
+ #>+ 2
+-mocs: delUser.moc
++mocs: kuserldap.moc
+
+ #>+ 3
+ kgroupldap.moc: $(srcdir)/kgroupldap.h
+@@ -1017,6 +1025,13 @@
+ mocs: kgroupldap.moc
+
+ #>+ 3
++delUser.moc: $(srcdir)/delUser.h
++ $(MOC) $(srcdir)/delUser.h -o delUser.moc
++
++#>+ 2
++mocs: delUser.moc
++
++#>+ 3
+ mainView.moc: $(srcdir)/mainView.h
+ $(MOC) $(srcdir)/mainView.h -o mainView.moc
+
+@@ -1053,10 +1068,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f mainWidget.moc addUser.moc pwddlg.moc propdlg.moc editGroup.moc kuserldap.moc delUser.moc kgroupldap.moc mainView.moc selectconn.moc kgroupvw.moc editDefaults.moc kuservw.moc
++ -rm -f mainWidget.moc addUser.moc propdlg.moc editGroup.moc pwddlg.moc kuserldap.moc kgroupldap.moc delUser.moc mainView.moc selectconn.moc kgroupvw.moc editDefaults.moc kuservw.moc
+
+ #>+ 2
+-KDE_DIST=kuserprefs.kcfgc generalsettings.ui passwordpolicy.ui ldapsamba.ui filessettings.ui configure.in.in stamp-h.in Makefile.in kuserui.rc kuser.kcfg ldapsettings.ui Makefile.am
++KDE_DIST=kuserprefs.kcfgc generalsettings.ui passwordpolicy.ui ldapsamba.ui filessettings.ui configure.in.in stamp-h.in kuserui.rc kuser.kcfg Makefile.in ldapsettings.ui Makefile.am
+
+ #>+ 8
+ clean-ui:
+@@ -1114,7 +1129,7 @@
+
+
+ #>+ 11
+-kuser.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainWidget.cpp $(srcdir)/editGroup.cpp $(srcdir)/kuservw.cpp $(srcdir)/kgroupvw.cpp $(srcdir)/delUser.cpp $(srcdir)/kuser.cpp $(srcdir)/kgroup.cpp $(srcdir)/main.cpp $(srcdir)/mainView.cpp $(srcdir)/propdlg.cpp $(srcdir)/misc.cpp $(srcdir)/pwddlg.cpp $(srcdir)/addUser.cpp $(srcdir)/editDefaults.cpp $(srcdir)/kglobal.cpp $(srcdir)/sid.cpp $(srcdir)/kuserfiles.cpp $(srcdir)/kgroupfiles.cpp $(srcdir)/kuserldap.cpp $(srcdir)/kgroupldap.cpp $(srcdir)/kusersystem.cpp $(srcdir)/kgroupsystem.cpp $(srcdir)/selectconn.cpp $(srcdir)/sha1.cpp $(srcdir)/md4.cpp filessettings.cpp generalsettings.cpp ldapsettings.cpp ldapsamba.cpp passwordpolicy.cpp kuserprefs.cpp mainWidget.moc addUser.moc generalsettings.moc propdlg.moc filessettings.moc pwddlg.moc ldapsamba.moc kgroupvw.moc editDefaults.moc ldapsettings.moc editGroup.moc kuserldap.moc delUser.moc kgroupldap.moc mainView.moc selectconn.moc passwordpolicy.moc kuservw.moc
++kuser.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainWidget.cpp $(srcdir)/editGroup.cpp $(srcdir)/kuservw.cpp $(srcdir)/kgroupvw.cpp $(srcdir)/delUser.cpp $(srcdir)/kuser.cpp $(srcdir)/kgroup.cpp $(srcdir)/main.cpp $(srcdir)/mainView.cpp $(srcdir)/propdlg.cpp $(srcdir)/misc.cpp $(srcdir)/pwddlg.cpp $(srcdir)/addUser.cpp $(srcdir)/editDefaults.cpp $(srcdir)/kglobal.cpp $(srcdir)/sid.cpp $(srcdir)/kuserfiles.cpp $(srcdir)/kgroupfiles.cpp $(srcdir)/kuserldap.cpp $(srcdir)/kgroupldap.cpp $(srcdir)/kusersystem.cpp $(srcdir)/kgroupsystem.cpp $(srcdir)/selectconn.cpp $(srcdir)/sha1.cpp $(srcdir)/md4.cpp filessettings.cpp generalsettings.cpp ldapsettings.cpp ldapsamba.cpp passwordpolicy.cpp kuserprefs.cpp mainWidget.moc addUser.moc generalsettings.moc pwddlg.moc filessettings.moc propdlg.moc ldapsamba.moc kgroupvw.moc editDefaults.moc ldapsettings.moc editGroup.moc kuserldap.moc kgroupldap.moc delUser.moc mainView.moc selectconn.moc passwordpolicy.moc kuservw.moc
+ @echo 'creating kuser.all_cpp.cpp ...'; \
+ rm -f kuser.all_cpp.files kuser.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kuser.all_cpp.final; \
+diff -Nrua kdeadmin-3.4.0.orig/kuser/icon/Makefile.in kdeadmin-3.4.0/kuser/icon/Makefile.in
+--- kdeadmin-3.4.0.orig/kuser/icon/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kuser/icon/Makefile.in 2005-03-04 23:09:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -166,6 +166,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -318,7 +321,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -356,9 +359,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+@@ -501,30 +504,30 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr48-app-kuser.png cr16-app-kuser.png cr128-app-kuser.png cr32-app-kuser.png Makefile.in cr64-app-kuser.png Makefile.am
++KDE_DIST=cr16-app-kuser.png cr48-app-kuser.png cr128-app-kuser.png cr32-app-kuser.png Makefile.in cr64-app-kuser.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 19
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kuser.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kuser.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kuser.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuser.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kuser.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kuser.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kuser.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kuser.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kuser.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kuser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kuser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kuser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kuser.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kuser.png
+
+ #>+ 15
+ force-reedit:
diff -Nrua kdeadmin-3.4.0.orig/kuser/pic/Makefile.in kdeadmin-3.4.0/kuser/pic/Makefile.in
---- kdeadmin-3.4.0.orig/kuser/pic/Makefile.in 2005-03-04 21:29:47.749426748 +0100
-+++ kdeadmin-3.4.0/kuser/pic/Makefile.in 2005-03-04 21:30:24.379093088 +0100
+--- kdeadmin-3.4.0.orig/kuser/pic/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kuser/pic/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21344,8 +9860,8 @@
mostlyclean-libtool:
diff -Nrua kdeadmin-3.4.0.orig/kuser/toolbar/Makefile.in kdeadmin-3.4.0/kuser/toolbar/Makefile.in
---- kdeadmin-3.4.0.orig/kuser/toolbar/Makefile.in 2005-03-04 21:29:47.750426657 +0100
-+++ kdeadmin-3.4.0/kuser/toolbar/Makefile.in 2005-03-04 21:30:24.386092451 +0100
+--- kdeadmin-3.4.0.orig/kuser/toolbar/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/kuser/toolbar/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21389,9 +9905,129 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -510,19 +513,19 @@
+ #>+ 17
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-add_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-add_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-delete_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-delete_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_user.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-add_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-add_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-edit_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_group.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-delete_group.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-edit_user.png $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_user.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+- -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
+- -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_user.png
++ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_user.png
++ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/add_group.png
+ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_group.png
++ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/delete_group.png
+ -rm -f $(DESTDIR)$(kusericonsdir)/crystalsvg/22x22/actions/edit_user.png
+
+ #>+ 15
+diff -Nrua kdeadmin-3.4.0.orig/lilo-config/Makefile.in kdeadmin-3.4.0/lilo-config/Makefile.in
+--- kdeadmin-3.4.0.orig/lilo-config/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/Makefile.in 2005-03-04 23:09:19.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -183,6 +183,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -335,7 +338,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -373,9 +376,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+@@ -395,7 +398,13 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -407,7 +416,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -415,7 +424,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -436,7 +451,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeadmin-3.4.0.orig/lilo-config/common/Makefile.in kdeadmin-3.4.0/lilo-config/common/Makefile.in
---- kdeadmin-3.4.0.orig/lilo-config/common/Makefile.in 2005-03-04 21:29:47.751426566 +0100
-+++ kdeadmin-3.4.0/lilo-config/common/Makefile.in 2005-03-04 21:30:24.400091177 +0100
+--- kdeadmin-3.4.0.orig/lilo-config/common/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/common/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21459,8 +10095,8 @@
clean-noinstLTLIBRARIES:
diff -Nrua kdeadmin-3.4.0.orig/lilo-config/common/tests/Makefile.in kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in
---- kdeadmin-3.4.0.orig/lilo-config/common/tests/Makefile.in 2005-03-04 21:29:47.750426657 +0100
-+++ kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in 2005-03-04 21:30:24.407090540 +0100
+--- kdeadmin-3.4.0.orig/lilo-config/common/tests/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in 2005-03-04 23:09:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21528,8 +10164,8 @@
clean-noinstPROGRAMS:
diff -Nrua kdeadmin-3.4.0.orig/lilo-config/kde/Makefile.in kdeadmin-3.4.0/lilo-config/kde/Makefile.in
---- kdeadmin-3.4.0.orig/lilo-config/kde/Makefile.in 2005-03-04 21:29:47.752426475 +0100
-+++ kdeadmin-3.4.0/lilo-config/kde/Makefile.in 2005-03-04 21:30:24.428088628 +0100
+--- kdeadmin-3.4.0.orig/lilo-config/kde/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/kde/Makefile.in 2005-03-04 23:09:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21597,8 +10233,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeadmin-3.4.0.orig/lilo-config/kde-qt-common/Makefile.in kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in
---- kdeadmin-3.4.0.orig/lilo-config/kde-qt-common/Makefile.in 2005-03-04 21:29:47.753426384 +0100
-+++ kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in 2005-03-04 21:30:24.417089629 +0100
+--- kdeadmin-3.4.0.orig/lilo-config/kde-qt-common/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in 2005-03-04 23:09:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21665,103 +10301,52 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nrua kdeadmin-3.4.0.orig/lilo-config/Makefile.in kdeadmin-3.4.0/lilo-config/Makefile.in
---- kdeadmin-3.4.0.orig/lilo-config/Makefile.in 2005-03-04 21:29:47.754426293 +0100
-+++ kdeadmin-3.4.0/lilo-config/Makefile.in 2005-03-04 21:30:24.391091996 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
+@@ -646,18 +649,18 @@
+ .NOEXPORT:
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -183,6 +183,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,7 @@
- all: docs-am all-recursive
+ #>+ 3
+-general.moc: $(srcdir)/general.h
+- $(MOC) $(srcdir)/general.h -o general.moc
++EditWidget.moc: $(srcdir)/EditWidget.h
++ $(MOC) $(srcdir)/EditWidget.h -o EditWidget.moc
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -373,9 +376,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 2
+-mocs: general.moc
++mocs: EditWidget.moc
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+-EditWidget.moc: $(srcdir)/EditWidget.h
+- $(MOC) $(srcdir)/EditWidget.h -o EditWidget.moc
++general.moc: $(srcdir)/general.h
++ $(MOC) $(srcdir)/general.h -o general.moc
- mostlyclean-libtool:
-@@ -395,7 +398,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -407,7 +416,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -415,7 +424,13 @@
+ #>+ 2
+-mocs: EditWidget.moc
++mocs: general.moc
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -436,7 +451,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ #>+ 3
+ images.moc: $(srcdir)/images.h
+@@ -682,7 +685,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f general.moc EditWidget.moc images.moc expert.moc mainwidget.moc
++ -rm -f EditWidget.moc general.moc images.moc expert.moc mainwidget.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am
+@@ -729,7 +732,7 @@
+
+
+ #>+ 11
+-libwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainwidget.cpp $(srcdir)/general.cpp $(srcdir)/images.cpp $(srcdir)/expert.cpp $(srcdir)/EditWidget.cpp EditWidget.moc general.moc images.moc expert.moc mainwidget.moc
++libwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mainwidget.cpp $(srcdir)/general.cpp $(srcdir)/images.cpp $(srcdir)/expert.cpp $(srcdir)/EditWidget.cpp general.moc EditWidget.moc images.moc expert.moc mainwidget.moc
+ @echo 'creating libwidgets_la.all_cpp.cpp ...'; \
+ rm -f libwidgets_la.all_cpp.files libwidgets_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libwidgets_la.all_cpp.final; \
diff -Nrua kdeadmin-3.4.0.orig/lilo-config/qt/Makefile.in kdeadmin-3.4.0/lilo-config/qt/Makefile.in
---- kdeadmin-3.4.0.orig/lilo-config/qt/Makefile.in 2005-03-04 21:29:47.754426293 +0100
-+++ kdeadmin-3.4.0/lilo-config/qt/Makefile.in 2005-03-04 21:30:24.437087809 +0100
+--- kdeadmin-3.4.0.orig/lilo-config/qt/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/lilo-config/qt/Makefile.in 2005-03-04 23:09:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -21828,124 +10413,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdeadmin-3.4.0.orig/Makefile.in kdeadmin-3.4.0/Makefile.in
---- kdeadmin-3.4.0.orig/Makefile.in 2005-03-04 21:29:47.760425747 +0100
-+++ kdeadmin-3.4.0/Makefile.in 2005-03-04 21:30:24.049123118 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -199,6 +199,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -399,12 +402,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -416,7 +419,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in: $(am__configure_deps)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-@@ -441,7 +444,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -453,7 +462,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -461,7 +470,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -482,7 +497,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -821,7 +836,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=configure.in kdeadmin.lsm subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in
-
- #>+ 2
- docs-am:
diff -Nrua kdeadmin-3.4.0.orig/secpolicy/Makefile.in kdeadmin-3.4.0/secpolicy/Makefile.in
---- kdeadmin-3.4.0.orig/secpolicy/Makefile.in 2005-03-04 21:29:47.754426293 +0100
-+++ kdeadmin-3.4.0/secpolicy/Makefile.in 2005-03-04 21:30:24.446086990 +0100
+--- kdeadmin-3.4.0.orig/secpolicy/Makefile.in 2005-03-04 07:09:29.000000000 -0500
++++ kdeadmin-3.4.0/secpolicy/Makefile.in 2005-03-04 23:09:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.