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
|
$FreeBSD$
--- configure.orig Fri Dec 1 19:51:43 2000
+++ configure Thu Apr 5 17:17:27 2001
@@ -1056,8 +1056,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:1063: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then
@@ -1213,10 +1213,10 @@
if test "${link_type}" = "static"; then
echo " Static link"
- libqt="libqt.a"
+ libqt="libqt2.a"
else
echo " Dynamic link"
- libqt="libqt.so.2"
+ libqt="libqt2.so"
fi
echo $ac_n "checking "for a qt 2.0 or newer library"""... $ac_c" 1>&6
echo "configure:1223: checking "for a qt 2.0 or newer library"" >&5
@@ -1238,7 +1238,7 @@
if test -r "$qtlib/$libqt"; then
if test "${link_type}" = "static"; then
ok="false"
- checkversion=$(ar -t $qtlib/libqt.a qstringlist.o 2>&1)
+ checkversion=$(ar -t $qtlib/libqt2.a qstringlist.o 2>&1)
if test "${checkversion}" = "qstringlist.o"; then
ok="true"
fi
@@ -1250,9 +1250,9 @@
echo "$ac_t"""yes"" 1>&6
qt_lib_found=true
if test "${link_type}" = "static"; then
- QTLIB="-L${qt_lib_dir} -lqt -L/usr/X11R6/lib -lX11 -lXext -lpng -static"
+ QTLIB="-L${qt_lib_dir} -lqt2 -L/usr/X11R6/lib -lX11 -lXext -lpng -static"
else
- QTLIB="-L${qt_lib_dir} -lqt"
+ QTLIB="-L${qt_lib_dir} -lqt2"
fi
break
fi
@@ -1270,15 +1270,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 \
@@ -1304,7 +1304,7 @@
CXXFLAGS="-g -pipe"
echo "will compile with debug symbols"
else
- CXXFLAGS="-O2 -pipe"
+# CXXFLAGS="-O2 -pipe"
echo "will compile without debug symbols"
fi
if test -d ${qt_dir}; then
|
