Commit ce251321 authored by Joachim Eibl's avatar Joachim Eibl

KDiff3-0.9.92

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@81 c8aa9fed-2811-0410-8543-893ada326672
parent 4abec9ed
Version 0.9.92 - 2007/04/15
===========================
- Windows installer now allows to install KDiff3 as Clearcase Diff and Merge Tool
- Windows installer "SVN Merge tool" corrected: Not creating $AppData\Subversion\config subdir anymore.
- KDE-Konqueror plugin: Launch KDiff3 from Konqueror. (Similar to Diff-Ext on Windows.)
- Qt4-version
- Printing crash fixed
- Compilation issue for Mac fixed
- Dir Rescan keeps settings for Show identical files etc.
- Bugfix: Empty file and not existing file were detected as binary equal.
- Temp file names use the process id in file name to allow several instances.
- Suppress flicker during startup. (Don't show status info window on creation.)
- New File comparison mode: Trust the size and date, but use binary comparison if date doesn't match (unsafe)
- After explicitely selecting files any file of the selected may be right clicked for context menu.
- Open dialog also shows current directories in directory comparison mode.
- Writing a file via --auto option didn't work for relative files. (Reported by Guilhem Bichot)
- New option for history merge: Max number of history entries
- New option "Auto save and quit on merge without conflicts"
- Directory Merge with Case sensitivity disabled: Correct destination filename chosen for merge.
Version 0.9.91 - 2006/10/29 Version 0.9.91 - 2006/10/29
=========================== ===========================
- Encoding auto detection - Encoding auto detection
......
...@@ -3,7 +3,7 @@ KDiff3-Readme ...@@ -3,7 +3,7 @@ KDiff3-Readme
Author: Joachim Eibl (joachim.eibl at gmx.de) Author: Joachim Eibl (joachim.eibl at gmx.de)
Copyright: (C) 2002-2006 by Joachim Eibl Copyright: (C) 2002-2006 by Joachim Eibl
KDiff3-Version: 0.9.91 KDiff3-Version: 0.9.92
KDiff3 is a program that KDiff3 is a program that
...@@ -12,13 +12,14 @@ KDiff3 is a program that ...@@ -12,13 +12,14 @@ KDiff3 is a program that
- provides an automatic merge-facility and - provides an automatic merge-facility and
- an integrated editor for comfortable solving of merge-conflicts - an integrated editor for comfortable solving of merge-conflicts
- has support for KDE-KIO (ftp, sftp, http, fish, smb) - has support for KDE-KIO (ftp, sftp, http, fish, smb)
- and has an intuitive graphical user interface. - and has an intuitive graphical user interface,
- also supports 64 bit systems. (Some build issues are discussed in here.)
Do you want help translating? Read the README in the po-subdirectory! Do you want help translating? Read the README in the po-subdirectory!
Licence: License:
GNU GENERAL PUBLIC LICENSE, Version 2, June 1991 GNU GENERAL PUBLIC LICENSE, Version 2, June 1991
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -147,6 +148,9 @@ Installation for the Qt-only-platforms for Un*x: ...@@ -147,6 +148,9 @@ Installation for the Qt-only-platforms for Un*x:
qmake kdiff3.pro -o Makefile.qt qmake kdiff3.pro -o Makefile.qt
If you want to build the Qt-only version _and_ the KDE-version, do this If you want to build the Qt-only version _and_ the KDE-version, do this
in separate directories, otherwise there will be errors. in separate directories, otherwise there will be errors.
- A user reported that on his 64-bit machine running FC4 he had to edit his Makefile.qt
LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/lib -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread
Build for Windows: Build for Windows:
Use qmake and kdiff3.pro to generate Use qmake and kdiff3.pro to generate
...@@ -154,21 +158,31 @@ Build for Windows: ...@@ -154,21 +158,31 @@ Build for Windows:
qmake kdiff3.pro -o Makefile qmake kdiff3.pro -o Makefile
Building Kdiff3 for Mac OSX 10.3.8 (by Mark Teel) Building KDiff3 (Qt3) for Mac OSX 10.3.8 (by Mark Teel)
-------------------------------------------------- -------------------------------------------------------
1) Install Qt/Mac with thread support and static libraries. 1) Install Qt/Mac with thread support and static libraries.
2) cd .../kdiff3-0.9.91 2) cd .../kdiff3-0.9.91/src
3) Create a makefile for kdiff3 by executing: 3) Create a makefile for kdiff3 by executing:
qmake src/kdiff3.pro -o Makefile.qt qmake kdiff3.pro -o Makefile.qt
4) Edit Makefile.qt and add the definition "KDIFF3" to the following two lines: 4) Edit Makefile.qt and change the include path like so:
CFLAGS = -pipe -Wall -W -Os -DKDIFF3 -DQT_NO_DEBUG ...
CXXFLAGS = -pipe -Wall -W -Os -DKDIFF3 -DQT_NO_DEBUG ...
5) Edit Makefile.qt and change the include path like so:
(old) INCPATH = -I/Library/qt3/mkspecs/default -Isrc ... (old) INCPATH = -I/Library/qt3/mkspecs/default -Isrc ...
(new) INCPATH = -I/Library/qt3/mkspecs/macx-g++ -Isrc ... (new) INCPATH = -I/Library/qt3/mkspecs/macx-g++ -Isrc ...
6) Execute: 5) Execute:
make -f Makefile.qt make -f Makefile.qt
7) After the build completes copy kdiff3 from the kdiff3-0.9.91 directory to 6) After the build completes copy kdiff3 from the kdiff3-0.9.91/src directory to
/Applications
Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt)
---------------------------------------------------------------------------------------------------
1) Install Qt/Mac 4.x with thread support, static libraries and universal flag.
2) cd .../kdiff3-0.9.91/src-QT4
3a) Create a makefile for kdiff3 by executing:
qmake kdiff3.pro
3b) optionally generate XCode-Project (for debugging purposes only) by executing:
qmake -spec macx-xcode kdiff3.pro
4) Execute:
make
5) After the build completes copy kdiff3 from the kdiff3-0.9.91/src-QT4 directory to
/Applications /Applications
---------------------------------------------------------------- ----------------------------------------------------------------
......
...@@ -73,11 +73,11 @@ uninstall-apidox: ...@@ -73,11 +73,11 @@ uninstall-apidox:
@if test "$(subdir)" != "."; then \ @if test "$(subdir)" != "."; then \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
fi\ fi \
else\ else \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
fi\ fi \
fi fi
install-apidox-recurse: install-apidox install-apidox-recurse: install-apidox
......
...@@ -784,7 +784,7 @@ support]) ...@@ -784,7 +784,7 @@ support])
# CoreAudio framework # CoreAudio framework
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio" FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
]) ])
AC_CHECK_RES_INIT AC_CHECK_RES_INIT
...@@ -2747,7 +2747,7 @@ AC_CACHE_VAL(ac_cv_libexr, ...@@ -2747,7 +2747,7 @@ AC_CACHE_VAL(ac_cv_libexr,
EXRSTATUS=old EXRSTATUS=old
else else
kde_save_LIBS="$LIBS" kde_save_LIBS="$LIBS"
LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
kde_save_CXXFLAGS="$CXXFLAGS" kde_save_CXXFLAGS="$CXXFLAGS"
...@@ -3015,6 +3015,35 @@ fi ...@@ -3015,6 +3015,35 @@ fi
]) ])
AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
[
AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
kde_cv_opt_noinline_match,
[
kde_cv_opt_noinline_match=irrelevant
dnl if we don't use both -O2 and -fno-inline, this check is moot
if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
&& echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
ac_cflags_save="$CFLAGS"
CFLAGS="$CFLAGS -D_USE_GNU"
AC_TRY_LINK([
#include <string.h>
], [ const char *pt, *et;
et = __extension__ ({ char __a0, __a1, __a2; (__builtin_constant_p ( ";," ) && ((size_t)(const void *)(( ";," )+ 1) - (size_t)(const void *)( ";," ) == 1) ? ((__a0 =((__const char *) ( ";," ))[0], __a0 == '\0') ? ((void) ( pt ),((void *)0) ) : ((__a1 = ((__const char *) ( ";," ))[1], __a1== '\0') ? (__extension__ (__builtin_constant_p ( __a0 ) && ( __a0 ) == '\0' ? (char *) __rawmemchr ( pt , __a0) : strchr( pt , __a0 ))) : ((__a2 = ((__const char *) ( ";," ))[2], __a2 == '\0') ? __strpbrk_c2 ( pt , __a0, __a1) :(((__const char *) ( ";," ))[3] == '\0' ? __strpbrk_c3 ( pt ,__a0, __a1, __a2): strpbrk ( pt , ";," ))))) : strpbrk ( pt , ";," )); }) ;
],
kde_cv_opt_noinline_match=yes,
kde_cv_opt_noinline_match=no
)
CFLAGS="$ac_cflags_save"
fi
])
])
dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
AC_DEFUN([AC_VALIDIFY_CXXFLAGS], AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
[dnl [dnl
...@@ -3099,7 +3128,7 @@ AC_DEFUN([AC_CHECK_COMPILERS], ...@@ -3099,7 +3128,7 @@ AC_DEFUN([AC_CHECK_COMPILERS],
if test $kde_use_debug_code = "full"; then if test $kde_use_debug_code = "full"; then
CFLAGS="-g3 -fno-inline $CFLAGS" CFLAGS="-g3 -fno-inline $CFLAGS"
else else
CFLAGS="-g -O2 $CFLAGS" CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
fi fi
else else
CFLAGS="-O2 $CFLAGS" CFLAGS="-O2 $CFLAGS"
...@@ -3134,7 +3163,7 @@ AC_DEFUN([AC_CHECK_COMPILERS], ...@@ -3134,7 +3163,7 @@ AC_DEFUN([AC_CHECK_COMPILERS],
if test "$kde_use_debug_code" = "full"; then if test "$kde_use_debug_code" = "full"; then
CXXFLAGS="-g3 -fno-inline $CXXFLAGS" CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
else else
CXXFLAGS="-g -O2 $CXXFLAGS" CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
fi fi
fi fi
KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
...@@ -3147,7 +3176,7 @@ AC_DEFUN([AC_CHECK_COMPILERS], ...@@ -3147,7 +3176,7 @@ AC_DEFUN([AC_CHECK_COMPILERS],
CXXFLAGS="+K3 $CXXFLAGS" CXXFLAGS="+K3 $CXXFLAGS"
else else
CXXFLAGS="-O2 $CXXFLAGS" CXXFLAGS="-O2 $CXXFLAGS"
fi fi
fi fi
fi fi
...@@ -3194,6 +3223,14 @@ AC_DEFUN([AC_CHECK_COMPILERS], ...@@ -3194,6 +3223,14 @@ AC_DEFUN([AC_CHECK_COMPILERS],
AC_SUBST([HAVE_GCC_VISIBILITY]) AC_SUBST([HAVE_GCC_VISIBILITY])
if test "$GXX" = "yes"; then if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
if test $kde_use_debug_code != "no" && \
test $kde_use_debug_code != "full" && \
test "YES" = "$gcc_no_reorder_blocks" ; then
CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"]) KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"]) KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
...@@ -3222,6 +3259,11 @@ AC_DEFUN([AC_CHECK_COMPILERS], ...@@ -3222,6 +3259,11 @@ AC_DEFUN([AC_CHECK_COMPILERS],
fi fi
rm -f conftest.h conftest.h.gch rm -f conftest.h conftest.h.gch
fi fi
KDE_CHECK_FOR_OPT_NOINLINE_MATCH
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
fi
fi fi
AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
if test "$CXX" = "KCC"; then if test "$CXX" = "KCC"; then
...@@ -3457,17 +3499,27 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config ...@@ -3457,17 +3499,27 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then
kdelibsuff=no
fi
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]), [/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval) kdelibsuff=$enableval, kdelibsuff="auto")
# TODO: add an auto case that compiles a little C app to check
# where the glibc is if test "$kdelibsuff" = "auto"; then
if test "$kdelibsuff" = "no"; then
cat > conftest.c << EOF
#include <stdio.h>
int main() {
return 0;
}
EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1,
p
}'`
rm -rf conftest.*
fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
kdelibsuff= kdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$kdelibsuff"; then
...@@ -4572,12 +4624,14 @@ fi ...@@ -4572,12 +4624,14 @@ fi
AC_DEFUN([KDE_CHECK_PYTHON], AC_DEFUN([KDE_CHECK_PYTHON],
[ [
KDE_CHECK_PYTHON_INTERN("2.4", KDE_CHECK_PYTHON_INTERN("2.5",
[KDE_CHECK_PYTHON_INTERN("2.3", [KDE_CHECK_PYTHON_INTERN("2.4",
[KDE_CHECK_PYTHON_INTERN("2.2", [KDE_CHECK_PYTHON_INTERN("2.3",
[KDE_CHECK_PYTHON_INTERN("2.1", [KDE_CHECK_PYTHON_INTERN("2.2",
[KDE_CHECK_PYTHON_INTERN("2.0", [KDE_CHECK_PYTHON_INTERN("2.1",
[KDE_CHECK_PYTHON_INTERN($1, $2) ]) [KDE_CHECK_PYTHON_INTERN("2.0",
[KDE_CHECK_PYTHON_INTERN($1, $2) ])
])
]) ])
]) ])
]) ])
...@@ -4946,7 +5000,6 @@ AC_DEFUN([KDE_SET_PREFIX], ...@@ -4946,7 +5000,6 @@ AC_DEFUN([KDE_SET_PREFIX],
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
kde_libs_suffix=`$KDECONFIG --libsuffix`
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
...@@ -5322,7 +5375,7 @@ elif test -d "/Library/Java/Home"; then ...@@ -5322,7 +5375,7 @@ elif test -d "/Library/Java/Home"; then
JAVAC=$kde_java_bindir/javac JAVAC=$kde_java_bindir/javac
JAVAH=$kde_java_bindir/javah JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar JAR=$kde_java_bindir/jar
JVMLIBS="-Xlinker -framework -Xlinker JavaVM" JVMLIBS="-Wl,-framework,JavaVM"
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
AC_MSG_RESULT([Apple Java Framework]) AC_MSG_RESULT([Apple Java Framework])
...@@ -5865,12 +5918,12 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page ...@@ -5865,12 +5918,12 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES($1,$2,$3,$4) PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
]) ])
...@@ -5883,7 +5936,7 @@ AC_DEFUN([KDE_CHECK_PIE_SUPPORT], ...@@ -5883,7 +5936,7 @@ AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
safe_CXXFLAGS=$CXXFLAGS safe_CXXFLAGS=$CXXFLAGS
safe_LDFLAGS=$LDFLAGS safe_LDFLAGS=$LDFLAGS
CXXFLAGS="$CXXFLAGS -fpie" CXXFLAGS="$CXXFLAGS -fPIE"
LDFLAGS="$LDFLAGS -pie" LDFLAGS="$LDFLAGS -pie"
AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no]) AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
...@@ -5893,7 +5946,7 @@ AC_DEFUN([KDE_CHECK_PIE_SUPPORT], ...@@ -5893,7 +5946,7 @@ AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
AC_MSG_CHECKING(if enabling -pie/fpie support) AC_MSG_CHECKING(if enabling -pie/fPIE support)
AC_ARG_ENABLE(pie, AC_ARG_ENABLE(pie,
AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]), AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
...@@ -5913,7 +5966,7 @@ AC_DEFUN([KDE_CHECK_PIE_SUPPORT], ...@@ -5913,7 +5966,7 @@ AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
AC_SUBST([KDE_USE_PIE]) AC_SUBST([KDE_USE_PIE])
if test "$kde_has_pie_support" = "yes"; then if test "$kde_has_pie_support" = "yes"; then
KDE_USE_FPIE="-fpie" KDE_USE_FPIE="-fPIE"
KDE_USE_PIE="-pie" KDE_USE_PIE="-pie"
fi fi
]) ])
...@@ -2028,7 +2028,7 @@ sub tag_DOCFILES () ...@@ -2028,7 +2028,7 @@ sub tag_DOCFILES ()
$lines .= "\n"; $lines .= "\n";
$lines .= "uninstall-docs:\n"; $lines .= "uninstall-docs:\n";
$lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n"; $lines .= "\t-rm -rf \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
$lines .= "\n"; $lines .= "\n";
$lines .= "clean-docs:\n"; $lines .= "clean-docs:\n";
$lines .= "\t-rm -f index.cache.bz2\n"; $lines .= "\t-rm -f index.cache.bz2\n";
......
...@@ -114,8 +114,8 @@ while (<>) { ...@@ -114,8 +114,8 @@ while (<>) {
} }
} }
die "wrong input (flag != 4)" unless $flag == 4; #die "wrong input (flag != 4)" unless $flag == 4;
print STDERR "hmm, don't know autoconf version\n" unless $ac_version; #print STDERR "hmm, don't know autoconf version\n" unless $ac_version;
sub insert_main_loop { sub insert_main_loop {
......
...@@ -31,6 +31,10 @@ if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_ ...@@ -31,6 +31,10 @@ if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_
echo "" echo ""
fi fi
if (test $warn_konq);
then echo "NOTICE: Since the Konqueror-headers were not found KDiff3 will be built without support for its service-menus and the KDiff3-service menu will not be built. (Install the package containing konq_popupmenu.h. Possibly kdebase-devel or on Debian libkonq4-dev etc.)"
fi
if test "$all_tests" = "bad"; then if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then if test ! "$cache_file" = "/dev/null"; then
echo "" echo ""
......
...@@ -32,7 +32,7 @@ check_autotool_versions() ...@@ -32,7 +32,7 @@ check_autotool_versions()
required_autoconf_version="2.53 or newer" required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in case $AUTOCONF_VERSION in
Autoconf*2.5* | autoconf*2.5* ) : ;; Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
"" ) "" )
echo "*** AUTOCONF NOT FOUND!." echo "*** AUTOCONF NOT FOUND!."
echo "*** KDE requires autoconf $required_autoconf_version" echo "*** KDE requires autoconf $required_autoconf_version"
...@@ -47,7 +47,7 @@ esac ...@@ -47,7 +47,7 @@ esac
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in case $AUTOHEADER_VERSION in
Autoconf*2.5* | autoheader*2.5* ) : ;; Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
"" ) "" )
echo "*** AUTOHEADER NOT FOUND!." echo "*** AUTOHEADER NOT FOUND!."
echo "*** KDE requires autoheader $required_autoconf_version" echo "*** KDE requires autoheader $required_autoconf_version"
...@@ -68,7 +68,7 @@ case $AUTOMAKE_STRING in ...@@ -68,7 +68,7 @@ case $AUTOMAKE_STRING in
echo "*** KDE requires automake $required_automake_version" echo "*** KDE requires automake $required_automake_version"
exit 1 exit 1
;; ;;
automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
echo "*** $AUTOMAKE_STRING found." echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no UNSERMAKE=no
;; ;;
...@@ -316,7 +316,7 @@ if test -f configure.in.in; then ...@@ -316,7 +316,7 @@ if test -f configure.in.in; then
fi fi
fi fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
VERSION="\"3.5.0\"" VERSION="\"3.5.5\""
fi fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`; modulename=`pwd`;
......
#! /bin/sh #! /bin/sh
# depcomp - compile a program generating dependencies as side-effects # depcomp - compile a program generating dependencies as side-effects
scriptversion=2005-05-14.22 scriptversion=2005-07-09.11
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
...@@ -467,7 +467,8 @@ cpp) ...@@ -467,7 +467,8 @@ cpp)
done done
"$@" -E | "$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile" sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile" rm -f "$depfile"
echo "$object : \\" > "$depfile" echo "$object : \\" > "$depfile"
......
...@@ -63,15 +63,18 @@ if test -z "$top_srcdir" ; then ...@@ -63,15 +63,18 @@ if test -z "$top_srcdir" ; then
echo "Usage: doxygen.sh <top_srcdir>" echo "Usage: doxygen.sh <top_srcdir>"
exit 1 exit 1
fi fi
if ! test -d "$top_srcdir" ; then if test ! -d "$top_srcdir" ; then
echo "top_srcdir ($top_srcdir) is not a directory." echo "top_srcdir ($top_srcdir) is not a directory."
exit 1 exit 1
fi fi
### Normalize top_srcdir so it is an absolute path. ### Normalize top_srcdir so it is an absolute path.
if ! expr "x$top_srcdir" : "x/" > /dev/null ; then if expr "x$top_srcdir" : "x/" > /dev/null ; then
# top_srcdir is absolute already
:
else
top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd` top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd`
if ! test -d "$top_srcdir" ; then if test ! -d "$top_srcdir" ; then
echo "top_srcdir ($top_srcdir) is not a directory." echo "top_srcdir ($top_srcdir) is not a directory."
exit 1 exit 1
fi fi
...@@ -95,7 +98,7 @@ if test -z "$QTDOCDIR" ; then ...@@ -95,7 +98,7 @@ if test -z "$QTDOCDIR" ; then
done done
fi fi
fi fi
if test -z "$QTDOCDIR" || test \! -d "$QTDOCDIR" ; then if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then
if test -z "$QTDOCDIR" ; then if test -z "$QTDOCDIR" ; then
echo "* QTDOCDIR could not be guessed." echo "* QTDOCDIR could not be guessed."
else else
...@@ -137,7 +140,7 @@ if test -z "$DOXDATA" || test ! -d "$DOXDATA" ; then ...@@ -137,7 +140,7 @@ if test -z "$DOXDATA" || test ! -d "$DOXDATA" ; then
DOXDATA="$top_srcdir/doc/common" DOXDATA="$top_srcdir/doc/common"
fi fi
if ! test -d "$DOXDATA" ; then if test ! -d "$DOXDATA" ; then
echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\"" echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\""
exit 1 exit 1
fi fi
...@@ -155,7 +158,7 @@ create_doxyfile_in() ...@@ -155,7 +158,7 @@ create_doxyfile_in()
{ {
eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"` eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"`
echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in
grep ^KDE_INIT_DOXYGEN "$top_srcdir/configure.in.in" | \ grep '^KDE_INIT_DOXYGEN' "$top_srcdir/configure.in.in" | \
sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \ sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \
-e 's+].*++' >> Doxyfile.in -e 's+].*++' >> Doxyfile.in
} }
...@@ -167,13 +170,13 @@ test "x$use_modulename" = "x0" && apidoxdir="apidocs" ...@@ -167,13 +170,13 @@ test "x$use_modulename" = "x0" && apidoxdir="apidocs"
### for the apidox and initialize it. Otherwise, just use the ### for the apidox and initialize it. Otherwise, just use the
### structure assumed to be there. ### structure assumed to be there.
if test -z "$subdir" ; then if test -z "$subdir" ; then
if ! test -d "$apidoxdir" ; then if test ! -d "$apidoxdir" ; then
mkdir "$apidoxdir" > /dev/null 2>&1 mkdir "$apidoxdir" > /dev/null 2>&1
fi fi
if ! cd "$apidoxdir" > /dev/null 2>&1 ; then cd "$apidoxdir" > /dev/null 2>&1 || {
echo "Cannot create and cd into $apidoxdir" echo "Cannot create and cd into $apidoxdir"
exit 1 exit 1
fi }
test -f "Doxyfile.in" || create_doxyfile_in test -f "Doxyfile.in" || create_doxyfile_in
...@@ -192,15 +195,15 @@ if test -z "$subdir" ; then ...@@ -192,15 +195,15 @@ if test -z "$subdir" ; then
srcdir="$1" srcdir="$1"
subdir="." subdir="."
else else
if ! cd "$apidoxdir" > /dev/null 2>&1 ; then cd "$apidoxdir" > /dev/null 2>&1 || {
echo "Cannot cd into $apidoxdir -- maybe you need to" echo "Cannot cd into $apidoxdir -- maybe you need to"
echo "build the top-level dox first." echo "build the top-level dox first."
exit 1 exit 1
fi }
if test "x1" = "x$recurse" ; then if test "x1" = "x$recurse" ; then
# OK, so --recurse was requested # OK, so --recurse was requested
if ! test -f "subdirs.top" ; then if test ! -f "subdirs.top" ; then
echo "* No subdirs.top available in the $apidoxdir." echo "* No subdirs.top available in the $apidoxdir."
echo "* The --recurse option will be ignored." echo "* The --recurse option will be ignored."
recurse=0 recurse=0
...@@ -389,7 +392,10 @@ doxyndex() ...@@ -389,7 +392,10 @@ doxyndex()
test -f "$subdir/classmap.inc" && \ test -f "$subdir/classmap.inc" && \
CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+<option value="\2">\1<\/option>+' | tr -d '\n'` CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+<option value="\2">\1<\/option>+' | tr -d '\n'`
if ! test -f "$subdir/classmap.inc" || ! grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then if test -f "$subdir/classmap.inc" && grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then