--- admin/acinclude.m4.in 2008-05-27 10:23:30.000000000 +0200 +++ admin/acinclude.m4.in-new 2009-07-12 16:17:53.748582894 +0200 @@ -1791,11 +1791,11 @@ AC_MSG_CHECKING([for KDE]) if test "${prefix}" != NONE; then - kde_includes=${includedir} - KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir) + kde_includes=${includedir}/kde3 + KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir/kde3) - kde_libraries=${libdir} - KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir) + kde_libraries=${libdir}/kde3dev + KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir/kde3dev) else ac_kde_includes= @@ -1829,7 +1829,7 @@ So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" +kde_libdirs="$kde_libs_prefix/lib${kdelibsuff}/kde3dev /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) @@ -1839,12 +1839,6 @@ dnl this might be somewhere else AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) -if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then -AC_MSG_ERROR([ -in the prefix, you've chosen, are no KDE libraries installed. This will fail. -So, check this please and use another prefix!]) -fi - if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed @@ -1886,8 +1880,8 @@ AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix]) fi - kde_libraries="${libdir}" - kde_includes="${includedir}" + kde_libraries="${libdir}/kde3dev" + kde_includes="${includedir}/kde3" else ac_cv_have_kde="have_kde=yes \ @@ -1928,7 +1922,7 @@ KDE_CHECK_UIC_PLUGINS fi -ac_kde_libraries="$kde_libdir" +ac_kde_libraries="$kde_libdir/kde3dev" AC_SUBST(AUTODIRS) --- admin/acinclude.m4.in-new 2009-07-12 16:59:51.390969154 +0200 +++ admin/acinclude.m4.in 2009-07-12 17:00:06.398894540 +0200 @@ -578,7 +578,7 @@ KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) fi - KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) + KDE_FIND_PATH(meinproc4, MEINPROC, [$kde_default_bindirs]) kde32ornewer=1 kde33ornewer=1 --- admin/am_edit 2008-05-27 10:23:30.000000000 +0200 +++ admin/am_edit-new 2009-07-12 17:03:38.005110229 +0200 @@ -1999,7 +1999,7 @@ my $lines = ""; my $lookup = 'MEINPROC\s*='; if ($MakefileData !~ /\n($lookup)/) { - $lines = "MEINPROC=/\$(kde_bindir)/meinproc\n"; + $lines = "MEINPROC=/\$(kde_bindir)/meinproc4\n"; } $lookup = 'KDE_XSL_STYLESHEET\s*='; if ($MakefileData !~ /\n($lookup)/) { --- k3b-i18n-1.0.5/admin/acinclude.m4.in.old 2009-07-12 17:11:48.840906438 +0200 +++ k3b-i18n-1.0.5/admin/acinclude.m4.in 2009-07-12 17:12:01.948410314 +0200 @@ -578,7 +578,7 @@ KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) fi - KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) + KDE_FIND_PATH(meinproc4, MEINPROC, [$kde_default_bindirs]) kde32ornewer=1 kde33ornewer=1 --- k3b-i18n-1.0.5/admin/am_edit.old 2009-07-12 17:11:52.847501698 +0200 +++ k3b-i18n-1.0.5/admin/am_edit 2009-07-12 17:12:09.890240661 +0200 @@ -1999,7 +1999,7 @@ my $lines = ""; my $lookup = 'MEINPROC\s*='; if ($MakefileData !~ /\n($lookup)/) { - $lines = "MEINPROC=/\$(kde_bindir)/meinproc\n"; + $lines = "MEINPROC=/\$(kde_bindir)/meinproc4\n"; } $lookup = 'KDE_XSL_STYLESHEET\s*='; if ($MakefileData !~ /\n($lookup)/) { --- admin/ltmain.sh 2009-07-12 17:52:23.311079431 +0200 +++ admin/ltmain.sh-new 2009-07-12 17:52:37.627328398 +0200 @@ -5669,7 +5669,23 @@ case $hardcode_action in immediate | unsupported) if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test "$linklib" = "libDCOP.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkwalletclient.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdefx.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdecore.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdeui.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkparts.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkio.so"; then + add="$dir/kde3dev/$linklib" + else + add="$dir/$linklib" + fi case $host in *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; *-*-sysv4*uw2*) add_dir="-L$dir" ;; @@ -5710,14 +5726,30 @@ relink) if test "$hardcode_direct" = yes && test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" + if test "$linklib" = "libDCOP.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkwalletclient.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdefx.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdecore.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdeui.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkparts.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkio.so"; then + add="$dir/kde3dev/$linklib" + else + add="$dir/$linklib" + fi elif test "$hardcode_minus_L" = yes; then add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir/kde3dev" ;; esac fi @@ -5767,7 +5799,23 @@ # Finalize command for both is simple: just hardcode it. if test "$hardcode_direct" = yes && test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" + if test "$linklib" = "libDCOP.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkwalletclient.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdefx.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdecore.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkdeui.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkparts.so"; then + add="$dir/kde3dev/$linklib" + elif test "$linklib" = "libkio.so"; then + add="$dir/kde3dev/$linklib" + else + add="$dir/$linklib" + fi elif test "$hardcode_minus_L" = yes; then add_dir="-L$libdir" add="-l$name" --- admin/acinclude.m4.in 2009-07-12 17:53:54.890669276 +0200 +++ admin/acinclude.m4.in-new 2009-07-12 18:21:36.072038700 +0200 @@ -1903,7 +1903,7 @@ KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION" -KDE_LDFLAGS="-L$kde_libraries" +KDE_LDFLAGS="-L$kde_libraries/kde3dev" if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then all_libraries="$KDE_LDFLAGS $all_libraries" fi --- admin/acinclude.m4.in 2009-07-12 18:22:26.757982416 +0200 +++ admin/acinclude.m4.in-new 2009-07-12 18:35:21.812623658 +0200 @@ -1514,7 +1514,7 @@ ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" -LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" +LDFLAGS="$LDFLAGS -L$qt_libdir $USER_LDFLAGS $all_libraries $KDE_MT_LDFLAGS" LIBS="$LIBS $LIBQT $KDE_MT_LIBS" KDE_PRINT_QT_PROGRAM @@ -1913,7 +1913,7 @@ AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -all_libraries="$all_libraries $USER_LDFLAGS" +all_libraries="$USER_LDFLAGS $all_libraries" all_includes="$all_includes $USER_INCLUDES" AC_SUBST(all_includes) AC_SUBST(all_libraries) @@ -2049,7 +2049,7 @@ LIBS="-lkde-qt-addon $LIBQT $LIBS" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" - LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" + LDFLAGS="$LDFLAGS $USER_LDFLAGS $all_libraries" AC_TRY_LINK([ #include @@ -2517,7 +2517,7 @@ AC_CACHE_VAL(ac_cv_lib_jpeg_$1, [ ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm" +LIBS="$USER_LDFLAGS $all_libraries -ljpeg$2 -lm" ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( @@ -2608,7 +2608,7 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS $LIBQT" +LIBS="$USER_LDFLAGS $all_libraries $LIBQT" LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" @@ -2643,7 +2643,7 @@ AC_CACHE_VAL(ac_cv_lib_z, [ kde_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET" +LIBS="$USER_LDFLAGS $all_libraries -lz $LIBSOCKET" kde_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK(dnl @@ -2689,9 +2689,9 @@ AC_LANG_CPLUSPLUS kde_save_LIBS="$LIBS" if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm" +LIBS="$USER_LDFLAGS $all_libraries -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm" else -LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm" +LIBS="$USER_LDFLAGS $all_libraries -l$1 $LIBJPEG $LIBZ -lm" fi kde_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" @@ -2766,7 +2766,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" + LIBS="$LIBS $USER_LDFLAGS $all_libraries `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" @@ -2815,9 +2815,9 @@ [ kde_save_LIBS="$LIBS" if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET" +LIBS="$LIBS $USER_LDFLAGS $all_libraries -lpng $LIBZ -lm -lX11 $LIBSOCKET" else -LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm" +LIBS="$LIBS $USER_LDFLAGS $all_libraries -lpng $LIBZ -lm" fi kde_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" @@ -2858,7 +2858,7 @@ AC_CACHE_VAL(ac_cv_jasper, [ kde_save_LIBS="$LIBS" -LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm" +LIBS="$LIBS $USER_LDFLAGS $all_libraries -ljasper $LIBJPEG -lm" kde_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" @@ -5509,7 +5509,7 @@ ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" - LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" + LDFLAGS="$LDFLAGS $QT_LDFLAGS $USER_LDFLAGS $all_libraries $KDE_MT_LDFLAGS" LIBS="$LIBS $LIB_QTOPIA $LIBQT" cat > conftest.$ac_ext <