]>
Commit | Line | Data |
---|---|---|
3d906a63 | 1 | --- configure.orig 2007-01-16 11:39:32.000000000 +0100 |
2 | +++ configure 2007-01-18 11:20:42.000000000 +0100 | |
3 | @@ -51,7 +51,6 @@ | |
4 | LIBZ="-lz" | |
5 | INCPNG="" | |
6 | LIBPNG="-lpng" | |
cf40c3d4 | 7 | -QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/share/qt3" |
3d906a63 | 8 | KBUILDDIR="`cd $(dirname $0); pwd`/kBuild" |
9 | DEVDIR="`cd $(dirname $0); pwd`/tools" | |
10 | if [ -d /lib/modules/`uname -r`/build ]; then | |
11 | @@ -148,8 +147,8 @@ | |
12 | echo "compiling the following source file:" >> $LOG | |
13 | cat .tmp_src.cc >> $LOG | |
14 | echo "using the following command line:" >> $LOG | |
15 | - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"$1\"" >> $LOG | |
16 | - $CXX -O -Wall -o .tmp_out .tmp_src.cc $1 >> $LOG 2>&1 | |
17 | + echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG | |
18 | + $CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1 | |
19 | if (($?!=0)); then | |
20 | if [ -z "$4" ]; then | |
21 | echo -e "\n $2 not found at $1 or $3 headers not found" | |
cf40c3d4 | 22 | @@ -873,29 +873,25 @@ |
3d906a63 | 23 | } |
24 | ' > .tmp_src.cc | |
25 | found_qt=0 | |
26 | - for q in $QTDIR; do | |
27 | - echo "compiling the following source file:" >> $LOG | |
28 | - cat .tmp_src.cc >> $LOG | |
29 | - echo "using the following command line:" >> $LOG | |
cf40c3d4 | 30 | - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt" >> $LOG |
3d906a63 | 31 | - $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >> $LOG 2>&1 |
32 | - if (($?==0)); then | |
33 | - if test_execute; then | |
34 | - cnf_append "QTDIR" `cd $q ; pwd` | |
35 | - found_qt=1 | |
36 | - break | |
37 | - fi | |
38 | + echo "compiling the following source file:" >> $LOG | |
39 | + cat .tmp_src.cc >> $LOG | |
40 | + echo "using the following command line:" >> $LOG | |
41 | + echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt" >> $LOG | |
42 | + $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt >> $LOG 2>&1 | |
43 | + if (($?==0)); then | |
44 | + if test_execute; then | |
45 | + found_qt=1 | |
46 | fi | |
47 | - done | |
48 | + fi | |
49 | if (($found_qt!=1)); then | |
50 | - echo -e "\n Qt not found at \"$QTDIR\" or Qt headers not found" | |
51 | + echo -e "\n Qt not found or Qt headers not found" | |
52 | echo " Check the file $LOG for detailed error information." | |
53 | fail | |
54 | return 1 | |
55 | fi | |
56 | test_header "Qt devtools" | |
57 | - if check_avail "$q/bin/moc" QTDIR/bin; then | |
58 | - moc_ver=`$q/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` | |
59 | + if check_avail "/usr/bin/moc"; then | |
60 | + moc_ver=`/usr/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` | |
61 | if (($?!=0)); then | |
62 | log_failure "not found" | |
63 | fail | |
64 | @@ -937,7 +932,6 @@ | |
65 | --with-iasl=PATH the position of the iasl compiler [$IASL] | |
66 | --with-linux=DIR Linux kernel source directory [$LINUX] | |
67 | --with-mkisofs=PATH position of mkisofs [$MKISOFS] | |
68 | - --with-qt-dir=DIR directory for QT headers/libraries [$QTDIR] | |
69 | --with-xalan=LIB position of the xalan library [$LIBXALAN] | |
70 | --with-xerces=LIB position of the xerces library [$LIBXERCES] | |
71 | ||
72 | @@ -970,9 +964,6 @@ | |
73 | --with-kbuild=*) | |
74 | KBUILDDIR=`echo $option | cut -d'=' -f2` | |
75 | ;; | |
76 | - --with-qt-dir=*) | |
77 | - QTDIR=`echo $option | cut -d'=' -f2` | |
78 | - ;; | |
79 | --with-iasl=*) | |
80 | IASL=`echo $option | cut -d'=' -f2` | |
81 | ;; |