diff -U 10 -Nr k3b-i18n-0.12.10.old/admin/acinclude.m4.in k3b-i18n-0.12.10/admin/acinclude.m4.in

--- k3b-i18n-0.12.10.old/admin/acinclude.m4.in	2005-12-15 16:09:29 +0300

+++ k3b-i18n-0.12.10/admin/acinclude.m4.in	2005-12-21 21:37:25 +0300

@@ -2098,21 +2098,20 @@

    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")

    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")

    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")

    AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")

    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")

 fi

 ])

 AC_DEFUN([AC_PATH_KDE],

 [

-  AC_BASE_PATH_KDE

   AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),

   [

   if test "$enableval" = "no";

     then ac_use_path_checking="default"

     else ac_use_path_checking=""

   fi

   ],

   [

   if test "$kde_qtver" = 1;

     then ac_use_path_checking=""

@@ -3345,24 +3344,20 @@

 AC_DEFUN([KDE_ADD_DEPENDENCIES],

 [

    [A]M_DEPENDENCIES(CC)

    [A]M_DEPENDENCIES(CXX)

 ])

 dnl just a wrapper to clean up configure.in

 AC_DEFUN([KDE_PROG_LIBTOOL],

 [

-AC_REQUIRE([AC_CHECK_COMPILERS])

-AC_REQUIRE([AC_ENABLE_SHARED])

-AC_REQUIRE([AC_ENABLE_STATIC])

-

 AC_REQUIRE([AC_LIBTOOL_DLOPEN])

 AC_REQUIRE([KDE_CHECK_LIB64])

 AC_OBJEXT

 AC_EXEEXT

 AM_PROG_LIBTOOL

 AC_LIBTOOL_CXX

 LIBTOOL_SHELL="/bin/sh ./libtool"

@@ -3405,26 +3400,24 @@

 AC_DEFUN([KDE_CHECK_TYPES],

 [  AC_CHECK_SIZEOF(int, 4)dnl

    AC_CHECK_SIZEOF(short)dnl

   AC_CHECK_SIZEOF(long, 4)dnl

   AC_CHECK_SIZEOF(char *, 4)dnl

 ])dnl

 dnl Not used - kept for compat only?

 AC_DEFUN([KDE_DO_IT_ALL],

 [

-AC_CANONICAL_SYSTEM

 AC_ARG_PROGRAM

 AM_INIT_AUTOMAKE($1, $2)

 AM_DISABLE_LIBRARIES

 AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})

-AC_CHECK_COMPILERS

 KDE_PROG_LIBTOOL

 AM_KDE_WITH_NLS

 AC_PATH_KDE

 ])

 AC_DEFUN([AC_CHECK_RPATH],

 [

 AC_MSG_CHECKING(for rpath)

 AC_ARG_ENABLE(rpath,

       AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),

diff -U 10 -Nr k3b-i18n-0.12.10.old/admin/configure.in.min k3b-i18n-0.12.10/admin/configure.in.min

--- k3b-i18n-0.12.10.old/admin/configure.in.min	2005-12-15 16:09:29 +0300

+++ k3b-i18n-0.12.10/admin/configure.in.min	2005-12-21 21:38:06 +0300

@@ -23,35 +23,27 @@

 dnl Process this file with autoconf to produce a configure script.

 AC_INIT(acinclude.m4) dnl a source file from your sub dir

 dnl This is so we can use kde-common

 AC_CONFIG_AUX_DIR(admin)

 dnl This ksh/zsh feature conflicts with `cd blah ; pwd`

 unset CDPATH

-dnl Checking host/target/build systems, for make, install etc.

-AC_CANONICAL_SYSTEM 

-dnl Perform program name transformation

-AC_ARG_PROGRAM

-

 dnl Automake doc recommends to do this only here. (Janos)

 AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs

 KDE_SET_PREFIX

 dnl generate the config header

 AM_CONFIG_HEADER(config.h) dnl at the distribution this done

 dnl Checks for programs.

-AC_CHECK_COMPILERS

-AC_ENABLE_SHARED(yes)

-AC_ENABLE_STATIC(no)

 KDE_PROG_LIBTOOL

 dnl for NLS support. Call them in this order!

 dnl WITH_NLS is for the po files

 AM_KDE_WITH_NLS

 dnl KDE_USE_QT

 AC_PATH_KDE

diff -U 10 -Nr k3b-i18n-0.12.10.old/admin/libtool.m4.in k3b-i18n-0.12.10/admin/libtool.m4.in

--- k3b-i18n-0.12.10.old/admin/libtool.m4.in	2005-12-15 16:09:29 +0300

+++ k3b-i18n-0.12.10/admin/libtool.m4.in	2005-12-21 21:40:41 +0300

@@ -87,25 +87,21 @@

 # Prevent multiple expansion

 define([AC_PROG_LIBTOOL], [])

 ])# _AC_PROG_LIBTOOL

 # AC_LIBTOOL_SETUP

 # ----------------

 AC_DEFUN([AC_LIBTOOL_SETUP],

 [AC_PREREQ(2.50)dnl

-AC_REQUIRE([AC_ENABLE_SHARED])dnl

-AC_REQUIRE([AC_ENABLE_STATIC])dnl

 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl

-AC_REQUIRE([AC_CANONICAL_HOST])dnl

-AC_REQUIRE([AC_CANONICAL_BUILD])dnl

 AC_REQUIRE([AC_PROG_CC])dnl

 AC_REQUIRE([AC_PROG_LD])dnl

 AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl

 AC_REQUIRE([AC_PROG_NM])dnl

 AC_REQUIRE([AC_PROG_LN_S])dnl

 AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl

 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

 AC_REQUIRE([AC_OBJEXT])dnl

 AC_REQUIRE([AC_EXEEXT])dnl

@@ -1942,22 +1938,20 @@

 # ----------

 # find the pathname to the GNU or non-GNU linker

 AC_DEFUN([AC_PROG_LD],

 [AC_ARG_WITH([gnu-ld],

     [AC_HELP_STRING([--with-gnu-ld],

 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],

     [test "$withval" = no || with_gnu_ld=yes],

     [with_gnu_ld=no])

 AC_REQUIRE([LT_AC_PROG_SED])dnl

 AC_REQUIRE([AC_PROG_CC])dnl

-AC_REQUIRE([AC_CANONICAL_HOST])dnl

-AC_REQUIRE([AC_CANONICAL_BUILD])dnl

 ac_prog=ld

 if test "$GCC" = yes; then

   # Check if gcc -print-prog-name=ld gives a path.

   AC_MSG_CHECKING([for ld used by $CC])

   case $host in

   *-*-mingw*)

     # gcc leaves a trailing carriage return which upsets mingw

     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;

   *)

     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;

@@ -2310,40 +2304,20 @@

       esac

     fi

   done

   IFS="$lt_save_ifs"

   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm

 fi])

 NM="$lt_cv_path_NM"

 ])# AC_PROG_NM

-# AC_CHECK_LIBM

-# -------------

-# check for math library

-AC_DEFUN([AC_CHECK_LIBM],

-[AC_REQUIRE([AC_CANONICAL_HOST])dnl

-LIBM=

-case $host in

-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)

-  # These system don't have libm, or don't need it

-  ;;

-*-ncr-sysv4.3*)

-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")

-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")

-  ;;

-*)

