blob: 6a494ab20f3fed5bc1f67eba5043977ce3bb82de (
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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
--- create_config.sh.orig 2013-10-13 02:39:16.000000000 -0700
+++ create_config.sh 2014-04-11 12:04:57.000000000 -0700
@@ -61,43 +61,45 @@
fi
# Checking for QT
-info "--- Checking for QT..."
-if which pkg-config > /dev/null 2>&1; then
- if pkg-config QtCore; then
- QT_MODULES="QtCore QtGui QtNetwork"
- info "yes (pkg-config QtCore)\n"
- output "QT_LIBPATH=$(pkg-config $QT_MODULES --libs-only-L)"
- output "QT_LIBS=$(pkg-config $QT_MODULES --libs-only-l)"
- output "QT_INCPATH=$(pkg-config $QT_MODULES --cflags-only-I)"
- output "QT_CFLAGS=$(pkg-config $QT_MODULES --cflags-only-other)"
- QT_PREFIX=$(pkg-config QtCore --variable=prefix)
- QT_BIN="${QT_PREFIX}/bin"
- output "QT_BIN=${QT_BIN}"
- QT_MOC=$(pkg-config QtCore --variable=moc_location)
- if [ ! -x "$QT_MOC" ]; then
- QT_MOC="$QT_BIN/moc"
- fi
- QT_UIC=$(pkg-config QtCore --variable=uic_location)
- if [ ! -x "$QT_UIC" ]; then
- QT_UIC="$QT_BIN/uic"
- fi
- QT_RCC=$(pkg-config QtCore --variable=rcc_location)
- if [ ! -x "$QT_RCC" ]; then
- QT_RCC="$QT_BIN/rcc"
+if [ "$WITHOUT_QT" != "yes" ]; then
+ info "--- Checking for QT..."
+ if which pkg-config > /dev/null 2>&1; then
+ if pkg-config QtCore; then
+ QT_MODULES="QtCore QtGui QtNetwork"
+ info "yes (pkg-config QtCore)\n"
+ output "QT_LIBPATH=$(pkg-config $QT_MODULES --libs-only-L)"
+ output "QT_LIBS=$(pkg-config $QT_MODULES --libs-only-l)"
+ output "QT_INCPATH=$(pkg-config $QT_MODULES --cflags-only-I)"
+ output "QT_CFLAGS=$(pkg-config $QT_MODULES --cflags-only-other)"
+ #QT_PREFIX=$(pkg-config QtCore --variable=prefix)
+ QT_BIN="${QT_PREFIX}/bin"
+ output "QT_BIN=${QT_BIN}"
+ QT_MOC=$(pkg-config QtCore --variable=moc_location)
+ if [ ! -x "$QT_MOC" ]; then
+ QT_MOC="$QT_BIN/moc"
+ fi
+ QT_UIC=$(pkg-config QtCore --variable=uic_location)
+ if [ ! -x "$QT_UIC" ]; then
+ QT_UIC="$QT_BIN/uic"
+ fi
+ QT_RCC=$(pkg-config QtCore --variable=rcc_location)
+ if [ ! -x "$QT_RCC" ]; then
+ QT_RCC="$QT_BIN/rcc"
+ fi
+ QT_LRELEASE=$(pkg-config QtCore --variable=lrelease_location)
+ if [ ! -x "$QT_LRELEASE" ]; then
+ QT_LRELEASE="$QT_BIN/lrelease"
+ fi
+ output "QT_MOC=$MOC"
+ output "QT_UIC=$UIC"
+ output "QT_RCC=$RCC"
+ output "QT_LRELEASE=$LRELEASE"
+ else
+ info "no (optional)\n"
fi
- QT_LRELEASE=$(pkg-config QtCore --variable=lrelease_location)
- if [ ! -x "$QT_LRELEASE" ]; then
- QT_LRELEASE="$QT_BIN/lrelease"
- fi
- output "QT_MOC=${QT_MOC}"
- output "QT_UIC=${QT_UIC}"
- output "QT_RCC=${QT_RCC}"
- output "QT_LRELEASE=${QT_LRELEASE}"
else
info "no (optional)\n"
fi
-else
- info "no (optional)\n"
fi
# Checking for libsigc++
@@ -120,9 +122,7 @@
# Checking for tcl development library
info "--- Checking for TCL development library..."
-tclConfig=$(ls /usr/lib/tclConfig.sh /usr/lib/tcl8.*/tclConfig.sh \
- /usr/lib64/tclConfig.sh /usr/lib64/tcl8.*/tclConfig.sh \
- 2>/dev/null | head -1)
+tclConfig=$(ls ${TCL_LIBDIR}/tclConfig.sh 2>/dev/null | head -1)
if [ -n "$tclConfig" -a -r "$tclConfig" ]; then
. $tclConfig
info "${TCL_VERSION}\n"
|
