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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/kscreensaver/configure.in.in
--- kdeartwork-3.4.2.orig/kscreensaver/configure.in.in 2005-07-20 18:40:58.000000000 +0200
+++ kdeartwork-3.4.2/kscreensaver/configure.in.in 2005-07-26 13:54:39.000000000 +0200
@@ -36,32 +36,41 @@
AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
-LIBART=
+AC_ARG_WITH(libart,
+ [AC_HELP_STRING(--with-libart,
+ [enable support for libart @<:@default=check@:>@])],
+ [], with_libart=check)
-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
- AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
-])
-
-if test -n "$LIBART_CONFIG"; then
- vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test -n "$vers" && test "$vers" -ge 2003008
- then
- LIBART_LIBS="`$LIBART_CONFIG --libs`"
- LIBART_RPATH=
- for args in $LIBART_LIBS; do
+LIBART=
+if test "x$with_libart" != xno; then
+ KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
+ ])
+
+ if test -n "$LIBART_CONFIG"; then
+ vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ if test -n "$vers" && test "$vers" -ge 2003008; then
+ LIBART_LIBS="`$LIBART_CONFIG --libs`"
+ LIBART_RPATH=
+ for args in $LIBART_LIBS; do
case $args in
-L*)
LIBART_RPATH="$LIBART_RPATH $args"
;;
esac
- done
- LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
- LIBART=yes
-
- AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
- else
- AC_MSG_WARN([You need at least libart 2.3.8])
+ done
+ LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
+ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
+ LIBART=yes
+
+ AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
+ else
+ AC_MSG_WARN([You need at least libart 2.3.8])
+ fi
+ fi
+
+ if test "x$with_libart" != xcheck && test -z "$LIBART"; then
+ AC_MSG_ERROR([--with-libart was given, but test for libart failed])
fi
fi
diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot
--- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot 2005-07-20 18:40:57.000000000 +0200
+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot 2005-07-26 13:54:39.000000000 +0200
@@ -1,4 +1,4 @@
-if test "$XSCREENSAVER" = "NO"; then
+if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
echo ""
echo "xscreensaver could not be detected on your system."
echo "Check www.jwz.org/xscreensaver if you're loving to"
diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in
--- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in 2005-07-20 18:40:57.000000000 +0200
+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in 2005-07-26 13:54:39.000000000 +0200
@@ -1,4 +1,4 @@
-AC_DEFUN([KDE_CHECK_XSREENSAVER],
+AC_DEFUN([KDE_CHECK_XSCREENSAVER],
[
XSCREENSAVER_CONFIG=NO
AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
@@ -22,46 +22,82 @@
done
IFS=$old_IFS
-KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
- [
- KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ],
- [
- KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER,
- [ $xscreensaver_prefixes ],
- [
- KDE_FIND_PATH(hacks/flame, XSCREENSAVER,
- [ $xscreensaver_prefixes ],
- [
- XSCREENSAVER=NO
- ])
- ])
- ])
- ])
+AC_ARG_WITH(xscreensaver,
+ [AC_HELP_STRING(--with-xscreensaver,
+ [enable support for xscreensaver @<:@default=check@:>@])],
+ [], with_xscreensaver=check)
+
+AC_ARG_WITH(xscreensaver-dir,
+ [AC_HELP_STRING(--with-xscreensaver-dir=DIR,
+ [where xscreensaver is installed])], [])
+
+AC_ARG_WITH(xscreensaver-config,
+ [AC_HELP_STRING(--with-xscreensaver-config=DIR,
+ [where the xscreensaver config files are])], [])
+
+XSCREENSAVER=NO
+XSCREENSAVER_CONFIG=NO
+if test "x$with_xscreensaver" != xno; then
+ if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
+ XSCREENSAVER="$with_xscreensaver_dir/flame"
+ fi
+
+ if test "x$XSCREENSAVER" = xNO && test -n "$kdelibsuff"; then
+ KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
+ fi
+
+ if test "x$XSCREENSAVER" = xNO; then
+ KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
+ fi
+
+ if test "x$XSCREENSAVER" = xNO; then
+ KDE_FIND_PATH(libexec/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
+ fi
+
+ if test "x$XSCREENSAVER" = xNO; then
+ KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
+ fi
+
+ if test "x$XSCREENSAVER" = xNO; then
+ KDE_FIND_PATH(hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
+ fi
+
+ AC_MSG_CHECKING([for flame.xml])
+
+ if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
+ XSCREENSAVER_CONFIG="$with_xscreensaver_config"
+ fi
-XSCREENSAVER_HACKS_DIR=
-
-if test "$XSCREENSAVER" != "NO"; then
- XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
- AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
-
- AC_MSG_CHECKING([for flame.xml])
+ if test "x$XSCREENSAVER_CONFIG" = xNO; then
for subdir in lib/xscreensaver/config \
lib/X11/xscreensaver/config \
share/control-center/screensavers \
- share/control-center/screensavers \
share/xscreensaver/config \
xscreensaver \
config/control-center-2.0; do
- KDE_CHECK_XSREENSAVER($subdir)
+ KDE_CHECK_XSCREENSAVER($subdir)
if test "$XSCREENSAVER_CONFIG" != NO; then
break
fi
done
- AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
- AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG",
- [Defines where xscreensaver stores it's config files])
+ fi
+
+ AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
+
+ if test "x$XSCREENSAVER_CONFIG" = xNO; then
+ XSCREENSAVER=NO
+ fi
+
+ if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = xNO; then
+ AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
+ fi
+fi
+
+if test "$XSCREENSAVER" != "NO"; then
+ XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
+ AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
+ AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", [Defines where xscreensaver stores it's config files])
fi
AM_CONDITIONAL(include_XSCREENSAVER, test "$XSCREENSAVER" != "NO")
AC_SUBST(XSCREENSAVER_HACKS_DIR)
-
|
GitWeb