-  AC_CHECK_LIB(m, cos, LIBM="-lm")

-  ;;

-esac

-])# AC_CHECK_LIBM

-

 # AC_LIBLTDL_CONVENIENCE([DIRECTORY])

 # -----------------------------------

 # sets LIBLTDL to the link flags for the libltdl convenience library and

 # LTDLINCL to the include flags for the libltdl header and adds

 # --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL

 # and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If

 # DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will

 # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with

 # '${top_srcdir}/' (note the single quotes!).  If your package is not

@@ -4312,22 +4286,21 @@

     lt_cv_prog_compiler_rtti_exceptions,

     [-fno-rtti -fno-exceptions], [],

     [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])

 fi

 ])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI

 # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE

 # ---------------------------------

 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],

-[AC_REQUIRE([AC_CANONICAL_HOST])

-AC_REQUIRE([AC_PROG_NM])

+[AC_REQUIRE([AC_PROG_NM])

 AC_REQUIRE([AC_OBJEXT])

 # Check for command to grab the raw symbol name followed by C symbol from nm.

 AC_MSG_CHECKING([command to parse $NM output from $compiler object])

 AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],

 [

 # These are sane defaults that work on at least a few old systems.

 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]

 # Character class describing NM global symbol codes.

 symcode='[[BCDEGRST]]'