Fix hardcoded link to dl library

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 92dc505..98279eb 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -27,3 +27,16 @@
 find_package( TQt )
 find_package( TQtQUI )
 find_package( TDE )
+
+
+##### check for libdl ###########################
+
+set( DL_LIBRARIES dl )
+check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
+if( NOT HAVE_LIBDL )
+  unset( DL_LIBRARIES )
+  check_function_exists( dlopen HAVE_DLOPEN )
+  if( HAVE_DLOPEN )
+    set( HAVE_LIBDL 1 )
+  endif( HAVE_DLOPEN )
+endif( NOT HAVE_LIBDL )
diff --git a/kstartperf/CMakeLists.txt b/kstartperf/CMakeLists.txt
index a9eddb1..049eb88 100644
--- a/kstartperf/CMakeLists.txt
+++ b/kstartperf/CMakeLists.txt
@@ -24,7 +24,7 @@
 tde_add_library( kstartperf SHARED AUTOMOC
   SOURCES libkstartperf.c
   VERSION 1.0.0
-  LINK dl
+  LINK ${DL_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

Improve berkeley db detection with CMake

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/config.h.cmake b/config.h.cmake
index eefae06..f1ac1ba 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -2,3 +2,6 @@
 
 // tdecachegrind
 #cmakedefine HAVE_MMAP 1
+
+// kbabeldict/modules/dbsearchengine
+#cmakedefine USE_DB_H_PATH <@USE_DB_H_PATH@>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/CMakeLists.txt b/kbabel/kbabeldict/modules/dbsearchengine/CMakeLists.txt
index feab64f..f6fa497 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/CMakeLists.txt
+++ b/kbabel/kbabeldict/modules/dbsearchengine/CMakeLists.txt
@@ -37,6 +37,6 @@
   SOURCES
     KDBSearchEngine.cpp preferenceswidget.cpp dbse_factory.cpp
     dbseprefwidget.ui database.cpp dbscan.cpp
-  LINK kbabelcommon-shared kbabeldictplugin-shared db
+  LINK kbabelcommon-shared kbabeldictplugin-shared ${BDB_LIBRARY}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/ConfigureChecks.cmake b/kbabel/kbabeldict/modules/dbsearchengine/ConfigureChecks.cmake
index 3c03cff..7dd8a1a 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/ConfigureChecks.cmake
+++ b/kbabel/kbabeldict/modules/dbsearchengine/ConfigureChecks.cmake
@@ -9,13 +9,18 @@
 #
 #################################################
 
+find_file( USE_DB_H_PATH NAMES "db5/db.h" "db4/db.h" "db.h" )
+
 check_c_source_compiles("
-    #include <db.h>
-    void main() { DB *db; db->open(db, 0, 0, NULL, DB_BTREE, DB_CREATE, 0644); } "
+    #include <${USE_DB_H_PATH}>
+    #include <stddef.h>
+    int main() { DB *db; db->open(db, 0, 0, NULL, DB_BTREE, DB_CREATE, 0644); } "
   HAVE_BERKELEY_DB )
 
 if( HAVE_BERKELEY_DB )
-  set( BDB_LIBRARY db )
-else( )
+  find_library( BDB_LIBRARY db PATH_SUFFIXES db5 db4 )
+endif( )
+
+if( NOT BDB_LIBRARY )
   tde_message_fatal( "berkeley db is required, but was not found on your system" )
 endif( )

Improve subversion detection with CMake

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/tdeioslave/svn/ConfigureChecks.cmake b/tdeioslave/svn/ConfigureChecks.cmake
index 3d46c74..d5fd9e5 100644
--- a/tdeioslave/svn/ConfigureChecks.cmake
+++ b/tdeioslave/svn/ConfigureChecks.cmake
@@ -42,9 +42,10 @@
   check_include_file( "svn_types.h" HAVE_SVN_TYPES_H )
   tde_restore( CMAKE_REQUIRED_INCLUDES )
 else( )
-  # FIXME must be improved
-  check_include_file( "/usr/include/subversion-1/svn_types.h" HAVE_SVN_TYPES_H )
-  set( SVN_INCLUDE_DIR "/usr/include/subversion-1" )
+  find_file( HAVE_SVN_TYPES_H "subversion-1/svn_types.h" )
+  if( HAVE_SVN_TYPES_H )
+    get_filename_component( SVN_INCLUDE_DIR ${HAVE_SVN_TYPES_H} PATH CACHE )
+  endif( )
 endif( )
 
 tde_restore( CMAKE_REQUIRED_FLAGS CMAKE_REQUIRED_DEFINITIONS )

Fix FTBFS with clang

Signed-off-by: Slávek Banko <slavek.banko@...>

diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index 92eb158..5507e9d 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -22,6 +22,7 @@
 
 #include "kbcataloglistviewitem.h"
 #include <assert.h>
+#include <algorithm>
 
 KBCatalogListViewItem::KBCatalogListViewItem(TDEListView* lv, TDEListViewItem* parent,     uint id, TQString msgid, TQString msgstr)
  : Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr)
diff --git a/poxml/antlr/src/BitSet.cpp b/poxml/antlr/src/BitSet.cpp
index a0a1b11..69e70a6 100644
--- a/poxml/antlr/src/BitSet.cpp
+++ b/poxml/antlr/src/BitSet.cpp
@@ -1,4 +1,5 @@
 #include "antlr/BitSet.hpp"
+#include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)