1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
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-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
echo ""
echo "You're missing Subversion libraries (1.x)"
echo "KDE will not be able to browse Subversion repositories without it,"
@@ -7,4 +7,3 @@
echo ""
all_tests=bad
fi
-
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-28 16:28:38.000000000 +0200
@@ -1,3 +1,11 @@
+AC_ARG_WITH(subversion,
+ [AC_HELP_STRING(--with-subversion,
+ [enable support for subversion @<:@default=check@:>@])],
+ [], with_subversion=check)
+
+SVN_SUBDIR=""
+if test "x$with_subversion" != xno; then
+
APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
SVN_SUBDIR="svn"
AC_ARG_WITH(apr-config,
@@ -137,6 +145,11 @@
SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
+if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
+ AC_MSG_ERROR([--with-subversion was given, but test for subversion failed])
+fi
+fi
+
AC_SUBST(SVN_INCLUDE)
AC_SUBST(SVN_LIB)
AC_SUBST(SVN_CPPFLAGS)
|
GitWeb
