summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/kdesdk/files')
-rw-r--r--kde-base/kdesdk/files/kdesdk-3.4-configure.patch30
1 files changed, 28 insertions, 2 deletions
diff --git a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
index 8933c41f59f7..0f33340d4b6d 100644
--- a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
+++ b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
@@ -1,6 +1,32 @@
+diff -Nur kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
+--- kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in 2005-05-23 14:08:28.000000000 +0200
++++ kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in 2005-07-28 16:28:56.000000000 +0200
+@@ -1,3 +1,10 @@
++AC_ARG_WITH(berkeley-db,
++ [AC_HELP_STRING(--with-berkeley-db,
++ [enable the dictionary plugin based on Berkeley DB IV @<:@default=check@:>@])],
++ [], with_berkeley_db=check)
++
++LIB_DBIV=""
++if test "x$with_berkeley_db" != xno; then
+
+ AC_MSG_CHECKING([for Berkeley Database IV])
+
+@@ -122,6 +129,11 @@
+ DBIV_INCLUDES="$ac_db_includes"
+ DBIV_NAME="$ac_db_name"
+
++if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
++ AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB IV failed])
++fi
++fi
++
+ AC_SUBST(DBIV_INCLUDES)
+ AC_SUBST(DBIV_LDFLAGS)
+ AC_SUBST(DBIV_NAME)
diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/svn/configure.in.bot
--- kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot 2005-05-23 14:08:56.000000000 +0200
-+++ kdesdk-3.4.2/kioslave/svn/configure.in.bot 2005-07-26 14:17:35.000000000 +0200
++++ kdesdk-3.4.2/kioslave/svn/configure.in.bot 2005-07-28 16:28:38.000000000 +0200
@@ -1,4 +1,4 @@
-if test -z "$SVN_SUBDIR"; then
+if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then
@@ -14,7 +40,7 @@ diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/
-
diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.in kdesdk-3.4.2/kioslave/svn/configure.in.in
--- kdesdk-3.4.2.orig/kioslave/svn/configure.in.in 2005-05-23 14:08:56.000000000 +0200
-+++ kdesdk-3.4.2/kioslave/svn/configure.in.in 2005-07-26 14:17:59.000000000 +0200
++++ kdesdk-3.4.2/kioslave/svn/configure.in.in 2005-07-28 16:28:38.000000000 +0200
@@ -1,3 +1,11 @@
+AC_ARG_WITH(subversion,
+ [AC_HELP_STRING(--with-subversion,