[Pkg-kde-commits] rev 1118 - in branches/kde-3.4.0/packages/kdeadmin/debian: . patches
Pierre Habouzit
madcoder-guest@costa.debian.org
Tue, 24 May 2005 22:39:27 +0000
Author: madcoder-guest
Date: 2005-05-24 22:39:25 +0000 (Tue, 24 May 2005)
New Revision: 1118
Removed:
branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_2005-04-07.diff
Modified:
branches/kde-3.4.0/packages/kdeadmin/debian/changelog
branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
kdeadmin 3.4.1 : buildprep, remove branch pull
Modified: branches/kde-3.4.0/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/changelog 2005-05-24 22:35:15 UTC (rev 1117)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/changelog 2005-05-24 22:39:25 UTC (rev 1118)
@@ -1,3 +1,9 @@
+kdeadmin (4:3.4.1-0pre1) alioth; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 25 May 2005 00:38:09 +0200
+
kdeadmin (4:3.4.0-0pre2) alioth; urgency=low
* New upstream release.
Deleted: branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_2005-04-07.diff
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-05-24 22:35:15 UTC (rev 1117)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/patches/98_buildprep.diff 2005-05-24 22:39:25 UTC (rev 1118)
@@ -1,150 +1,7 @@
-#DPATCHLEVEL=1
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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:
-@@ -846,7 +861,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru kdeadmin-3.4.0.orig/acinclude.m4 kdeadmin-3.4.0/acinclude.m4
---- kdeadmin-3.4.0.orig/acinclude.m4 2005-03-04 07:08:59.000000000 -0500
-+++ kdeadmin-3.4.0/acinclude.m4 2005-04-07 20:22:28.000000000 -0400
-@@ -1644,7 +1644,15 @@
-
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
-- AC_MSG_ERROR([you need to install kdelibs first.])
-+ AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -1682,15 +1690,6 @@
+diff -rua kdeadmin-3.4.1.orig/acinclude.m4 kdeadmin-3.4.1/acinclude.m4
+--- kdeadmin-3.4.1.orig/acinclude.m4 2005-05-23 17:44:37.000000000 +0200
++++ kdeadmin-3.4.1/acinclude.m4 2005-05-25 00:37:40.291834171 +0200
+@@ -1690,15 +1690,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -160,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2130,6 @@
+@@ -2139,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -170,80 +27,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -3104,8 +3100,8 @@
- fi
- rm -f conftest.h conftest.h.gch
- fi
-- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- fi
-+ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- if test "$CXX" = "KCC"; then
- dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-@@ -3194,6 +3190,51 @@
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
-
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+ [
-+ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+ [
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+
-+ safe_CXXFLAGS=$CXXFLAGS
-+ safe_LDFLAGS=$LDFLAGS
-+ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+ LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+ AC_TRY_LINK(
-+ [
-+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+ template<typename CharT>
-+ struct VisTest
-+ {
-+ inline VisTest ();
-+ };
-+ template<typename CharT>
-+ inline VisTest<CharT>::VisTest()
-+ {}
-+ extern template class VisTest<char>; // It works if we drop that line
-+ int some_function( int do_something ) __attribute__ ((visibility("default")));
-+ int some_function( int )
-+ {
-+ VisTest<char> a;
-+ return 0;
-+ }
-+ ], [/* elvis is alive */],
-+ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+ CXXFLAGS=$safe_CXXFLAGS
-+ LDFLAGS=$safe_LDFLAGS
-+ AC_LANG_RESTORE
-+ ]
-+ )
-+
-+ if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+ fi
-+ ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
- if test "$GXX" = "yes"; then
-@@ -3202,7 +3243,9 @@
- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+ KDE_CHECK_VISIBILITY_GCC_BUG
-+
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- ])
-@@ -5686,6 +5729,7 @@
+@@ -5770,6 +5758,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -251,7 +35,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5789,7 @@
+@@ -5829,7 +5818,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -260,7 +44,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6203,11 @@
+@@ -6243,12 +6232,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -274,7 +58,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6219,6 @@
+@@ -6260,7 +6248,6 @@
esac
;;
*64-bit*)
@@ -282,7 +66,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6348,7 @@
+@@ -6390,7 +6377,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -291,7 +75,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6377,26 @@
+@@ -6419,20 +6406,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -323,7 +107,7 @@
# 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.
-@@ -6498,7 +6546,7 @@
+@@ -6582,7 +6575,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -332,7 +116,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6635,6 @@
+@@ -6671,13 +6664,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -346,7 +130,7 @@
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.
-@@ -6617,8 +6658,11 @@
+@@ -6701,8 +6687,11 @@
fi
fi
chmod u+w .
@@ -360,7 +144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6779,7 @@
+@@ -6819,7 +6808,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -369,7 +153,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6792,7 @@
+@@ -6832,7 +6821,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -378,7 +162,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6802,20 @@
+@@ -6842,7 +6831,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -400,7 +184,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6880,7 @@
+@@ -6907,7 +6909,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -409,7 +193,7 @@
;;
beos*)
-@@ -6848,7 +6905,7 @@
+@@ -6932,7 +6934,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -418,7 +202,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6970,7 @@
+@@ -6997,7 +6999,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -427,7 +211,7 @@
# 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"`
-@@ -6936,7 +6993,7 @@
+@@ -7020,7 +7022,7 @@
dynamic_linker=no
;;
@@ -436,7 +220,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +7053,7 @@
+@@ -7080,7 +7082,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -445,7 +229,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7068,7 @@
+@@ -7095,7 +7097,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -454,7 +238,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7079,7 @@
+@@ -7106,7 +7108,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -463,7 +247,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7141,19 @@
+@@ -7168,22 +7170,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'
@@ -492,7 +276,7 @@
# 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,
-@@ -7109,6 +7163,30 @@
+@@ -7193,6 +7192,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -523,7 +307,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7196,7 @@
+@@ -7202,7 +7225,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -532,7 +316,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7225,7 @@
+@@ -7231,7 +7254,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -541,7 +325,7 @@
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
-@@ -7167,7 +7245,7 @@
+@@ -7251,7 +7274,7 @@
os2*)
libname_spec='$name'
@@ -550,7 +334,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7836,23 @@
+@@ -7842,31 +7865,23 @@
;;
cygwin*)
@@ -591,7 +375,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7891,21 @@
+@@ -7905,42 +7920,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -641,7 +425,7 @@
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
-@@ -7885,9 +7934,6 @@
+@@ -7969,9 +7963,6 @@
;;
osf3* | osf4* | osf5*)
@@ -651,7 +435,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7943,6 @@
+@@ -7981,7 +7972,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -659,7 +443,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8208,7 @@
+@@ -8247,7 +8237,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])
@@ -668,7 +452,7 @@
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
-@@ -8213,7 +8258,7 @@
+@@ -8297,7 +8287,7 @@
fi
;;
@@ -677,7 +461,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8268,29 @@
+@@ -8307,29 +8297,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -721,7 +505,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8298,8 @@
+@@ -8337,8 +8327,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -732,7 +516,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8407,8 @@
+@@ -8446,8 +8436,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
@@ -743,7 +527,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8434,7 @@
+@@ -8473,7 +8463,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.
@@ -752,7 +536,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8464,22 @@
+@@ -8503,8 +8493,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -777,7 +561,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8525,16 @@
+@@ -8550,15 +8554,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -798,7 +582,7 @@
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.
-@@ -8483,13 +8543,12 @@
+@@ -8567,13 +8572,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -814,7 +598,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8563,7 @@
+@@ -8588,7 +8592,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.
@@ -823,7 +607,7 @@
fi
fi
;;
-@@ -8521,12 +8580,12 @@
+@@ -8605,12 +8609,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'
@@ -838,7 +622,7 @@
# 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
-@@ -8535,7 +8594,7 @@
+@@ -8619,7 +8623,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -847,7 +631,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8605,20 @@
+@@ -8630,20 +8634,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -878,7 +662,7 @@
fi
;;
esac
-@@ -8569,19 +8628,19 @@
+@@ -8653,19 +8657,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -904,7 +688,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8675,7 @@
+@@ -8700,7 +8704,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -913,7 +697,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8697,7 @@
+@@ -8722,7 +8726,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -922,7 +706,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8706,11 @@
+@@ -8731,11 +8735,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.
@@ -936,7 +720,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8767,7 @@
+@@ -8792,7 +8796,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -945,7 +729,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8788,7 @@
+@@ -8813,7 +8817,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -954,7 +738,7 @@
;;
esac
fi
-@@ -8744,7 +8803,7 @@
+@@ -8828,7 +8832,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -963,7 +747,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8814,9 @@
+@@ -8839,9 +8843,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -975,7 +759,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8833,8 @@
+@@ -8858,8 +8862,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.
@@ -986,7 +770,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8856,16 @@
+@@ -8881,16 +8885,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -1007,7 +791,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8903,7 @@
+@@ -8928,7 +8932,7 @@
;;
esac
;;
@@ -1016,7 +800,7 @@
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=
-@@ -8863,7 +8922,7 @@
+@@ -8947,7 +8951,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.
@@ -1025,7 +809,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8939,7 @@
+@@ -8964,7 +8968,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1034,7 +818,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8957,7 @@
+@@ -8982,7 +8986,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1043,7 +827,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8982,7 @@
+@@ -9007,7 +9011,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.
@@ -1052,7 +836,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8998,10 @@
+@@ -9023,10 +9027,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -1065,7 +849,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +9020,7 @@
+@@ -9045,7 +9049,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1074,7 +858,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9077,9 @@
+@@ -9102,9 +9106,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -1086,7 +870,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9113,7 @@
+@@ -9138,7 +9142,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -1095,7 +879,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9123,9 @@
+@@ -9148,9 +9152,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
@@ -1107,7 +891,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9134,9 @@
+@@ -9159,9 +9163,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1119,7 +903,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9304,7 @@
+@@ -9329,7 +9333,7 @@
fi
;;
@@ -1128,7 +912,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9413,7 @@
+@@ -9438,7 +9442,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1137,7 +921,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9555,12 @@
+@@ -9580,11 +9584,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1152,7 +936,7 @@
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 \
-@@ -9550,7 +9610,7 @@
+@@ -9634,7 +9639,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1161,7 +945,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9741,7 @@
+@@ -9765,7 +9770,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1170,7 +954,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9772,7 @@
+@@ -9796,7 +9801,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1179,7 +963,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +10016,10 @@
+@@ -10040,7 +10045,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.
@@ -1191,7 +975,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10092,7 @@
+@@ -10113,7 +10121,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1200,7 +984,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10110,7 @@
+@@ -10131,7 +10139,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1209,7 +993,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10325,7 @@
+@@ -10346,7 +10354,7 @@
;;
esac
;;
@@ -1218,7 +1002,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10376,7 @@
+@@ -10397,7 +10405,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'
@@ -1227,7 +1011,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10401,7 @@
+@@ -10422,7 +10430,7 @@
;;
esac
;;
@@ -1236,7 +1020,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10712,9 @@
+@@ -10733,6 +10741,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'
;;
@@ -1246,7 +1030,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10739,7 @@
+@@ -10757,7 +10768,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1255,7 +1039,7 @@
_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*
-@@ -10747,7 +10813,7 @@
+@@ -10831,7 +10842,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
@@ -1264,7 +1048,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10823,13 @@
+@@ -10841,13 +10852,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'
@@ -1280,7 +1064,7 @@
# 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
-@@ -10772,19 +10838,19 @@
+@@ -10856,19 +10867,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1304,7 +1088,7 @@
fi
;;
-@@ -10802,8 +10868,8 @@
+@@ -10886,8 +10897,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1315,7 +1099,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10882,36 @@
+@@ -10900,10 +10911,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1354,7 +1138,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10961,20 @@
+@@ -10953,9 +10990,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
@@ -1377,7 +1161,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +11020,29 @@
+@@ -11001,29 +11049,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1416,7 +1200,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11057,7 @@
+@@ -11038,7 +11086,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.
@@ -1425,7 +1209,7 @@
fi
fi
;;
-@@ -10977,13 +11080,13 @@
+@@ -11061,13 +11109,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1442,7 +1226,7 @@
# 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.
-@@ -10997,21 +11100,21 @@
+@@ -11081,21 +11129,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1477,7 +1261,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11123,26 @@
+@@ -11104,26 +11152,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1512,7 +1296,7 @@
;;
dgux*)
-@@ -11072,8 +11175,8 @@
+@@ -11156,8 +11204,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1523,7 +1307,7 @@
_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
-@@ -11081,7 +11184,7 @@
+@@ -11165,7 +11213,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1532,7 +1316,7 @@
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
-@@ -11099,10 +11202,10 @@
+@@ -11183,10 +11231,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1545,7 +1329,7 @@
;;
esac
else
-@@ -11149,7 +11252,7 @@
+@@ -11233,7 +11281,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1554,7 +1338,7 @@
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'
-@@ -11159,7 +11262,7 @@
+@@ -11243,7 +11291,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1563,7 +1347,7 @@
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
-@@ -11182,7 +11285,7 @@
+@@ -11266,7 +11314,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
@@ -1572,7 +1356,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11295,7 @@
+@@ -11276,7 +11324,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1581,7 +1365,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11306,14 @@
+@@ -11287,14 +11335,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
@@ -1598,7 +1382,7 @@
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'
-@@ -11222,7 +11325,7 @@
+@@ -11306,7 +11354,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}\*'
@@ -1607,7 +1391,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11350,9 @@
+@@ -11331,9 +11379,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1619,7 +1403,7 @@
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~
-@@ -11269,7 +11372,7 @@
+@@ -11353,7 +11401,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.
@@ -1628,7 +1412,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11432,9 @@
+@@ -11413,9 +11461,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1640,7 +1424,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11492,7 @@
+@@ -11473,7 +11521,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1649,7 +1433,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11651,8 @@
+@@ -11632,8 +11680,8 @@
fi
done
done
@@ -1659,361 +1443,25 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru kdeadmin-3.4.0.orig/aclocal.m4 kdeadmin-3.4.0/aclocal.m4
---- kdeadmin-3.4.0.orig/aclocal.m4 2005-03-04 07:09:08.000000000 -0500
-+++ kdeadmin-3.4.0/aclocal.m4 2005-04-07 20:22:48.000000000 -0400
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005 Free Software Foundation, Inc.
- # This file 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.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--# -*- Autoconf -*-
--# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# 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
-+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.1])])
--
--# AM_AUX_DIR_EXPAND
-+ [AM_AUTOMAKE_VERSION([1.9.5])])
-
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
--# 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.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -106,26 +83,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
-
--# AM_CONDITIONAL -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-+# AM_CONDITIONAL -*- Autoconf -*-
-
--# 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.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# serial 6
-+# serial 7
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--# serial 7 -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# 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.
--
-+# serial 8
-
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +133,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@
- AC_SUBST([AMDEPBACKSLASH])
- ])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# 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.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--#serial 2
-+#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,54 +340,31 @@
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
-
--# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# 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.
--
--# serial 7
-+# serial 8
-
- # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
--# Do all the work for Automake. -*- Autoconf -*-
--
--# This macro actually does too much some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
-+# Do all the work for Automake. -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# 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.
-+# serial 12
-
--# serial 11
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -545,51 +466,27 @@
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 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
--# 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.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
-
--# -*- Autoconf -*-
--# Copyright (C) 2003 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
--# 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.
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# serial 1
-+# serial 2
-
- # Check whether the underlying file-system supports filenames
- # with a leading dot. For instance MS-DOS doesn't.
-@@ -604,26 +501,44 @@
+diff -rua kdeadmin-3.4.1.orig/aclocal.m4 kdeadmin-3.4.1/aclocal.m4
+--- kdeadmin-3.4.1.orig/aclocal.m4 2005-05-23 17:44:47.000000000 +0200
++++ kdeadmin-3.4.1/aclocal.m4 2005-05-25 00:37:47.962142748 +0200
+@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
--# Check to see how 'make' treats includes. -*- Autoconf -*-
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
-
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-
--# 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.
++
+# serial 4
-
--# 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.
++
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
@@ -2028,232 +1476,15 @@
+ AC_SUBST(MAINT)dnl
+]
+)
-
--# serial 2
++
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-+
-+# serial 3
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -667,27 +582,16 @@
- rm -f confinc confmf
- ])
-
--# -*- Autoconf -*-
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 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
--# 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.
--
--# serial 3
-+# serial 4
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -713,27 +617,16 @@
- fi
- ])
-
-+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 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
--# 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.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -787,26 +680,15 @@
- fi
- AC_SUBST([mkdir_p])])
-
--# Helper functions for option handling. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Helper functions for option handling. -*- Autoconf -*-
-
--# 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.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# serial 2
-+# serial 3
-
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -831,28 +713,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--# 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.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file 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.
-
--# serial 3
-+# serial 4
-
- # AM_SANITY_CHECK
- # ---------------
-@@ -895,25 +765,14 @@
- fi
- AC_MSG_RESULT(yes)])
-
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 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
--# 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.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries. This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -936,25 +795,13 @@
-
- # Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004 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
--# 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.
--
--# serial 1
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file 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.
-
-+# serial 2
-
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-diff -Nru kdeadmin-3.4.0.orig/configure kdeadmin-3.4.0/configure
---- kdeadmin-3.4.0.orig/configure 2005-03-04 07:09:31.000000000 -0500
-+++ kdeadmin-3.4.0/configure 2005-04-07 20:23:27.000000000 -0400
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+diff -rua kdeadmin-3.4.1.orig/configure kdeadmin-3.4.1/configure
+--- kdeadmin-3.4.1.orig/configure 2005-05-23 17:45:09.000000000 +0200
++++ kdeadmin-3.4.1/configure 2005-05-25 00:38:06.899435655 +0200
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -2413,17 +1644,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4282,8 +4299,7 @@
+@@ -4259,8 +4276,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4371,8 +4387,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4371,8 +4387,7 @@
+@@ -4460,8 +4475,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2433,7 +1674,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4474,8 +4489,7 @@
+@@ -4563,8 +4577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2443,7 +1684,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4574,8 +4588,7 @@
+@@ -4663,8 +4676,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2453,7 +1694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4659,8 +4672,7 @@
+@@ -4748,8 +4760,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2463,7 +1704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4749,8 +4761,7 @@
+@@ -4838,8 +4849,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2473,7 +1714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4837,8 +4848,7 @@
+@@ -4926,8 +4936,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2483,7 +1724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4925,8 +4935,7 @@
+@@ -5014,8 +5023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2493,7 +1734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5032,8 +5041,7 @@
+@@ -5121,8 +5129,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2503,7 +1744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5120,8 +5128,7 @@
+@@ -5209,8 +5216,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2513,7 +1754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5208,8 +5215,7 @@
+@@ -5297,8 +5303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2523,7 +1764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5296,8 +5302,7 @@
+@@ -5385,8 +5390,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2533,23 +1774,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5369,6 +5374,7 @@
- fi
- rm -f conftest.h conftest.h.gch
- fi
-+ fi
-
-
- if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then
-@@ -5379,7 +5385,6 @@
- unsermake_enable_pch_FALSE=
- fi
-
-- fi
- if test "$CXX" = "KCC"; then
-
- if test "$kde_use_pch" = "yes"; then
-@@ -5428,8 +5433,7 @@
+@@ -5517,8 +5521,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2559,7 +1784,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5517,8 +5521,7 @@
+@@ -5606,8 +5609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2569,7 +1794,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5605,8 +5608,7 @@
+@@ -5694,8 +5696,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2579,7 +1804,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5693,8 +5695,7 @@
+@@ -5782,8 +5783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2589,7 +1814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5781,8 +5782,7 @@
+@@ -5870,8 +5870,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2599,7 +1824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5869,8 +5869,7 @@
+@@ -5958,8 +5957,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2609,7 +1834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6293,8 +6292,7 @@
+@@ -6382,8 +6380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2619,7 +1844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6420,8 +6418,7 @@
+@@ -6509,8 +6506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2629,7 +1854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6509,8 +6506,7 @@
+@@ -6598,8 +6594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2639,7 +1864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6593,185 +6589,6 @@
+@@ -6682,185 +6677,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -2825,7 +2050,7 @@
fi
-@@ -6960,10 +6777,10 @@
+@@ -7049,10 +6865,10 @@
fi
done
done
@@ -2837,7 +2062,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -7197,31 +7014,23 @@
+@@ -7286,31 +7102,23 @@
;;
cygwin*)
@@ -2877,7 +2102,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7260,42 +7069,21 @@
+@@ -7349,42 +7157,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2927,7 +2152,7 @@
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
-@@ -7324,9 +7112,6 @@
+@@ -7413,9 +7200,6 @@
;;
osf3* | osf4* | osf5*)
@@ -2937,7 +2162,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7336,7 +7121,6 @@
+@@ -7425,7 +7209,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2945,16 +2170,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7413,7 +7197,7 @@
+@@ -7502,7 +7285,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7416 "configure"' > conftest.$ac_ext
-+ echo '#line 7200 "configure"' > conftest.$ac_ext
+- echo '#line 7505 "configure"' > conftest.$ac_ext
++ echo '#line 7288 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7458,12 +7242,11 @@
+@@ -7547,12 +7330,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -2968,7 +2193,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7475,7 +7258,6 @@
+@@ -7564,7 +7346,6 @@
esac
;;
*64-bit*)
@@ -2976,7 +2201,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7535,8 +7317,7 @@
+@@ -7624,8 +7405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2986,7 +2211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7611,8 +7392,7 @@
+@@ -7700,8 +7480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2996,7 +2221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7782,8 +7562,7 @@
+@@ -7871,8 +7650,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3006,7 +2231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7850,8 +7629,7 @@
+@@ -7939,8 +7717,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3016,16 +2241,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8058,7 +7836,7 @@
+@@ -8147,7 +7924,7 @@
# Provide some information about the compiler.
--echo "$as_me:8061:" \
-+echo "$as_me:7839:" \
+-echo "$as_me:8150:" \
++echo "$as_me:7927:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8104,8 +7882,7 @@
+@@ -8193,8 +7970,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3035,7 +2260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8154,8 +7931,7 @@
+@@ -8243,8 +8019,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3045,7 +2270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8213,7 +7989,7 @@
+@@ -8302,7 +8077,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -3054,7 +2279,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8242,20 +8018,26 @@
+@@ -8331,20 +8106,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3086,7 +2311,7 @@
# 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.
-@@ -8323,7 +8105,7 @@
+@@ -8412,7 +8193,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -3095,7 +2320,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8341,7 +8123,7 @@
+@@ -8430,7 +8211,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -3104,35 +2329,35 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9090,11 +8872,11 @@
+@@ -9179,11 +8960,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8875: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9182: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9097: \$? = $ac_status" >&5
-+ echo "$as_me:8879: \$? = $ac_status" >&5
+- echo "$as_me:9186: \$? = $ac_status" >&5
++ echo "$as_me:8967: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9323,11 +9105,11 @@
+@@ -9412,11 +9193,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9326: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9108: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9415: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9196: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9330: \$? = $ac_status" >&5
-+ echo "$as_me:9112: \$? = $ac_status" >&5
+- echo "$as_me:9419: \$? = $ac_status" >&5
++ echo "$as_me:9200: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9374,13 +9156,6 @@
+@@ -9463,13 +9244,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3146,21 +2371,21 @@
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.
-@@ -9390,11 +9165,11 @@
+@@ -9479,11 +9253,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9393: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9168: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9482: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9256: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9397: \$? = $ac_status" >&5
-+ echo "$as_me:9172: \$? = $ac_status" >&5
+- echo "$as_me:9486: \$? = $ac_status" >&5
++ echo "$as_me:9260: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9404,8 +9179,11 @@
+@@ -9493,8 +9267,11 @@
fi
fi
chmod u+w .
@@ -3174,7 +2399,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9533,7 +9311,7 @@
+@@ -9622,7 +9399,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3183,7 +2408,7 @@
else
ld_shlibs=no
fi
-@@ -9543,13 +9321,13 @@
+@@ -9632,13 +9409,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -3199,7 +2424,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9558,19 +9336,19 @@
+@@ -9647,19 +9424,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3223,7 +2448,7 @@
fi
;;
-@@ -9588,8 +9366,8 @@
+@@ -9677,8 +9454,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3234,7 +2459,7 @@
else
ld_shlibs=no
fi
-@@ -9602,10 +9380,36 @@
+@@ -9691,10 +9468,36 @@
hardcode_shlibpath_var=no
;;
@@ -3273,7 +2498,7 @@
else
ld_shlibs=no
fi
-@@ -9655,9 +9459,20 @@
+@@ -9744,9 +9547,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3296,7 +2521,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9703,21 +9518,22 @@
+@@ -9792,21 +9606,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3324,7 +2549,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9741,8 +9557,7 @@
+@@ -9830,8 +9645,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3334,7 +2559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9769,14 +9584,13 @@
+@@ -9858,14 +9672,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -3352,7 +2577,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9803,8 +9617,7 @@
+@@ -9892,8 +9705,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3362,7 +2587,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9842,7 +9655,7 @@
+@@ -9931,7 +9743,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3371,7 +2596,7 @@
fi
fi
;;
-@@ -9865,13 +9678,13 @@
+@@ -9954,13 +9766,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -3388,7 +2613,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9885,21 +9698,21 @@
+@@ -9974,21 +9786,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3423,7 +2648,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -9908,18 +9721,18 @@
+@@ -9997,18 +9809,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -3448,7 +2673,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -9960,8 +9773,8 @@
+@@ -10049,8 +9861,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3459,7 +2684,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9969,7 +9782,7 @@
+@@ -10058,7 +9870,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3468,7 +2693,7 @@
else
archive_cmds='$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
-@@ -9987,10 +9800,10 @@
+@@ -10076,10 +9888,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -3481,7 +2706,7 @@
;;
esac
else
-@@ -10037,7 +9850,7 @@
+@@ -10126,7 +9938,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3490,7 +2715,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10047,7 +9860,7 @@
+@@ -10136,7 +9948,7 @@
link_all_deplibs=yes
;;
@@ -3499,7 +2724,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10070,7 +9883,7 @@
+@@ -10159,7 +9971,7 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3508,7 +2733,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10080,7 +9893,7 @@
+@@ -10169,7 +9981,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -3517,7 +2742,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10091,14 +9904,14 @@
+@@ -10180,14 +9992,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -3534,7 +2759,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$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'
-@@ -10110,7 +9923,7 @@
+@@ -10199,7 +10011,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3543,7 +2768,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10135,9 +9948,9 @@
+@@ -10224,9 +10036,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -3555,7 +2780,7 @@
else
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10157,7 +9970,7 @@
+@@ -10246,7 +10058,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.
@@ -3564,7 +2789,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10217,9 +10030,9 @@
+@@ -10306,9 +10118,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -3576,7 +2801,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10325,7 +10138,7 @@
+@@ -10414,7 +10226,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3585,7 +2810,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10335,7 +10148,20 @@
+@@ -10424,7 +10236,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3607,7 +2832,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10400,7 +10226,7 @@
+@@ -10489,7 +10314,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3616,7 +2841,7 @@
;;
beos*)
-@@ -10425,7 +10251,7 @@
+@@ -10514,7 +10339,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -3625,7 +2850,7 @@
need_version=no
need_lib_prefix=no
-@@ -10490,7 +10316,7 @@
+@@ -10579,7 +10404,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -3634,7 +2859,7 @@
# 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"`
-@@ -10513,7 +10339,7 @@
+@@ -10602,7 +10427,7 @@
dynamic_linker=no
;;
@@ -3643,7 +2868,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10573,7 +10399,7 @@
+@@ -10662,7 +10487,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -3652,7 +2877,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10588,7 +10414,7 @@
+@@ -10677,7 +10502,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3661,7 +2886,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10599,7 +10425,7 @@
+@@ -10688,7 +10513,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3670,7 +2895,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10661,22 +10487,19 @@
+@@ -10750,22 +10575,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'
@@ -3699,7 +2924,7 @@
# 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,
-@@ -10686,6 +10509,30 @@
+@@ -10775,6 +10597,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3730,7 +2955,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10695,7 +10542,7 @@
+@@ -10784,7 +10630,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3739,7 +2964,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10724,7 +10571,7 @@
+@@ -10813,7 +10659,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3748,7 +2973,7 @@
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
-@@ -10744,7 +10591,7 @@
+@@ -10833,7 +10679,7 @@
os2*)
libname_spec='$name'
@@ -3757,7 +2982,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10973,8 +10820,7 @@
+@@ -11062,8 +10908,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3767,7 +2992,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11077,8 +10923,7 @@
+@@ -11166,8 +11011,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3777,7 +3002,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11143,8 +10988,7 @@
+@@ -11232,8 +11076,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3787,7 +3012,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11237,8 +11081,7 @@
+@@ -11326,8 +11169,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3797,7 +3022,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11303,8 +11146,7 @@
+@@ -11392,8 +11234,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3807,7 +3032,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11370,8 +11212,7 @@
+@@ -11459,8 +11300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3817,7 +3042,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11437,8 +11278,7 @@
+@@ -11526,8 +11366,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3827,25 +3052,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11513,7 +11353,7 @@
+@@ -11602,7 +11441,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11516 "configure"
-+#line 11356 "configure"
+-#line 11605 "configure"
++#line 11444 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11611,7 +11451,7 @@
+@@ -11700,7 +11539,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11614 "configure"
-+#line 11454 "configure"
+-#line 11703 "configure"
++#line 11542 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11736,7 +11576,7 @@
+@@ -11825,7 +11664,7 @@
fi
;;
@@ -3854,7 +3079,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11746,29 +11586,29 @@
+@@ -11835,29 +11674,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3898,7 +3123,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -11802,7 +11642,8 @@
+@@ -11891,7 +11730,8 @@
# 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.
@@ -3908,7 +3133,7 @@
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 \
-@@ -11980,7 +11821,7 @@
+@@ -12069,7 +11909,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3917,7 +3142,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12011,7 +11852,7 @@
+@@ -12100,7 +11940,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3926,7 +3151,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12253,7 +12094,10 @@
+@@ -12342,7 +12182,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.
@@ -3938,7 +3163,7 @@
fi
-@@ -12521,8 +12365,8 @@
+@@ -12610,8 +12453,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
@@ -3949,7 +3174,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12548,7 +12392,7 @@
+@@ -12637,7 +12480,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.
@@ -3958,7 +3183,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12579,8 +12423,22 @@
+@@ -12668,8 +12511,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3983,7 +3208,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12626,15 +12484,16 @@
+@@ -12715,15 +12572,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4004,7 +3229,7 @@
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.
-@@ -12664,8 +12523,7 @@
+@@ -12753,8 +12611,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4014,7 +3239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12694,13 +12552,12 @@
+@@ -12783,13 +12640,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -4030,7 +3255,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12727,8 +12584,7 @@
+@@ -12816,8 +12672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4040,7 +3265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12766,7 +12622,7 @@
+@@ -12855,7 +12710,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -4049,7 +3274,7 @@
fi
fi
;;
-@@ -12783,12 +12639,12 @@
+@@ -12872,12 +12727,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -4064,7 +3289,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12797,7 +12653,7 @@
+@@ -12886,7 +12741,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4073,7 +3298,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -12808,20 +12664,20 @@
+@@ -12897,20 +12752,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4104,7 +3329,7 @@
fi
;;
esac
-@@ -12831,19 +12687,19 @@
+@@ -12920,19 +12775,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -4130,7 +3355,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -12878,7 +12734,7 @@
+@@ -12967,7 +12822,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -4139,7 +3364,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12900,7 +12756,7 @@
+@@ -12989,7 +12844,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -4148,7 +3373,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12909,11 +12765,11 @@
+@@ -12998,11 +12853,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.
@@ -4162,7 +3387,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12970,7 +12826,7 @@
+@@ -13059,7 +12914,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4171,7 +3396,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -12991,7 +12847,7 @@
+@@ -13080,7 +12935,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4180,7 +3405,7 @@
;;
esac
fi
-@@ -13006,7 +12862,7 @@
+@@ -13095,7 +12950,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -4189,7 +3414,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13017,9 +12873,9 @@
+@@ -13106,9 +12961,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -4201,7 +3426,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13036,8 +12892,8 @@
+@@ -13125,8 +12980,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.
@@ -4212,7 +3437,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13059,16 +12915,16 @@
+@@ -13148,16 +13003,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -4233,7 +3458,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13106,7 +12962,7 @@
+@@ -13195,7 +13050,7 @@
;;
esac
;;
@@ -4242,7 +3467,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13125,7 +12981,7 @@
+@@ -13214,7 +13069,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.
@@ -4251,7 +3476,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13142,7 +12998,7 @@
+@@ -13231,7 +13086,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4260,7 +3485,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13160,7 +13016,7 @@
+@@ -13249,7 +13104,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4269,7 +3494,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13185,7 +13041,7 @@
+@@ -13274,7 +13129,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.
@@ -4278,7 +3503,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13201,10 +13057,10 @@
+@@ -13290,10 +13145,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -4291,7 +3516,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13223,7 +13079,7 @@
+@@ -13312,7 +13167,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4300,7 +3525,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13280,9 +13136,9 @@
+@@ -13369,9 +13224,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -4312,7 +3537,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13316,7 +13172,7 @@
+@@ -13405,7 +13260,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -4321,7 +3546,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13326,9 +13182,9 @@
+@@ -13415,9 +13270,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -4333,7 +3558,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13337,9 +13193,9 @@
+@@ -13426,9 +13281,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -4345,7 +3570,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13454,7 +13310,7 @@
+@@ -13543,7 +13398,7 @@
fi
;;
@@ -4354,7 +3579,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13589,7 +13445,7 @@
+@@ -13678,7 +13533,7 @@
;;
esac
;;
@@ -4363,7 +3588,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13665,7 +13521,7 @@
+@@ -13754,7 +13609,7 @@
;;
esac
;;
@@ -4372,21 +3597,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13776,11 +13632,11 @@
+@@ -13865,11 +13720,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13779: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13635: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13868: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13723: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13783: \$? = $ac_status" >&5
-+ echo "$as_me:13639: \$? = $ac_status" >&5
+- echo "$as_me:13872: \$? = $ac_status" >&5
++ echo "$as_me:13727: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -13827,13 +13683,6 @@
+@@ -13916,13 +13771,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4400,21 +3625,21 @@
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.
-@@ -13843,11 +13692,11 @@
+@@ -13932,11 +13780,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13846: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13695: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13935: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13783: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13850: \$? = $ac_status" >&5
-+ echo "$as_me:13699: \$? = $ac_status" >&5
+- echo "$as_me:13939: \$? = $ac_status" >&5
++ echo "$as_me:13787: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13857,8 +13706,11 @@
+@@ -13946,8 +13794,11 @@
fi
fi
chmod u+w .
@@ -4428,7 +3653,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13910,6 +13762,9 @@
+@@ -13999,6 +13850,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4438,7 +3663,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -13991,7 +13846,7 @@
+@@ -14080,7 +13934,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4447,7 +3672,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14001,7 +13856,20 @@
+@@ -14090,7 +13944,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4469,7 +3694,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14066,7 +13934,7 @@
+@@ -14155,7 +14022,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4478,7 +3703,7 @@
;;
beos*)
-@@ -14091,7 +13959,7 @@
+@@ -14180,7 +14047,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -4487,7 +3712,7 @@
need_version=no
need_lib_prefix=no
-@@ -14156,7 +14024,7 @@
+@@ -14245,7 +14112,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -4496,7 +3721,7 @@
# 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"`
-@@ -14179,7 +14047,7 @@
+@@ -14268,7 +14135,7 @@
dynamic_linker=no
;;
@@ -4505,7 +3730,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14239,7 +14107,7 @@
+@@ -14328,7 +14195,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -4514,7 +3739,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14254,7 +14122,7 @@
+@@ -14343,7 +14210,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4523,7 +3748,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14265,7 +14133,7 @@
+@@ -14354,7 +14221,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4532,7 +3757,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14327,22 +14195,19 @@
+@@ -14416,22 +14283,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'
@@ -4561,7 +3786,7 @@
# 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,
-@@ -14352,6 +14217,30 @@
+@@ -14441,6 +14305,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4592,7 +3817,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14361,7 +14250,7 @@
+@@ -14450,7 +14338,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4601,7 +3826,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14390,7 +14279,7 @@
+@@ -14479,7 +14367,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -4610,7 +3835,7 @@
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
-@@ -14410,7 +14299,7 @@
+@@ -14499,7 +14387,7 @@
os2*)
libname_spec='$name'
@@ -4619,7 +3844,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14639,8 +14528,7 @@
+@@ -14728,8 +14616,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4629,7 +3854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14743,8 +14631,7 @@
+@@ -14832,8 +14719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4639,7 +3864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14809,8 +14696,7 @@
+@@ -14898,8 +14784,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4649,7 +3874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14903,8 +14789,7 @@
+@@ -14992,8 +14877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4659,7 +3884,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14969,8 +14854,7 @@
+@@ -15058,8 +14942,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4669,7 +3894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15036,8 +14920,7 @@
+@@ -15125,8 +15008,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4679,7 +3904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15103,8 +14986,7 @@
+@@ -15192,8 +15074,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4689,25 +3914,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15179,7 +15061,7 @@
+@@ -15268,7 +15149,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15182 "configure"
-+#line 15064 "configure"
+-#line 15271 "configure"
++#line 15152 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15277,7 +15159,7 @@
+@@ -15366,7 +15247,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15280 "configure"
-+#line 15162 "configure"
+-#line 15369 "configure"
++#line 15250 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15394,7 +15276,8 @@
+@@ -15483,7 +15364,8 @@
# 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.
@@ -4717,7 +3942,7 @@
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 \
-@@ -15524,7 +15407,7 @@
+@@ -15613,7 +15495,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4726,7 +3951,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15555,7 +15438,7 @@
+@@ -15644,7 +15526,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4735,7 +3960,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15772,7 +15655,10 @@
+@@ -15861,7 +15743,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.
@@ -4747,7 +3972,7 @@
fi
-@@ -15874,7 +15760,7 @@
+@@ -15963,7 +15848,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -4756,21 +3981,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -16100,11 +15986,11 @@
+@@ -16189,11 +16074,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16103: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15989: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16192: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16077: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16107: \$? = $ac_status" >&5
-+ echo "$as_me:15993: \$? = $ac_status" >&5
+- echo "$as_me:16196: \$? = $ac_status" >&5
++ echo "$as_me:16081: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16151,13 +16037,6 @@
+@@ -16240,13 +16125,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4784,21 +4009,21 @@
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.
-@@ -16167,11 +16046,11 @@
+@@ -16256,11 +16134,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16170: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16049: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16259: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16137: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16174: \$? = $ac_status" >&5
-+ echo "$as_me:16053: \$? = $ac_status" >&5
+- echo "$as_me:16263: \$? = $ac_status" >&5
++ echo "$as_me:16141: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16181,8 +16060,11 @@
+@@ -16270,8 +16148,11 @@
fi
fi
chmod u+w .
@@ -4812,7 +4037,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16310,7 +16192,7 @@
+@@ -16399,7 +16280,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4821,7 +4046,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16320,13 +16202,13 @@
+@@ -16409,13 +16290,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -4837,7 +4062,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16335,19 +16217,19 @@
+@@ -16424,19 +16305,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4861,7 +4086,7 @@
fi
;;
-@@ -16365,8 +16247,8 @@
+@@ -16454,8 +16335,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4872,7 +4097,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16379,10 +16261,36 @@
+@@ -16468,10 +16349,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -4911,7 +4136,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16432,9 +16340,20 @@
+@@ -16521,9 +16428,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4934,7 +4159,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16480,21 +16399,22 @@
+@@ -16569,21 +16487,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4962,7 +4187,7 @@
program main
end
-@@ -16508,8 +16428,7 @@
+@@ -16597,8 +16516,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4972,7 +4197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16536,14 +16455,13 @@
+@@ -16625,14 +16543,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4990,7 +4215,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16560,8 +16478,7 @@
+@@ -16649,8 +16566,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5000,7 +4225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16599,7 +16516,7 @@
+@@ -16688,7 +16604,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -5009,7 +4234,7 @@
fi
fi
;;
-@@ -16622,13 +16539,13 @@
+@@ -16711,13 +16627,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -5026,7 +4251,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -16642,21 +16559,21 @@
+@@ -16731,21 +16647,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5061,7 +4286,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16665,18 +16582,18 @@
+@@ -16754,18 +16670,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5086,7 +4311,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16717,8 +16634,8 @@
+@@ -16806,8 +16722,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5097,7 +4322,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16726,7 +16643,7 @@
+@@ -16815,7 +16731,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5106,7 +4331,7 @@
else
archive_cmds_F77='$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
-@@ -16744,10 +16661,10 @@
+@@ -16833,10 +16749,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5119,7 +4344,7 @@
;;
esac
else
-@@ -16794,7 +16711,7 @@
+@@ -16883,7 +16799,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5128,7 +4353,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16804,7 +16721,7 @@
+@@ -16893,7 +16809,7 @@
link_all_deplibs_F77=yes
;;
@@ -5137,7 +4362,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16827,7 +16744,7 @@
+@@ -16916,7 +16832,7 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5146,7 +4371,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16837,7 +16754,7 @@
+@@ -16926,7 +16842,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -5155,7 +4380,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16848,14 +16765,14 @@
+@@ -16937,14 +16853,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -5172,7 +4397,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$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'
-@@ -16867,7 +16784,7 @@
+@@ -16956,7 +16872,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -5181,7 +4406,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16892,9 +16809,9 @@
+@@ -16981,9 +16897,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -5193,7 +4418,7 @@
else
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -16914,7 +16831,7 @@
+@@ -17003,7 +16919,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.
@@ -5202,7 +4427,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16974,9 +16891,9 @@
+@@ -17063,9 +16979,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5214,7 +4439,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17082,7 +16999,7 @@
+@@ -17171,7 +17087,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5223,7 +4448,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17092,7 +17009,20 @@
+@@ -17181,7 +17097,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5245,7 +4470,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17157,7 +17087,7 @@
+@@ -17246,7 +17175,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5254,7 +4479,7 @@
;;
beos*)
-@@ -17182,7 +17112,7 @@
+@@ -17271,7 +17200,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5263,7 +4488,7 @@
need_version=no
need_lib_prefix=no
-@@ -17247,7 +17177,7 @@
+@@ -17336,7 +17265,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5272,7 +4497,7 @@
# 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"`
-@@ -17270,7 +17200,7 @@
+@@ -17359,7 +17288,7 @@
dynamic_linker=no
;;
@@ -5281,7 +4506,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17330,7 +17260,7 @@
+@@ -17419,7 +17348,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5290,7 +4515,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17345,7 +17275,7 @@
+@@ -17434,7 +17363,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5299,7 +4524,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17356,7 +17286,7 @@
+@@ -17445,7 +17374,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5308,7 +4533,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17418,22 +17348,19 @@
+@@ -17507,22 +17436,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'
@@ -5337,7 +4562,7 @@
# 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,
-@@ -17443,6 +17370,30 @@
+@@ -17532,6 +17458,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5368,7 +4593,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17452,7 +17403,7 @@
+@@ -17541,7 +17491,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5377,7 +4602,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17481,7 +17432,7 @@
+@@ -17570,7 +17520,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5386,7 +4611,7 @@
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
-@@ -17501,7 +17452,7 @@
+@@ -17590,7 +17540,7 @@
os2*)
libname_spec='$name'
@@ -5395,7 +4620,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17680,7 +17631,8 @@
+@@ -17769,7 +17719,8 @@
# 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.
@@ -5405,7 +4630,7 @@
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 \
-@@ -17810,7 +17762,7 @@
+@@ -17899,7 +17850,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5414,7 +4639,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17841,7 +17793,7 @@
+@@ -17930,7 +17881,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5423,7 +4648,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18058,7 +18010,10 @@
+@@ -18147,7 +18098,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.
@@ -5435,35 +4660,35 @@
fi
-@@ -18140,11 +18095,11 @@
+@@ -18229,11 +18183,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18143: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18098: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18232: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18186: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18147: \$? = $ac_status" >&5
-+ echo "$as_me:18102: \$? = $ac_status" >&5
+- echo "$as_me:18236: \$? = $ac_status" >&5
++ echo "$as_me:18190: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18373,11 +18328,11 @@
+@@ -18462,11 +18416,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18376: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18331: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18465: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18419: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18380: \$? = $ac_status" >&5
-+ echo "$as_me:18335: \$? = $ac_status" >&5
+- echo "$as_me:18469: \$? = $ac_status" >&5
++ echo "$as_me:18423: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18424,13 +18379,6 @@
+@@ -18513,13 +18467,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5477,21 +4702,21 @@
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.
-@@ -18440,11 +18388,11 @@
+@@ -18529,11 +18476,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18443: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18391: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18532: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18479: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18447: \$? = $ac_status" >&5
-+ echo "$as_me:18395: \$? = $ac_status" >&5
+- echo "$as_me:18536: \$? = $ac_status" >&5
++ echo "$as_me:18483: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18454,8 +18402,11 @@
+@@ -18543,8 +18490,11 @@
fi
fi
chmod u+w .
@@ -5505,7 +4730,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18583,7 +18534,7 @@
+@@ -18672,7 +18622,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5514,7 +4739,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18593,13 +18544,13 @@
+@@ -18682,13 +18632,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -5530,7 +4755,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18608,19 +18559,19 @@
+@@ -18697,19 +18647,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5554,7 +4779,7 @@
fi
;;
-@@ -18638,8 +18589,8 @@
+@@ -18727,8 +18677,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5565,7 +4790,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18652,10 +18603,36 @@
+@@ -18741,10 +18691,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -5604,7 +4829,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18705,9 +18682,20 @@
+@@ -18794,9 +18770,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5627,7 +4852,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18753,21 +18741,22 @@
+@@ -18842,21 +18829,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5655,7 +4880,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18791,8 +18780,7 @@
+@@ -18880,8 +18868,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5665,7 +4890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18819,14 +18807,13 @@
+@@ -18908,14 +18895,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5683,7 +4908,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18853,8 +18840,7 @@
+@@ -18942,8 +18928,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5693,7 +4918,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18892,7 +18878,7 @@
+@@ -18981,7 +18966,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -5702,7 +4927,7 @@
fi
fi
;;
-@@ -18915,13 +18901,13 @@
+@@ -19004,13 +18989,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5719,7 +4944,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
-@@ -18935,21 +18921,21 @@
+@@ -19024,21 +19009,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5754,7 +4979,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18958,18 +18944,18 @@
+@@ -19047,18 +19032,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5779,7 +5004,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19010,8 +18996,8 @@
+@@ -19099,8 +19084,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5790,7 +5015,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19019,7 +19005,7 @@
+@@ -19108,7 +19093,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5799,7 +5024,7 @@
else
archive_cmds_GCJ='$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
-@@ -19037,10 +19023,10 @@
+@@ -19126,10 +19111,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5812,7 +5037,7 @@
;;
esac
else
-@@ -19087,7 +19073,7 @@
+@@ -19176,7 +19161,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5821,7 +5046,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19097,7 +19083,7 @@
+@@ -19186,7 +19171,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5830,7 +5055,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19120,7 +19106,7 @@
+@@ -19209,7 +19194,7 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5839,7 +5064,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19130,7 +19116,7 @@
+@@ -19219,7 +19204,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5848,7 +5073,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19141,14 +19127,14 @@
+@@ -19230,14 +19215,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5865,7 +5090,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$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'
-@@ -19160,7 +19146,7 @@
+@@ -19249,7 +19234,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5874,7 +5099,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19185,9 +19171,9 @@
+@@ -19274,9 +19259,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -5886,7 +5111,7 @@
else
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19207,7 +19193,7 @@
+@@ -19296,7 +19281,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.
@@ -5895,7 +5120,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19267,9 +19253,9 @@
+@@ -19356,9 +19341,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5907,7 +5132,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19375,7 +19361,7 @@
+@@ -19464,7 +19449,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5916,7 +5141,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19385,7 +19371,20 @@
+@@ -19474,7 +19459,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5938,7 +5163,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19450,7 +19449,7 @@
+@@ -19539,7 +19537,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5947,7 +5172,7 @@
;;
beos*)
-@@ -19475,7 +19474,7 @@
+@@ -19564,7 +19562,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5956,7 +5181,7 @@
need_version=no
need_lib_prefix=no
-@@ -19540,7 +19539,7 @@
+@@ -19629,7 +19627,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5965,7 +5190,7 @@
# 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"`
-@@ -19563,7 +19562,7 @@
+@@ -19652,7 +19650,7 @@
dynamic_linker=no
;;
@@ -5974,7 +5199,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19623,7 +19622,7 @@
+@@ -19712,7 +19710,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5983,7 +5208,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19638,7 +19637,7 @@
+@@ -19727,7 +19725,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5992,7 +5217,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19649,7 +19648,7 @@
+@@ -19738,7 +19736,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6001,7 +5226,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19711,22 +19710,19 @@
+@@ -19800,22 +19798,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'
@@ -6030,7 +5255,7 @@
# 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,
-@@ -19736,6 +19732,30 @@
+@@ -19825,6 +19820,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6061,7 +5286,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19745,7 +19765,7 @@
+@@ -19834,7 +19853,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6070,7 +5295,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19774,7 +19794,7 @@
+@@ -19863,7 +19882,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6079,7 +5304,7 @@
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
-@@ -19794,7 +19814,7 @@
+@@ -19883,7 +19902,7 @@
os2*)
libname_spec='$name'
@@ -6088,7 +5313,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20023,8 +20043,7 @@
+@@ -20112,8 +20131,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6098,7 +5323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20127,8 +20146,7 @@
+@@ -20216,8 +20234,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6108,7 +5333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20193,8 +20211,7 @@
+@@ -20282,8 +20299,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6118,7 +5343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20287,8 +20304,7 @@
+@@ -20376,8 +20392,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6128,7 +5353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20353,8 +20369,7 @@
+@@ -20442,8 +20457,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6138,7 +5363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20420,8 +20435,7 @@
+@@ -20509,8 +20523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6148,7 +5373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20487,8 +20501,7 @@
+@@ -20576,8 +20589,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6158,25 +5383,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20563,7 +20576,7 @@
+@@ -20652,7 +20664,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20566 "configure"
-+#line 20579 "configure"
+-#line 20655 "configure"
++#line 20667 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20661,7 +20674,7 @@
+@@ -20750,7 +20762,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20664 "configure"
-+#line 20677 "configure"
+-#line 20753 "configure"
++#line 20765 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20778,7 +20791,8 @@
+@@ -20867,7 +20879,8 @@
# 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.
@@ -6186,7 +5411,7 @@
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 \
-@@ -20908,7 +20922,7 @@
+@@ -20997,7 +21010,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6195,7 +5420,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20939,7 +20953,7 @@
+@@ -21028,7 +21041,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6204,7 +5429,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21156,7 +21170,10 @@
+@@ -21245,7 +21258,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.
@@ -6216,7 +5441,7 @@
fi
-@@ -21219,7 +21236,8 @@
+@@ -21308,7 +21324,8 @@
# 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.
@@ -6226,7 +5451,7 @@
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 \
-@@ -21349,7 +21367,7 @@
+@@ -21438,7 +21455,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6235,7 +5460,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21380,7 +21398,7 @@
+@@ -21469,7 +21486,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6244,7 +5469,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21597,7 +21615,10 @@
+@@ -21686,7 +21703,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.
@@ -6256,7 +5481,7 @@
fi
-@@ -21644,7 +21665,7 @@
+@@ -21733,7 +21753,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -6265,7 +5490,7 @@
# Prevent multiple expansion
-@@ -21881,8 +21902,7 @@
+@@ -21970,8 +21990,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6275,7 +5500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -21956,9 +21976,6 @@
+@@ -22045,9 +22064,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6285,7 +5510,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21992,8 +22009,7 @@
+@@ -22081,8 +22097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6295,7 +5520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22097,8 +22113,7 @@
+@@ -22186,8 +22201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6305,7 +5530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22177,9 +22192,6 @@
+@@ -22266,9 +22280,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6315,7 +5540,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22212,8 +22224,7 @@
+@@ -22301,8 +22312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6325,7 +5550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22316,8 +22327,7 @@
+@@ -22405,8 +22415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6335,7 +5560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22407,8 +22417,7 @@
+@@ -22496,8 +22505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6345,7 +5570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22469,8 +22478,7 @@
+@@ -22558,8 +22566,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6355,7 +5580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22538,8 +22546,7 @@
+@@ -22627,8 +22634,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6365,7 +5590,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22605,8 +22612,7 @@
+@@ -22694,8 +22700,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6375,7 +5600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22699,8 +22705,7 @@
+@@ -22788,8 +22793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6385,7 +5610,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22778,8 +22783,7 @@
+@@ -22867,8 +22871,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6395,7 +5620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22863,8 +22867,7 @@
+@@ -22952,8 +22955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6405,7 +5630,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22932,8 +22935,7 @@
+@@ -23021,8 +23023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6415,7 +5640,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23028,8 +23030,7 @@
+@@ -23117,8 +23118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6425,7 +5650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23093,8 +23094,7 @@
+@@ -23182,8 +23182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6435,7 +5660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23189,8 +23189,7 @@
+@@ -23278,8 +23277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6445,7 +5670,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23254,8 +23253,7 @@
+@@ -23343,8 +23341,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6455,7 +5680,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23351,8 +23349,7 @@
+@@ -23440,8 +23437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6465,7 +5690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23416,8 +23413,7 @@
+@@ -23505,8 +23501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6475,7 +5700,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23514,8 +23510,7 @@
+@@ -23603,8 +23598,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6485,7 +5710,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23580,8 +23575,7 @@
+@@ -23669,8 +23663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6495,7 +5720,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23649,8 +23643,7 @@
+@@ -23738,8 +23731,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6505,7 +5730,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23801,8 +23794,7 @@
+@@ -23890,8 +23882,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6515,7 +5740,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23957,8 +23949,7 @@
+@@ -24046,8 +24037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6525,7 +5750,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24023,8 +24014,7 @@
+@@ -24112,8 +24102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6535,7 +5760,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24171,8 +24161,7 @@
+@@ -24260,8 +24249,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6545,7 +5770,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24327,8 +24316,7 @@
+@@ -24416,8 +24404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6555,7 +5780,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24384,9 +24372,6 @@
+@@ -24473,9 +24460,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6565,7 +5790,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24420,8 +24405,7 @@
+@@ -24509,8 +24493,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6575,7 +5800,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24525,8 +24509,7 @@
+@@ -24614,8 +24597,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6585,7 +5810,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24626,8 +24609,7 @@
+@@ -24715,8 +24697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6595,7 +5820,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24701,8 +24683,7 @@
+@@ -24790,8 +24771,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6605,7 +5830,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24765,8 +24746,7 @@
+@@ -24854,8 +24834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6615,7 +5840,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24828,8 +24808,7 @@
+@@ -24917,8 +24896,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6625,7 +5850,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24869,8 +24848,7 @@
+@@ -24958,8 +24936,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6635,7 +5860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24926,8 +24904,7 @@
+@@ -25015,8 +24992,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6645,7 +5870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24967,8 +24944,7 @@
+@@ -25056,8 +25032,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6655,7 +5880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25032,8 +25008,7 @@
+@@ -25121,8 +25096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6665,7 +5890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25064,10 +25039,8 @@
+@@ -25153,10 +25127,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6678,7 +5903,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25178,8 +25151,7 @@
+@@ -25267,8 +25239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6688,7 +5913,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25241,8 +25213,7 @@
+@@ -25330,8 +25301,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6698,7 +5923,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25282,8 +25253,7 @@
+@@ -25371,8 +25341,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6708,7 +5933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25339,8 +25309,7 @@
+@@ -25428,8 +25397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6718,7 +5943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25380,8 +25349,7 @@
+@@ -25469,8 +25437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6728,7 +5953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25445,8 +25413,7 @@
+@@ -25534,8 +25501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6738,7 +5963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25477,10 +25444,8 @@
+@@ -25566,10 +25532,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6751,7 +5976,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25591,8 +25556,7 @@
+@@ -25680,8 +25644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6761,7 +5986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25654,8 +25618,7 @@
+@@ -25743,8 +25706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6771,7 +5996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25695,8 +25658,7 @@
+@@ -25784,8 +25746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6781,7 +6006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25752,8 +25714,7 @@
+@@ -25841,8 +25802,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6791,7 +6016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25793,8 +25754,7 @@
+@@ -25882,8 +25842,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6801,7 +6026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25858,8 +25818,7 @@
+@@ -25947,8 +25906,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6811,7 +6036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25890,10 +25849,8 @@
+@@ -25979,10 +25937,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6824,7 +6049,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26004,8 +25961,7 @@
+@@ -26093,8 +26049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6834,7 +6059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26067,8 +26023,7 @@
+@@ -26156,8 +26111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6844,7 +6069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26108,8 +26063,7 @@
+@@ -26197,8 +26151,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6854,7 +6079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26165,8 +26119,7 @@
+@@ -26254,8 +26207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6864,7 +6089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26206,8 +26159,7 @@
+@@ -26295,8 +26247,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6874,7 +6099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26271,8 +26223,7 @@
+@@ -26360,8 +26311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6884,7 +6109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26303,10 +26254,8 @@
+@@ -26392,10 +26342,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6897,7 +6122,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26425,8 +26374,7 @@
+@@ -26514,8 +26462,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6907,7 +6132,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26497,8 +26445,7 @@
+@@ -26586,8 +26533,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6917,7 +6142,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26568,8 +26515,7 @@
+@@ -26657,8 +26603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6927,7 +6152,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26631,8 +26577,7 @@
+@@ -26720,8 +26665,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6937,7 +6162,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26672,8 +26617,7 @@
+@@ -26761,8 +26705,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6947,7 +6172,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26729,8 +26673,7 @@
+@@ -26818,8 +26761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6957,7 +6182,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26770,8 +26713,7 @@
+@@ -26859,8 +26801,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6967,7 +6192,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26835,8 +26777,7 @@
+@@ -26924,8 +26865,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6977,7 +6202,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26867,10 +26808,8 @@
+@@ -26956,10 +26896,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6990,7 +6215,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26982,8 +26921,7 @@
+@@ -27071,8 +27009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7000,7 +6225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27045,8 +26983,7 @@
+@@ -27134,8 +27071,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7010,7 +6235,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27086,8 +27023,7 @@
+@@ -27175,8 +27111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7020,7 +6245,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27143,8 +27079,7 @@
+@@ -27232,8 +27167,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7030,7 +6255,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27184,8 +27119,7 @@
+@@ -27273,8 +27207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7040,7 +6265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27249,8 +27183,7 @@
+@@ -27338,8 +27271,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7050,7 +6275,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27281,10 +27214,8 @@
+@@ -27370,10 +27302,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7063,7 +6288,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27395,8 +27326,7 @@
+@@ -27484,8 +27414,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7073,7 +6298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27466,8 +27396,7 @@
+@@ -27555,8 +27484,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7083,7 +6308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27647,8 +27576,7 @@
+@@ -27736,8 +27664,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7093,7 +6318,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27757,8 +27685,7 @@
+@@ -27846,8 +27773,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7103,7 +6328,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27982,8 +27909,7 @@
+@@ -28071,8 +27997,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7113,7 +6338,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28206,8 +28132,7 @@
+@@ -28295,8 +28220,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7123,7 +6348,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28283,8 +28208,7 @@
+@@ -28372,8 +28296,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7133,7 +6358,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28507,8 +28431,7 @@
+@@ -28596,8 +28519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7143,7 +6368,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28583,8 +28506,7 @@
+@@ -28672,8 +28594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7153,7 +6378,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28644,8 +28566,7 @@
+@@ -28733,8 +28654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7163,7 +6388,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28728,8 +28649,7 @@
+@@ -28817,8 +28737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7173,7 +6398,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28822,8 +28742,7 @@
+@@ -28911,8 +28830,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7183,7 +6408,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28997,8 +28916,7 @@
+@@ -29086,8 +29004,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7193,7 +6418,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29096,8 +29014,7 @@
+@@ -29185,8 +29102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7203,7 +6428,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29190,8 +29107,7 @@
+@@ -29279,8 +29195,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7213,7 +6438,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29274,8 +29190,7 @@
+@@ -29363,8 +29278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7223,25 +6448,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29328,7 +29243,7 @@
+@@ -29417,7 +29331,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29331: $i/$j" >&5
-+ echo "configure: 29246: $i/$j" >&5
+- echo "configure: 29420: $i/$j" >&5
++ echo "configure: 29334: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29636,7 +29551,7 @@
+@@ -29725,7 +29639,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29639: $i/$j" >&5
-+ echo "configure: 29554: $i/$j" >&5
+- echo "configure: 29728: $i/$j" >&5
++ echo "configure: 29642: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30313,8 +30228,7 @@
+@@ -30402,8 +30316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7251,70 +6476,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30473,7 +30387,7 @@
+@@ -30562,7 +30475,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30476: $i/$j" >&5
-+ echo "configure: 30390: $i/$j" >&5
+- echo "configure: 30565: $i/$j" >&5
++ echo "configure: 30478: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30503,7 +30417,7 @@
+@@ -30592,7 +30505,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30506: $i/$j" >&5
-+ echo "configure: 30420: $i/$j" >&5
+- echo "configure: 30595: $i/$j" >&5
++ echo "configure: 30508: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30521,7 +30435,7 @@
+@@ -30610,7 +30523,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30524: $i/$j" >&5
-+ echo "configure: 30438: $i/$j" >&5
+- echo "configure: 30613: $i/$j" >&5
++ echo "configure: 30526: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30680,8 +30594,24 @@
- echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
- echo "${ECHO_T}$kde_cv_uic_plugins" >&6
- if test "$kde_cv_uic_plugins" != yes; then
-- { { echo "$as_me:$LINENO: error: you need to install kdelibs first." >&5
--echo "$as_me: error: you need to install kdelibs first." >&2;}
-+ { { echo "$as_me:$LINENO: error:
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+" >&5
-+echo "$as_me: error:
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -32023,7 +31953,7 @@
+@@ -32128,7 +32041,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32026: $i/$j" >&5
-+ echo "configure: 31956: $i/$j" >&5
+- echo "configure: 32131: $i/$j" >&5
++ echo "configure: 32044: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32195,9 +32125,6 @@
+@@ -32300,9 +32213,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7324,7 +6522,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32228,8 +32155,7 @@
+@@ -32333,8 +32243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7334,7 +6532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32330,8 +32256,7 @@
+@@ -32435,8 +32344,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7344,7 +6542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32410,9 +32335,6 @@
+@@ -32515,9 +32423,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7354,7 +6552,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32443,8 +32365,7 @@
+@@ -32548,8 +32453,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7364,7 +6562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32545,8 +32466,7 @@
+@@ -32650,8 +32554,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7374,7 +6572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32641,8 +32561,7 @@
+@@ -32746,8 +32649,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7384,7 +6582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32791,8 +32710,7 @@
+@@ -32896,8 +32798,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7394,7 +6592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32940,8 +32858,7 @@
+@@ -33045,8 +32946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7404,7 +6602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33019,8 +32936,7 @@
+@@ -33124,8 +33024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7414,7 +6612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33174,8 +33090,7 @@
+@@ -33279,8 +33178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7424,7 +6622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33279,8 +33194,7 @@
+@@ -33384,8 +33282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7434,7 +6632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33337,8 +33251,7 @@
+@@ -33442,8 +33339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7444,7 +6642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33477,8 +33390,7 @@
+@@ -33582,8 +33478,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7454,7 +6652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33718,8 +33630,7 @@
+@@ -33823,8 +33718,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7464,7 +6662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33787,8 +33698,7 @@
+@@ -33892,8 +33786,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7474,7 +6672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33883,8 +33793,7 @@
+@@ -33988,8 +33881,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7484,7 +6682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34012,8 +33921,7 @@
+@@ -34117,8 +34009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7494,7 +6692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34085,8 +33993,7 @@
+@@ -34190,8 +34081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7504,7 +6702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34140,8 +34047,7 @@
+@@ -34245,8 +34135,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7514,7 +6712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34212,8 +34118,7 @@
+@@ -34317,8 +34206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7524,7 +6722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34267,8 +34172,7 @@
+@@ -34372,8 +34260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7534,7 +6732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34335,8 +34239,7 @@
+@@ -34440,8 +34327,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7544,7 +6742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34521,8 +34424,7 @@
+@@ -34626,8 +34512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7554,7 +6752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34782,9 +34684,6 @@
+@@ -34887,9 +34772,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7564,7 +6762,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34813,8 +34712,7 @@
+@@ -34918,8 +34800,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7574,7 +6772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34913,8 +34811,7 @@
+@@ -35018,8 +34899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7584,7 +6782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34991,9 +34888,6 @@
+@@ -35096,9 +34976,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7594,7 +6792,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35022,8 +34916,7 @@
+@@ -35127,8 +35004,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7604,7 +6802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35122,8 +35015,7 @@
+@@ -35227,8 +35103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7614,7 +6812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35200,9 +35092,6 @@
+@@ -35305,9 +35180,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7624,7 +6822,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35231,8 +35120,7 @@
+@@ -35336,8 +35208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7634,7 +6832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35331,8 +35219,7 @@
+@@ -35436,8 +35307,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7644,7 +6842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35426,8 +35313,7 @@
+@@ -35531,8 +35401,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7654,7 +6852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35469,8 +35355,7 @@
+@@ -35574,8 +35443,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7664,7 +6862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35527,8 +35412,7 @@
+@@ -35632,8 +35500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7674,7 +6872,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35988,6 +35872,13 @@
+@@ -36093,6 +35960,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7688,7 +6886,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -36690,6 +36581,9 @@
+@@ -36795,6 +36669,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -7698,7 +6896,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -37053,11 +36947,6 @@
+@@ -37158,11 +37035,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7710,7 +6908,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -37096,6 +36985,12 @@
+@@ -37201,6 +37073,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7723,35 +6921,23 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru kdeadmin-3.4.0.orig/configure.in kdeadmin-3.4.0/configure.in
---- kdeadmin-3.4.0.orig/configure.in 2005-03-04 07:08:59.000000000 -0500
-+++ kdeadmin-3.4.0/configure.in 2005-04-07 20:22:28.000000000 -0400
+diff -rua kdeadmin-3.4.1.orig/configure.in kdeadmin-3.4.1/configure.in
+--- kdeadmin-3.4.1.orig/configure.in 2005-05-23 17:44:38.000000000 +0200
++++ kdeadmin-3.4.1/configure.in 2005-05-25 00:37:40.667800281 +0200
@@ -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
+ AM_INIT_AUTOMAKE(kdeadmin, "3.4.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -182,6 +182,9 @@
+Seulement dans kdeadmin-3.4.1: debian
+diff -rua kdeadmin-3.4.1.orig/doc/kcron/Makefile.in kdeadmin-3.4.1/doc/kcron/Makefile.in
+--- kdeadmin-3.4.1.orig/doc/kcron/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/doc/kcron/Makefile.in 2005-05-25 00:38:04.863619175 +0200
+@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7761,15 +6947,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -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
+@@ -319,7 +322,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -7777,7 +6956,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
@@ -7789,79 +6968,18 @@
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 @@
+@@ -504,7 +507,7 @@
+ .NOEXPORT:
- 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 \
-@@ -686,7 +701,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
+ #>+ 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
- # 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.
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) newvariable.png kcron.png newtask.png print.png index.docbook kcronstart.png
+diff -rua kdeadmin-3.4.1.orig/doc/kdat/Makefile.in kdeadmin-3.4.1/doc/kdat/Makefile.in
+--- kdeadmin-3.4.1.orig/doc/kdat/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/doc/kdat/Makefile.in 2005-05-25 00:38:04.869618634 +0200
@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7893,68 +7011,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -504,10 +507,10 @@
+@@ -504,7 +507,7 @@
.NOEXPORT:
#>+ 2
--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
+-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) 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
-
-@@ -579,7 +582,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
+diff -rua kdeadmin-3.4.1.orig/doc/kpackage/Makefile.in kdeadmin-3.4.1/doc/kpackage/Makefile.in
+--- kdeadmin-3.4.1.orig/doc/kpackage/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/doc/kpackage/Makefile.in 2005-05-25 00:38:04.875618093 +0200
@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7990,36 +7058,14 @@
.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=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=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 handle.png Makefile.am uninstall.png index.cache.bz2
#>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-@@ -579,7 +582,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) debaptloc.png rpmloc.png right-change.png index.docbook search.png install.png bsdloc.png uninstall.png searchf.png right-files.png searchl.png debloc.png left.png slackloc.png right-prop.png handle.png
+diff -rua kdeadmin-3.4.1.orig/doc/ksysv/Makefile.in kdeadmin-3.4.1/doc/ksysv/Makefile.in
+--- kdeadmin-3.4.1.orig/doc/ksysv/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/doc/ksysv/Makefile.in 2005-05-25 00:38:04.881617553 +0200
@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8051,68 +7097,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -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
-
-@@ -579,7 +582,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+diff -rua kdeadmin-3.4.1.orig/doc/kuser/Makefile.in kdeadmin-3.4.1/doc/kuser/Makefile.in
+--- kdeadmin-3.4.1.orig/doc/kuser/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/doc/kuser/Makefile.in 2005-05-25 00:38:04.887617012 +0200
@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8144,32 +7131,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,7 +582,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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 @@
+diff -rua kdeadmin-3.4.1.orig/doc/Makefile.in kdeadmin-3.4.1/doc/Makefile.in
+--- kdeadmin-3.4.1.orig/doc/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/doc/Makefile.in 2005-05-25 00:38:04.857619716 +0200
+@@ -182,6 +182,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8179,8 +7144,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,7 +322,7 @@
- all: docs-am all-am
+@@ -338,7 +341,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -8188,7 +7153,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
@@ -8200,87 +7165,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -507,7 +510,7 @@
- KDE_DIST=Makefile.in kuser.png index.docbook Makefile.am index.cache.bz2
-
- #>+ 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
-
-@@ -579,7 +582,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/kcron/Makefile.in 2005-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -99,18 +99,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 = $(kcron_SOURCES)
- DIST_SOURCES = $(kcron_SOURCES)
+diff -rua kdeadmin-3.4.1.orig/kcron/Makefile.in kdeadmin-3.4.1/kcron/Makefile.in
+--- kdeadmin-3.4.1.orig/kcron/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kcron/Makefile.in 2005-05-25 00:38:04.919614127 +0200
@@ -242,6 +242,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8312,106 +7199,9 @@
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 -Nru 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 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/kdat/Makefile.in 2005-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -113,18 +113,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 = $(kdat_SOURCES)
- DIST_SOURCES = $(kdat_SOURCES)
+diff -rua kdeadmin-3.4.1.orig/kdat/Makefile.in kdeadmin-3.4.1/kdat/Makefile.in
+--- kdeadmin-3.4.1.orig/kdat/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kdat/Makefile.in 2005-05-25 00:38:04.950611333 +0200
@@ -270,6 +270,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8443,143 +7233,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -715,7 +718,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 \
-@@ -727,7 +736,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; \
-@@ -735,7 +744,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)' ;; \
-@@ -756,7 +771,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 \
-@@ -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 -Nru 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 07:09:28.000000000 -0500
-+++ kdeadmin-3.4.0/kdat/pics/Makefile.in 2005-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+diff -rua kdeadmin-3.4.1.orig/kdat/pics/Makefile.in kdeadmin-3.4.1/kdat/pics/Makefile.in
+--- kdeadmin-3.4.1.orig/kdat/pics/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kdat/pics/Makefile.in 2005-05-25 00:38:04.961610342 +0200
@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8611,177 +7267,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -503,91 +506,91 @@
- .NOEXPORT:
-
- #>+ 2
--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
- docs-am:
-
- #>+ 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
-
- 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:
-@@ -617,7 +620,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kfile-plugins/Makefile.in 2005-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -182,6 +182,9 @@
+diff -rua kdeadmin-3.4.1.orig/kfile-plugins/deb/Makefile.in kdeadmin-3.4.1/kfile-plugins/deb/Makefile.in
+--- kdeadmin-3.4.1.orig/kfile-plugins/deb/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kfile-plugins/deb/Makefile.in 2005-05-25 00:38:04.977608899 +0200
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8791,16 +7280,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -334,7 +337,7 @@
- all: docs-am all-recursive
+@@ -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*) \
-@@ -372,9 +375,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8810,105 +7299,12 @@
-$(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:
-@@ -394,7 +397,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 \
-@@ -406,7 +415,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; \
-@@ -414,7 +423,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)' ;; \
-@@ -435,7 +450,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 \
-@@ -682,7 +697,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -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_deb_la_SOURCES)
- DIST_SOURCES = $(kfile_deb_la_SOURCES)
-@@ -214,6 +214,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdeadmin-3.4.1.orig/kfile-plugins/Makefile.in kdeadmin-3.4.1/kfile-plugins/Makefile.in
+--- kdeadmin-3.4.1.orig/kfile-plugins/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kfile-plugins/Makefile.in 2005-05-25 00:38:04.967609801 +0200
+@@ -182,6 +182,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8918,16 +7314,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -334,7 +337,7 @@
+ all: docs-am all-recursive
.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 @@
+@@ -372,9 +375,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8937,47 +7333,11 @@
-$(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)
-diff -Nru 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-04-07 20:23:23.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -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)
+ mostlyclean-libtool:
+diff -rua kdeadmin-3.4.1.orig/kfile-plugins/rpm/Makefile.in kdeadmin-3.4.1/kfile-plugins/rpm/Makefile.in
+--- kdeadmin-3.4.1.orig/kfile-plugins/rpm/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kfile-plugins/rpm/Makefile.in 2005-05-25 00:38:04.986608088 +0200
@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9009,46 +7369,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -93,18 +93,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 = $(kpackage_SOURCES)
- DIST_SOURCES = $(kpackage_SOURCES)
-@@ -250,6 +250,9 @@
+diff -rua kdeadmin-3.4.1.orig/kpackage/icon/Makefile.in kdeadmin-3.4.1/kpackage/icon/Makefile.in
+--- kdeadmin-3.4.1.orig/kpackage/icon/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kpackage/icon/Makefile.in 2005-05-25 00:38:05.068600697 +0200
+@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9058,16 +7382,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -318,7 +321,7 @@
+ all: docs-am all-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*) \
-@@ -467,9 +470,9 @@
+@@ -356,9 +359,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9077,145 +7401,12 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -609,7 +612,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 \
-@@ -621,7 +630,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; \
-@@ -629,7 +638,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)' ;; \
-@@ -650,7 +665,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 \
-@@ -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 -Nru 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-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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 @@
+ mostlyclean-libtool:
+diff -rua kdeadmin-3.4.1.orig/kpackage/Makefile.in kdeadmin-3.4.1/kpackage/Makefile.in
+--- kdeadmin-3.4.1.orig/kpackage/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kpackage/Makefile.in 2005-05-25 00:38:05.058601598 +0200
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9225,16 +7416,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,7 +321,7 @@
- all: docs-am all-am
+@@ -429,7 +432,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 @@
+@@ -467,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9244,62 +7435,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:
-@@ -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
-@@ -554,7 +557,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/mimetypes/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+diff -rua kdeadmin-3.4.1.orig/kpackage/mimetypes/Makefile.in kdeadmin-3.4.1/kpackage/mimetypes/Makefile.in
+--- kdeadmin-3.4.1.orig/kpackage/mimetypes/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kpackage/mimetypes/Makefile.in 2005-05-25 00:38:05.076599976 +0200
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9331,31 +7471,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -561,7 +564,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/pics/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+diff -rua kdeadmin-3.4.1.orig/kpackage/pics/Makefile.in kdeadmin-3.4.1/kpackage/pics/Makefile.in
+--- kdeadmin-3.4.1.orig/kpackage/pics/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kpackage/pics/Makefile.in 2005-05-25 00:38:05.085599165 +0200
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9387,40 +7505,9 @@
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:
-@@ -565,7 +568,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kpackage/toolbar/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+diff -rua kdeadmin-3.4.1.orig/kpackage/toolbar/Makefile.in kdeadmin-3.4.1/kpackage/toolbar/Makefile.in
+--- kdeadmin-3.4.1.orig/kpackage/toolbar/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kpackage/toolbar/Makefile.in 2005-05-25 00:38:05.094598353 +0200
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9452,67 +7539,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -561,7 +564,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/ksysv/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -95,29 +95,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(ksysv_SOURCES)
- DIST_SOURCES = $(ksysv_SOURCES)
+diff -rua kdeadmin-3.4.1.orig/ksysv/Makefile.in kdeadmin-3.4.1/ksysv/Makefile.in
+--- kdeadmin-3.4.1.orig/ksysv/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/ksysv/Makefile.in 2005-05-25 00:38:05.150593306 +0200
@@ -266,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9544,176 +7573,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -759,7 +762,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 \
-@@ -771,7 +780,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; \
-@@ -779,7 +788,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)' ;; \
-@@ -800,7 +815,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 \
-@@ -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 -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/ksysv/pics/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+diff -rua kdeadmin-3.4.1.orig/ksysv/pics/Makefile.in kdeadmin-3.4.1/ksysv/pics/Makefile.in
+--- kdeadmin-3.4.1.orig/ksysv/pics/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/ksysv/pics/Makefile.in 2005-05-25 00:38:05.156592765 +0200
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9745,31 +7607,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -568,7 +571,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/ksysv/toolbar/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+diff -rua kdeadmin-3.4.1.orig/ksysv/toolbar/Makefile.in kdeadmin-3.4.1/ksysv/toolbar/Makefile.in
+--- kdeadmin-3.4.1.orig/ksysv/toolbar/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/ksysv/toolbar/Makefile.in 2005-05-25 00:38:05.162592224 +0200
@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9801,68 +7641,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -542,7 +545,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kuser/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -92,29 +92,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(kuser_SOURCES)
- DIST_SOURCES = $(kuser_SOURCES)
-@@ -262,6 +262,9 @@
+diff -rua kdeadmin-3.4.1.orig/kuser/icon/Makefile.in kdeadmin-3.4.1/kuser/icon/Makefile.in
+--- kdeadmin-3.4.1.orig/kuser/icon/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kuser/icon/Makefile.in 2005-05-25 00:38:05.208588078 +0200
+@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9872,16 +7654,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -318,7 +321,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .c .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*) \
-@@ -504,9 +507,9 @@
+@@ -356,9 +359,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9891,148 +7673,12 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -683,7 +686,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 \
-@@ -695,7 +704,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; \
-@@ -703,7 +712,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)' ;; \
-@@ -724,7 +739,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 \
-@@ -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 -Nru 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-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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 @@
+ mostlyclean-libtool:
+diff -rua kdeadmin-3.4.1.orig/kuser/Makefile.in kdeadmin-3.4.1/kuser/Makefile.in
+--- kdeadmin-3.4.1.orig/kuser/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kuser/Makefile.in 2005-05-25 00:38:05.202588618 +0200
+@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10042,16 +7688,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,7 +321,7 @@
- all: docs-am all-am
+@@ -466,7 +469,7 @@
.SUFFIXES:
+ .SUFFIXES: .c .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 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10061,74 +7707,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:
-@@ -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:
-@@ -554,7 +557,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kuser/pic/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+diff -rua kdeadmin-3.4.1.orig/kuser/pic/Makefile.in kdeadmin-3.4.1/kuser/pic/Makefile.in
+--- kdeadmin-3.4.1.orig/kuser/pic/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kuser/pic/Makefile.in 2005-05-25 00:38:05.214587537 +0200
@@ -176,6 +176,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10160,31 +7743,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -567,7 +570,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/kuser/toolbar/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
+diff -rua kdeadmin-3.4.1.orig/kuser/toolbar/Makefile.in kdeadmin-3.4.1/kuser/toolbar/Makefile.in
+--- kdeadmin-3.4.1.orig/kuser/toolbar/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/kuser/toolbar/Makefile.in 2005-05-25 00:38:05.221586906 +0200
@@ -166,6 +166,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10216,58 +7777,10 @@
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
-@@ -553,7 +556,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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 @@
+diff -rua kdeadmin-3.4.1.orig/lilo-config/common/Makefile.in kdeadmin-3.4.1/lilo-config/common/Makefile.in
+--- kdeadmin-3.4.1.orig/lilo-config/common/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/lilo-config/common/Makefile.in 2005-05-25 00:38:05.235585644 +0200
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10277,16 +7790,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -335,7 +338,7 @@
- all: docs-am all-recursive
+@@ -368,7 +371,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -373,9 +376,9 @@
+@@ -406,9 +409,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10297,104 +7810,11 @@
+$(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 \
-@@ -686,7 +701,7 @@
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
-- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/common/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -73,18 +73,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 = $(libcommon_la_SOURCES)
- DIST_SOURCES = $(libcommon_la_SOURCES)
-@@ -208,6 +208,9 @@
+ clean-noinstLTLIBRARIES:
+diff -rua kdeadmin-3.4.1.orig/lilo-config/common/tests/Makefile.in kdeadmin-3.4.1/lilo-config/common/tests/Makefile.in
+--- kdeadmin-3.4.1.orig/lilo-config/common/tests/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/lilo-config/common/tests/Makefile.in 2005-05-25 00:38:05.242585013 +0200
+@@ -199,6 +199,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10404,7 +7824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -368,7 +371,7 @@
+@@ -356,7 +359,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10413,7 +7833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -406,9 +409,9 @@
+@@ -394,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10424,47 +7844,11 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/common/tests/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -65,18 +65,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 = $(String_SOURCES)
- DIST_SOURCES = $(String_SOURCES)
-@@ -199,6 +199,9 @@
+ clean-noinstPROGRAMS:
+diff -rua kdeadmin-3.4.1.orig/lilo-config/kde/Makefile.in kdeadmin-3.4.1/lilo-config/kde/Makefile.in
+--- kdeadmin-3.4.1.orig/lilo-config/kde/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/lilo-config/kde/Makefile.in 2005-05-25 00:38:05.263583120 +0200
+@@ -218,6 +218,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10474,16 +7858,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -356,7 +359,7 @@
+@@ -381,7 +384,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -394,9 +397,9 @@
+@@ -419,9 +422,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10493,48 +7877,12 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- clean-noinstPROGRAMS:
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/kde/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -81,18 +81,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 = $(kcm_lilo_la_SOURCES)
- DIST_SOURCES = $(kcm_lilo_la_SOURCES)
-@@ -218,6 +218,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdeadmin-3.4.1.orig/lilo-config/kde-qt-common/Makefile.in kdeadmin-3.4.1/lilo-config/kde-qt-common/Makefile.in
+--- kdeadmin-3.4.1.orig/lilo-config/kde-qt-common/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/lilo-config/kde-qt-common/Makefile.in 2005-05-25 00:38:05.253584021 +0200
+@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10544,7 +7892,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
+@@ -373,7 +376,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10553,7 +7901,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -411,9 +414,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10563,48 +7911,12 @@
-$(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)
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/kde-qt-common/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -73,18 +73,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 = $(libwidgets_la_SOURCES)
- DIST_SOURCES = $(libwidgets_la_SOURCES)
-@@ -208,6 +208,9 @@
+ clean-noinstLTLIBRARIES:
+diff -rua kdeadmin-3.4.1.orig/lilo-config/Makefile.in kdeadmin-3.4.1/lilo-config/Makefile.in
+--- kdeadmin-3.4.1.orig/lilo-config/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/lilo-config/Makefile.in 2005-05-25 00:38:05.227586365 +0200
+@@ -183,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10614,16 +7926,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -373,7 +376,7 @@
+@@ -335,7 +338,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -411,9 +414,9 @@
+@@ -373,9 +376,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10634,89 +7946,10 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
-@@ -646,18 +649,18 @@
- .NOEXPORT:
-
- #>+ 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
-
- #>+ 2
--mocs: general.moc
-+mocs: EditWidget.moc
-
- #>+ 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
-
- #>+ 2
--mocs: EditWidget.moc
-+mocs: general.moc
-
- #>+ 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 -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/lilo-config/qt/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @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.
-@@ -73,18 +73,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 = $(lilo_config_SOURCES)
- DIST_SOURCES = $(lilo_config_SOURCES)
+ mostlyclean-libtool:
+diff -rua kdeadmin-3.4.1.orig/lilo-config/qt/Makefile.in kdeadmin-3.4.1/lilo-config/qt/Makefile.in
+--- kdeadmin-3.4.1.orig/lilo-config/qt/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/lilo-config/qt/Makefile.in 2005-05-25 00:38:05.272582309 +0200
@@ -207,6 +207,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10748,45 +7981,64 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru 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 07:09:29.000000000 -0500
-+++ kdeadmin-3.4.0/secpolicy/Makefile.in 2005-04-07 20:23:24.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
--# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.3 $
- # @configure_input@
+diff -rua kdeadmin-3.4.1.orig/Makefile.in kdeadmin-3.4.1/Makefile.in
+--- kdeadmin-3.4.1.orig/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/Makefile.in 2005-05-25 00:38:04.850620347 +0200
+@@ -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
- # 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.
-@@ -75,18 +75,18 @@
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- cd $(srcdir) && $(AUTOCONF)
#>+ 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 $@
+ 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 $@
+@@ -833,7 +836,7 @@
+ .NOEXPORT:
+
#>+ 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 = $(secpolicy_SOURCES)
- DIST_SOURCES = $(secpolicy_SOURCES)
+-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 -rua kdeadmin-3.4.1.orig/secpolicy/Makefile.in kdeadmin-3.4.1/secpolicy/Makefile.in
+--- kdeadmin-3.4.1.orig/secpolicy/Makefile.in 2005-05-23 17:45:07.000000000 +0200
++++ kdeadmin-3.4.1/secpolicy/Makefile.in 2005-05-25 00:38:05.281581498 +0200
@@ -210,6 +210,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@