blob: 02ea0d252f6978dea2605fd099b5a8cd38f3aabb (
plain) (
blame)
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
|
--- configure.orig Thu Apr 20 21:14:45 2000
+++ configure Wed Apr 26 14:15:52 2000
@@ -1057,8 +1057,8 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-# Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; ac_word=$2
+# Extract the first word of "moc2", so it can be a program name with args.
+set dummy moc2; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1064: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then
@@ -1231,13 +1231,13 @@
do
echo $ac_n "checking "in $qtlib"""... $ac_c" 1>&6
echo "configure:1234: checking "in $qtlib"" >&5
- if test -r "$qtlib/libqt.a"; then
- checkversion=$(ar -t $qtlib/libqt.a qstringlist.o 2>&1)
+ if test -r "$qtlib/libqt2.a"; then
+ checkversion=$(ar -t $qtlib/libqt2.a qstringlist.o 2>&1)
if test "${checkversion}" = "qstringlist.o"; then
qt_lib_dir="$qtlib"
echo "$ac_t"""yes"" 1>&6
qt_lib_found=true
- QTLIB="-L${qt_lib_dir} -lqt -lX11 -lXext -static"
+ QTLIB="-L${qt_lib_dir} -lqt2 -lX11 -lXext -static"
break
fi
fi
@@ -1250,7 +1250,7 @@
fi
else
echo " Dynamic link"
- QTLIB="-lqt"
+ QTLIB="-lqt2"
fi
echo $ac_n "checking "for qt 2.0 or newer headers"""... $ac_c" 1>&6
echo "configure:1257: checking "for qt 2.0 or newer headers"" >&5
@@ -1258,15 +1258,15 @@
for qtinc in \
$qt_dir/include \
$QTDIR/include \
- /usr/include/qt \
- /usr/local/include/qt \
+ /usr/include/qt2 \
+ /usr/local/include/qt2 \
/usr/share/qt/include \
- /usr/share/include/qt \
+ /usr/share/include/qt2 \
/usr/qt/include \
- /usr/X11R6/include/qt \
- /usr/include/X11/qt \
- /usr/local/X11R6/include/qt \
- /usr/local/X11/include/qt \
+ /usr/X11R6/include/qt2 \
+ /usr/include/X11/qt2 \
+ /usr/local/X11R6/include/qt2 \
+ /usr/local/X11/include/qt2 \
/usr/local/qt/include \
/usr/lib/qt/include \
/usr/share/qt/include \
@@ -1292,7 +1292,7 @@
CXXFLAGS="-g"
echo "will compile with debug symbols"
else
- CXXFLAGS="-O2"
+# CXXFLAGS="-O2"
echo "will compile without debug symbols"
fi
INSTBIN="${bin_inst}"
|
