blob: f7f42a1b8e31deeb9c75c644d0accbeee9be13a1 (
plain)
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
|
$NetBSD: patch-aa,v 1.9 2001/08/29 22:41:06 jlam Exp $
--- configure.orig Mon May 22 14:34:07 2000
+++ configure
@@ -3970,12 +3970,12 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
+if test "${x_includes+set}" != set || test "$x_includes" = NONE; then
kde_x_includes=NO
else
kde_x_includes=$x_includes
fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
+if test "${x_libraries+set}" != set || test "$x_libraries" = NONE; then
kde_x_libraries=NO
else
kde_x_libraries=$x_libraries
@@ -4132,6 +4132,8 @@
rm -f conftest*
fi # $ac_x_libraries = NO
+# Don't second-guess the package builder.
+if false; then
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
@@ -4165,6 +4167,7 @@
cd ..
rm -fr conftestdir
fi
+fi
if test -z "$ac_x_includes"; then
ac_x_includes="."
@@ -4407,7 +4410,7 @@
echo $ac_n "checking for Qt""... $ac_c" 1>&6
echo "configure:4409: checking for Qt" >&5
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
+LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
qt_libraries=""
qt_includes=""
@@ -4630,7 +4633,7 @@
CXXFLAGS="$CXXFLAGS -I$qt_includes"
LDFLAGS="$X_LDFLAGS"
-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
+LIBS="-lqt -lXext -lX11 -lz -lpng -lSM -ljpeg -lICE $LIBSOCKET"
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
LIBRARY_PATH=
|
