1 --- configure.orig 2007-01-16 11:39:32.000000000 +0100
2 +++ configure 2007-01-18 11:20:42.000000000 +0100
7 -QTDIR="/usr/qt/3 /usr/share/qt3"
8 KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
9 DEVDIR="`cd $(dirname $0); pwd`/tools"
10 if [ -d /lib/modules/`uname -r`/build ]; then
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
21 echo -e "\n $2 not found at $1 or $3 headers not found"
27 - echo "compiling the following source file:" >> $LOG
28 - cat .tmp_src.cc >> $LOG
29 - echo "using the following command line:" >> $LOG
30 - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"-I$q/include -L$q/lib -lqt-mt\"" >> $LOG
31 - $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >> $LOG 2>&1
33 - if test_execute; then
34 - cnf_append "QTDIR" `cd $q ; pwd`
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
44 + if test_execute; then
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."
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+'`
62 log_failure "not found"
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]
74 KBUILDDIR=`echo $option | cut -d'=' -f2`
77 - QTDIR=`echo $option | cut -d'=' -f2`
80 IASL=`echo $option | cut -d'=' -f2`