1 --- configure.orig 2007-08-23 21:34:25.000000000 +0200
2 +++ configure 2007-08-23 21:39:54.000000000 +0200
4 CFLAGSHAL="-I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
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"
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 - [ "$LIB" = "lib64" ] && libs="$libs lib64"
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
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
39 - $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt >> $LOG 2>&1
41 - if test_execute; then
42 - cnf_append "QTDIR" "`cd $q ; pwd`"
48 - if (($found_qt==1)); then
50 + $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt >> $LOG 2>&1
52 + if test_execute; then
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."
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+'`
70 log_failure "not found"
73 --with-hal=LIB location of the libhal libraries [$LIBHAL]
74 --with-linux=DIR Linux kernel source directory [$LINUX]
75 --with-mkisofs=PATH location of mkisofs [$MKISOFS]
76 - --with-qt-dir=DIR directory for QT headers/libraries [$QTDIR]
77 --with-xalan=LIB location of the xalan library [$LIBXALAN]
78 --with-xerces=LIB location of the xerces library [$LIBXERCES]
85 - QTDIR=`echo $option | cut -d'=' -f2`
88 INCHAL=`echo $option | cut -d'=' -f2`