]>
Commit | Line | Data |
---|---|---|
210193ea | 1 | --- configure.orig 2007-08-23 21:34:25.000000000 +0200 |
2 | +++ configure 2007-08-23 21:39:54.000000000 +0200 | |
3 | @@ -57,7 +57,6 @@ | |
4 | CFLAGSHAL="-I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include" | |
5 | LIBPATHHAL="" | |
6 | LIBHAL="-lhal -ldbus-1" | |
7 | -QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3" | |
3d906a63 | 8 | KBUILDDIR="`cd $(dirname $0); pwd`/kBuild" |
9 | DEVDIR="`cd $(dirname $0); pwd`/tools" | |
10 | if [ -d /lib/modules/`uname -r`/build ]; then | |
210193ea | 11 | @@ -167,8 +166,8 @@ |
3d906a63 | 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" | |
210193ea | 22 | @@ -873,37 +872,26 @@ |
3d906a63 | 23 | } |
24 | ' > .tmp_src.cc | |
25 | found_qt=0 | |
210193ea | 26 | - libs="lib" |
27 | - [ "$LIB" = "lib64" ] && libs="$libs lib64" | |
3d906a63 | 28 | - for q in $QTDIR; do |
210193ea | 29 | - for l in $libs; do |
30 | - echo "compiling the following source file:" >> $LOG | |
31 | - cat .tmp_src.cc >> $LOG | |
32 | - echo "using the following command line:" >> $LOG | |
33 | - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt" >> $LOG | |
3d906a63 | 34 | + echo "compiling the following source file:" >> $LOG |
35 | + cat .tmp_src.cc >> $LOG | |
36 | + echo "using the following command line:" >> $LOG | |
37 | + echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt" >> $LOG | |
210193ea | 38 | |
39 | - $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt >> $LOG 2>&1 | |
40 | - if (($?==0)); then | |
41 | - if test_execute; then | |
42 | - cnf_append "QTDIR" "`cd $q ; pwd`" | |
43 | - found_qt=1 | |
44 | - break | |
45 | - fi | |
46 | - fi | |
47 | - done | |
48 | - if (($found_qt==1)); then | |
49 | - break | |
3d906a63 | 50 | + $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt >> $LOG 2>&1 |
51 | + if (($?==0)); then | |
52 | + if test_execute; then | |
53 | + found_qt=1 | |
54 | fi | |
55 | - done | |
56 | + fi | |
57 | if (($found_qt!=1)); then | |
58 | - echo -e "\n Qt not found at \"$QTDIR\" or Qt headers not found" | |
59 | + echo -e "\n Qt not found or Qt headers not found" | |
60 | echo " Check the file $LOG for detailed error information." | |
61 | fail | |
62 | return 1 | |
63 | fi | |
64 | test_header "Qt devtools" | |
65 | - if check_avail "$q/bin/moc" QTDIR/bin; then | |
66 | - moc_ver=`$q/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` | |
67 | + if check_avail "/usr/bin/moc"; then | |
68 | + moc_ver=`/usr/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` | |
69 | if (($?!=0)); then | |
70 | log_failure "not found" | |
71 | fail | |
210193ea | 72 | @@ -1081,7 +1069,6 @@ |
73 | --with-hal=LIB location of the libhal libraries [$LIBHAL] | |
3d906a63 | 74 | --with-linux=DIR Linux kernel source directory [$LINUX] |
210193ea | 75 | --with-mkisofs=PATH location of mkisofs [$MKISOFS] |
3d906a63 | 76 | - --with-qt-dir=DIR directory for QT headers/libraries [$QTDIR] |
210193ea | 77 | --with-xalan=LIB location of the xalan library [$LIBXALAN] |
78 | --with-xerces=LIB location of the xerces library [$LIBXERCES] | |
3d906a63 | 79 | |
210193ea | 80 | @@ -1118,9 +1105,6 @@ |
81 | exit 1 | |
82 | fi | |
3d906a63 | 83 | ;; |
84 | - --with-qt-dir=*) | |
85 | - QTDIR=`echo $option | cut -d'=' -f2` | |
86 | - ;; | |
210193ea | 87 | --with-hal-dir=*) |
88 | INCHAL=`echo $option | cut -d'=' -f2` | |
3d906a63 | 89 | ;; |