Author: pebender
Date: Sat Aug 30 06:27:57 2008
New Revision: 3662
Added:
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-cross.patch.gar
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10.patch.gar
Removed:
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.9-cross.patch.gar
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.9-ldflags.patch
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.9.patch.gar
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/kde/kdelibs/Makefile
trunk/gar-minimyth/script/kde/kdelibs/checksums
Log:
- Updated package
kde/kdelibs
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Aug 30
06:27:57 2008
@@ -85,6 +85,7 @@
Updated kernel-2.6.25/linux.
Updated kernel-2.6.25/uvc.
Updated kernel-headers/linux-headers-2.6.25.
+ Updated kde/kdelibs.
Updated lib/dbus.
Updated multimedia/vlc.
Updated multimedia/xine-lib.
Modified: trunk/gar-minimyth/script/kde/kdelibs/Makefile
==============================================================================
--- trunk/gar-minimyth/script/kde/kdelibs/Makefile (original)
+++ trunk/gar-minimyth/script/kde/kdelibs/Makefile Sat Aug 30 06:27:57 2008
@@ -1,9 +1,9 @@
GARNAME = kdelibs
-GARVERSION = 3.5.9
+GARVERSION = 3.5.10
CATEGORIES = kde
MASTER_SITES = http://mirrors.isc.org/pub/kde/stable/$(GARVERSION)/src/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-ldflags.patch $(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME).patch.gar
ifneq ($(DESTIMG),build)
PATCHFILES += $(DISTNAME)-cross.patch.gar
endif
Modified: trunk/gar-minimyth/script/kde/kdelibs/checksums
==============================================================================
--- trunk/gar-minimyth/script/kde/kdelibs/checksums (original)
+++ trunk/gar-minimyth/script/kde/kdelibs/checksums Sat Aug 30 06:27:57 2008
@@ -1,4 +1,3 @@
-55e5f00874933d1a7ba7c95e369a205e download/kdelibs-3.5.9.tar.bz2
-79a0d66ba545e902da93b9b9dd5e593d download/kdelibs-3.5.9-ldflags.patch
-f14488dd47331e055f1da8cc143a2427 download/kdelibs-3.5.9.patch.gar
-a1c93cfb0c5e19ee670887264db00c63 download/kdelibs-3.5.9-cross.patch.gar
+43cd55ed15f63b5738d620ef9f9fd568 download/kdelibs-3.5.10.tar.bz2
+51622294b6b66992ac7c910fb7a6f17d download/kdelibs-3.5.10.patch.gar
+8bf0b7c09ba456688fa8d307ebf7761c download/kdelibs-3.5.10-cross.patch.gar
Added:
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-cross.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10-cross.patch.gar
Sat Aug 30 06:27:57 2008
@@ -0,0 +1,163 @@
+diff -Naur kdelibs-3.5.10-old/configure kdelibs-3.5.10-new/configure
+--- kdelibs-3.5.10-old/configure 2008-08-29 20:38:43.000000000 -0700
++++ kdelibs-3.5.10-new/configure 2008-08-29 20:39:20.000000000 -0700
+@@ -27576,13 +27576,13 @@
+ fi
+
+
+-DCOPIDL2CPP="compiled"
+-DCOPIDL="compiled"
++DCOPIDL2CPP="@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl2cpp"
++DCOPIDL="@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl"
+ DCOPIDLNG="compiled"
+ MEINPROC="compiled"
+ KDECONFIG="compiled"
+-KCONFIG_COMPILER="compiled"
+-MAKEKDEWIDGETS="compiled"
++KCONFIG_COMPILER="@GAR_build_DESTDIR@@GAR_build_kdebindir@/kconfig_compiler"
++MAKEKDEWIDGETS="@GAR_build_DESTDIR@@GAR_build_kdebindir@/makekdewidgets"
+
+
+
+@@ -41959,15 +41959,15 @@
+ ICE_RLIB='ICE/libkICE.la'
+
+
+-DCOPIDL='$(top_builddir)/dcop/dcopidl/dcopidl'
++DCOPIDL='@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl'
+
+ DCOPIDLNG='$(top_srcdir)/dcop/dcopidlng/dcopidlng'
+
+-DCOPIDL2CPP='$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp'
++DCOPIDL2CPP='@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl2cpp'
+
+-MAKEKDEWIDGETS='$(top_builddir)/kdewidgets/makekdewidgets'
++MAKEKDEWIDGETS='@GAR_build_DESTDIR@@GAR_build_kdebindir@/makekdewidgets'
+
+-KCONFIG_COMPILER='$(top_builddir)/kdecore/kconfig_compiler/kconfig_compiler'
++KCONFIG_COMPILER='@GAR_build_DESTDIR@@GAR_build_kdebindir@/kconfig_compiler'
+
+
+ ac_save_LIBS="$LIBS"
+diff -Naur kdelibs-3.5.10-old/configure.in kdelibs-3.5.10-new/configure.in
+--- kdelibs-3.5.10-old/configure.in 2008-08-29 20:38:32.000000000 -0700
++++ kdelibs-3.5.10-new/configure.in 2008-08-29 20:39:20.000000000 -0700
+@@ -95,13 +95,13 @@
+ fi
+ AC_SUBST(ACL_LIBS)
+
+-DCOPIDL2CPP="compiled"
+-DCOPIDL="compiled"
++DCOPIDL2CPP="@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl2cpp"
++DCOPIDL="@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl"
+ DCOPIDLNG="compiled"
+ MEINPROC="compiled"
+ KDECONFIG="compiled"
+-KCONFIG_COMPILER="compiled"
+-MAKEKDEWIDGETS="compiled"
++KCONFIG_COMPILER="@GAR_build_DESTDIR@@GAR_build_kdebindir@/kconfig_compiler"
++MAKEKDEWIDGETS="@GAR_build_DESTDIR@@GAR_build_kdebindir@/makekdewidgets"
+
+ dnl Checks for libraries etc
+ AC_BASE_PATH_KDE([don't test]) dnl kdelibs is a special case
+@@ -306,11 +306,11 @@
+ AC_SUBST(ICE_SUBDIR, 'ICE')
+ AC_SUBST(ICE_RLIB, 'ICE/libkICE.la')
+
+-AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
++AC_SUBST(DCOPIDL, '@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl')
+ AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
+-AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
+-AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
+-AC_SUBST(KCONFIG_COMPILER,
'$(top_builddir)/kdecore/kconfig_compiler/kconfig_compiler')
++AC_SUBST(DCOPIDL2CPP, '@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl2cpp')
++AC_SUBST(MAKEKDEWIDGETS,
'@GAR_build_DESTDIR@@GAR_build_kdebindir@/makekdewidgets')
++AC_SUBST(KCONFIG_COMPILER,
'@GAR_build_DESTDIR@@GAR_build_kdebindir@/kconfig_compiler')
+
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $X_LDFLAGS -lICE"
+diff -Naur kdelibs-3.5.10-old/configure.in.in
kdelibs-3.5.10-new/configure.in.in
+--- kdelibs-3.5.10-old/configure.in.in 2008-08-29 20:38:32.000000000 -0700
++++ kdelibs-3.5.10-new/configure.in.in 2008-08-29 20:39:20.000000000 -0700
+@@ -91,13 +91,13 @@
+ fi
+ AC_SUBST(ACL_LIBS)
+
+-DCOPIDL2CPP="compiled"
+-DCOPIDL="compiled"
++DCOPIDL2CPP="@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl2cpp"
++DCOPIDL="@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl"
+ DCOPIDLNG="compiled"
+ MEINPROC="compiled"
+ KDECONFIG="compiled"
+-KCONFIG_COMPILER="compiled"
+-MAKEKDEWIDGETS="compiled"
++KCONFIG_COMPILER="@GAR_build_DESTDIR@@GAR_build_kdebindir@/kconfig_compiler"
++MAKEKDEWIDGETS="@GAR_build_DESTDIR@@GAR_build_kdebindir@/makekdewidgets"
+
+ dnl Checks for libraries etc
+ AC_BASE_PATH_KDE([don't test]) dnl kdelibs is a special case
+@@ -302,11 +302,11 @@
+ AC_SUBST(ICE_SUBDIR, 'ICE')
+ AC_SUBST(ICE_RLIB, 'ICE/libkICE.la')
+
+-AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
++AC_SUBST(DCOPIDL, '@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl')
+ AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
+-AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
+-AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
+-AC_SUBST(KCONFIG_COMPILER,
'$(top_builddir)/kdecore/kconfig_compiler/kconfig_compiler')
++AC_SUBST(DCOPIDL2CPP, '@GAR_build_DESTDIR@@GAR_build_kdebindir@/dcopidl2cpp')
++AC_SUBST(MAKEKDEWIDGETS,
'@GAR_build_DESTDIR@@GAR_build_kdebindir@/makekdewidgets')
++AC_SUBST(KCONFIG_COMPILER,
'@GAR_build_DESTDIR@@GAR_build_kdebindir@/kconfig_compiler')
+
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $X_LDFLAGS -lICE"
+diff -Naur kdelibs-3.5.10-old/kdewidgets/Makefile.am
kdelibs-3.5.10-new/kdewidgets/Makefile.am
+--- kdelibs-3.5.10-old/kdewidgets/Makefile.am 2008-08-29
20:38:32.000000000 -0700
++++ kdelibs-3.5.10-new/kdewidgets/Makefile.am 2008-08-29
20:39:20.000000000 -0700
+@@ -34,7 +34,7 @@
+ kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
+
+ kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
+- ./makekdewidgets -o kdewidgets.cpp $(srcdir)/kde.widgets
++ $(MAKEKDEWIDGETS) -o kdewidgets.cpp $(srcdir)/kde.widgets
+
+ CLEANFILES = kdewidgets.cpp
+
+diff -Naur kdelibs-3.5.10-old/kdewidgets/Makefile.in
kdelibs-3.5.10-new/kdewidgets/Makefile.in
+--- kdelibs-3.5.10-old/kdewidgets/Makefile.in 2008-08-29
20:38:32.000000000 -0700
++++ kdelibs-3.5.10-new/kdewidgets/Makefile.in 2008-08-29
20:39:20.000000000 -0700
+@@ -911,7 +911,7 @@
+
+
+ kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
+- ./makekdewidgets -o kdewidgets.cpp $(srcdir)/kde.widgets
++ $(MAKEKDEWIDGETS) -o kdewidgets.cpp $(srcdir)/kde.widgets
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -Naur kdelibs-3.5.10-old/kstyles/keramik/Makefile.am
kdelibs-3.5.10-new/kstyles/keramik/Makefile.am
+--- kdelibs-3.5.10-old/kstyles/keramik/Makefile.am 2008-08-29
20:38:32.000000000 -0700
++++ kdelibs-3.5.10-new/kstyles/keramik/Makefile.am 2008-08-29
20:39:20.000000000 -0700
+@@ -84,7 +84,7 @@
+
+ pixmaps.keramik keramikrc.h: genembed
+ pics=`ls $(srcdir)/pics/*.png 2>/dev/null` ;\
+- ./genembed $$pics > pixmaps.keramik
++ kdelibs-genembed $$pics > pixmaps.keramik
+
+ pixmaploader.lo: pixmaps.keramik
+
+diff -Naur kdelibs-3.5.10-old/kstyles/keramik/Makefile.in
kdelibs-3.5.10-new/kstyles/keramik/Makefile.in
+--- kdelibs-3.5.10-old/kstyles/keramik/Makefile.in 2008-08-29
20:38:32.000000000 -0700
++++ kdelibs-3.5.10-new/kstyles/keramik/Makefile.in 2008-08-29
20:39:20.000000000 -0700
+@@ -818,7 +818,7 @@
+
+ pixmaps.keramik keramikrc.h: genembed
+ pics=`ls $(srcdir)/pics/*.png 2>/dev/null` ;\
+- ./genembed $$pics > pixmaps.keramik
++ kdelibs-genembed $$pics > pixmaps.keramik
+
+ pixmaploader.lo: pixmaps.keramik
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Added: trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10.patch.gar
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/kde/kdelibs/files/kdelibs-3.5.10.patch.gar
Sat Aug 30 06:27:57 2008
@@ -0,0 +1,198 @@
+diff -Naur kdelibs-3.5.10-old/acinclude.m4 kdelibs-3.5.10-new/acinclude.m4
+--- kdelibs-3.5.10-old/acinclude.m4 2008-08-20 09:05:01.000000000 -0700
++++ kdelibs-3.5.10-new/acinclude.m4 2008-08-29 20:38:43.000000000 -0700
+@@ -371,7 +371,7 @@
+ fi
+
+ AC_MSG_CHECKING([for KDE libraries installed])
+-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest
$CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext
$LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
++ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS
$all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS
-lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+
+ if AC_TRY_EVAL(ac_link) && test -s conftest; then
+ AC_MSG_RESULT(yes)
+@@ -1903,13 +1903,13 @@
+ if test "$kde_includes" = "$x_includes" || test "$kde_includes"
= "$qt_includes" || test "$kde_includes" = "/usr/include"; then
+ KDE_INCLUDES=""
+ else
+- KDE_INCLUDES="-I$kde_includes"
++ KDE_INCLUDES="-I$DESTDIR$kde_includes"
+ all_includes="$KDE_INCLUDES $all_includes"
+ fi
+
+ 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$DESTDIR$kde_libraries"
+ if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries"
= "$qt_libraries" ; then
+ all_libraries="$KDE_LDFLAGS $all_libraries"
+ fi
+@@ -2566,7 +2566,7 @@
+
+ dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
+ dnl requires system dependent includes loaded before it)
+-jpeg_incdirs="$includedir /usr/include /usr/local/include
$kde_extra_includes"
++jpeg_incdirs="@GAR_DESTDIR@@GAR_includedir@"
+ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
+ test "x$jpeg_incdir" = xNO && jpeg_incdir=
+
+@@ -3510,7 +3510,7 @@
+ AC_LIBTOOL_CXX
+
+ LIBTOOL_SHELL="/bin/sh ./libtool"
+-# LIBTOOL="$LIBTOOL --silent"
++# LIBTOOL="$LIBTOOL"
+ KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED)
\$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
+ AC_SUBST(KDE_PLUGIN)
+
+@@ -6079,7 +6079,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+diff -Naur kdelibs-3.5.10-old/admin/acinclude.m4.in
kdelibs-3.5.10-new/admin/acinclude.m4.in
+--- kdelibs-3.5.10-old/admin/acinclude.m4.in 2008-08-19 13:28:39.000000000
-0700
++++ kdelibs-3.5.10-new/admin/acinclude.m4.in 2008-08-29 20:38:43.000000000
-0700
+@@ -371,7 +371,7 @@
+ fi
+
+ AC_MSG_CHECKING([for KDE libraries installed])
+-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest
$CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext
$LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
++ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS
$all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS
-lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+
+ if AC_TRY_EVAL(ac_link) && test -s conftest; then
+ AC_MSG_RESULT(yes)
+@@ -1903,13 +1903,13 @@
+ if test "$kde_includes" = "$x_includes" || test "$kde_includes"
= "$qt_includes" || test "$kde_includes" = "/usr/include"; then
+ KDE_INCLUDES=""
+ else
+- KDE_INCLUDES="-I$kde_includes"
++ KDE_INCLUDES="-I$DESTDIR$kde_includes"
+ all_includes="$KDE_INCLUDES $all_includes"
+ fi
+
+ 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$DESTDIR$kde_libraries"
+ if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries"
= "$qt_libraries" ; then
+ all_libraries="$KDE_LDFLAGS $all_libraries"
+ fi
+@@ -2566,7 +2566,7 @@
+
+ dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
+ dnl requires system dependent includes loaded before it)
+-jpeg_incdirs="$includedir /usr/include /usr/local/include
$kde_extra_includes"
++jpeg_incdirs="@GAR_DESTDIR@@GAR_includedir@"
+ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
+ test "x$jpeg_incdir" = xNO && jpeg_incdir=
+
+@@ -3510,7 +3510,7 @@
+ AC_LIBTOOL_CXX
+
+ LIBTOOL_SHELL="/bin/sh ./libtool"
+-# LIBTOOL="$LIBTOOL --silent"
++# LIBTOOL="$LIBTOOL"
+ KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED)
\$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
+ AC_SUBST(KDE_PLUGIN)
+
+diff -Naur kdelibs-3.5.10-old/admin/libtool.m4.in
kdelibs-3.5.10-new/admin/libtool.m4.in
+--- kdelibs-3.5.10-old/admin/libtool.m4.in 2008-08-19 13:28:39.000000000
-0700
++++ kdelibs-3.5.10-new/admin/libtool.m4.in 2008-08-29 20:38:43.000000000
-0700
+@@ -82,7 +82,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+diff -Naur kdelibs-3.5.10-old/admin/ltmain.sh
kdelibs-3.5.10-new/admin/ltmain.sh
+--- kdelibs-3.5.10-old/admin/ltmain.sh 2008-08-19 13:28:39.000000000 -0700
++++ kdelibs-3.5.10-new/admin/ltmain.sh 2008-08-29 20:38:43.000000000 -0700
+@@ -4944,7 +4944,7 @@
+ # Need to set LD_LIBRARY_PATH, to the value already
+ # computed within libtool.
+ $echo >> $output "\
+- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"[EMAIL
PROTECTED]"}
++ LD_LIBRARY_PATH=\"$rpath$LD_LIBRARY_PATH\" exec \$progdir/\$program
\${1+\"[EMAIL PROTECTED]"}
+ "
+ ;;
+ esac
+diff -Naur kdelibs-3.5.10-old/configure kdelibs-3.5.10-new/configure
+--- kdelibs-3.5.10-old/configure 2008-08-20 09:06:05.000000000 -0700
++++ kdelibs-3.5.10-new/configure 2008-08-29 20:38:43.000000000 -0700
+@@ -22685,7 +22685,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+ # Prevent multiple expansion
+
+@@ -22723,7 +22723,7 @@
+
+
+ LIBTOOL_SHELL="/bin/sh ./libtool"
+-# LIBTOOL="$LIBTOOL --silent"
++# LIBTOOL="$LIBTOOL"
+ KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED)
\$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
+
+
+@@ -34842,7 +34842,7 @@
+
+
+
+-jpeg_incdirs="$includedir /usr/include /usr/local/include
$kde_extra_includes"
++jpeg_incdirs="@GAR_DESTDIR@@GAR_includedir@"
+
+ jpeg_incdir=NO
+ for i in $jpeg_incdirs;
+@@ -36206,13 +36206,13 @@
+ if test "$kde_includes" = "$x_includes" || test "$kde_includes"
= "$qt_includes" || test "$kde_includes" = "/usr/include"; then
+ KDE_INCLUDES=""
+ else
+- KDE_INCLUDES="-I$kde_includes"
++ KDE_INCLUDES="-I$DESTDIR$kde_includes"
+ all_includes="$KDE_INCLUDES $all_includes"
+ fi
+
+ 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$DESTDIR$kde_libraries"
+ if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries"
= "$qt_libraries" ; then
+ all_libraries="$KDE_LDFLAGS $all_libraries"
+ fi
+@@ -36862,7 +36862,7 @@
+
+ { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+ echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest
$CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext
$LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
++ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS
$all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS
-lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+@@ -37164,7 +37164,7 @@
+
+ { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+ echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest
$CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext
$LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
++ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS
$all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS
-lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+@@ -48723,7 +48723,7 @@
+
+
+
+-jpeg_incdirs="$includedir /usr/include /usr/local/include
$kde_extra_includes"
++jpeg_incdirs="@GAR_DESTDIR@@GAR_includedir@"
+
+ jpeg_incdir=NO
+ for i in $jpeg_incdirs;
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
