]>
Commit | Line | Data |
---|---|---|
fdb44af0 | 1 | --- configure.orig 2007-10-24 14:29:21.000000000 +0200 |
2 | +++ configure 2007-10-24 14:29:29.000000000 +0200 | |
3 | @@ -64,7 +64,6 @@ | |
77342933 | 4 | LIBZ="-lz" |
5 | INCPNG="" | |
6 | LIBPNG="-lpng" | |
87bb5f90 | 7 | -QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt" |
fdb44af0 | 8 | KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild" |
9 | DEVDIR="`cd \`dirname $0\`; pwd`/tools" | |
77342933 | 10 | if [ -d "/lib/modules/`uname -r`/build" ]; then |
fdb44af0 | 11 | @@ -189,8 +188,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 | |
77342933 | 19 | if [ $? -ne 0 ]; then |
3d906a63 | 20 | if [ -z "$4" ]; then |
77342933 | 21 | echo |
fdb44af0 | 22 | @@ -978,37 +977,26 @@ |
3d906a63 | 23 | } |
77342933 | 24 | EOF |
3d906a63 | 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 | |
fdb44af0 | 33 | - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD" >> $LOG |
34 | - $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $LOG 2>&1 | |
77342933 | 35 | - if [ $? -eq 0 ]; then |
210193ea | 36 | - if test_execute; then |
37 | - cnf_append "QTDIR" "`cd $q ; pwd`" | |
38 | - found_qt=1 | |
39 | - break | |
40 | - fi | |
41 | - fi | |
42 | - done | |
77342933 | 43 | - if [ $found_qt -eq 1 ]; then |
210193ea | 44 | - break |
fdb44af0 | 45 | + echo "compiling the following source file:" >> $LOG |
46 | + cat .tmp_src.cc >> $LOG | |
47 | + echo "using the following command line:" >> $LOG | |
48 | + echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD" >> $LOG | |
49 | + $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD >> $LOG 2>&1 | |
77342933 | 50 | + if [ $? -eq 0 ]; then |
3d906a63 | 51 | + if test_execute; then |
52 | + found_qt=1 | |
53 | fi | |
54 | - done | |
55 | + fi | |
77342933 | 56 | if [ $found_qt -ne 1 ]; then |
57 | echo | |
58 | - echo " Qt not found at \"$QTDIR\" or Qt headers not found" | |
59 | + echo " Qt not found or Qt headers not found" | |
60 | echo " Check the file $LOG for detailed error information." | |
3d906a63 | 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+'` | |
77342933 | 69 | if [ $? -ne 0 ]; then |
3d906a63 | 70 | log_failure "not found" |
71 | fail | |
fdb44af0 | 72 | @@ -1226,7 +1214,6 @@ |
73 | --with-iasl=PATH location of the iasl compiler [$IASL] | |
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-xalan-incdir=DIR location of the xalan headers [/usr/include /usr/local/include] | |
79 | --with-xalan-libdir=DIR location of the xalan library [/usr/lib /usr/local/lib] | |
80 | @@ -1268,9 +1255,6 @@ | |
210193ea | 81 | exit 1 |
82 | fi | |
3d906a63 | 83 | ;; |
84 | - --with-qt-dir=*) | |
85 | - QTDIR=`echo $option | cut -d'=' -f2` | |
86 | - ;; | |
77342933 | 87 | --with-iasl=*) |
88 | IASL=`echo $option | cut -d'=' -f2` | |
3d906a63 | 89 | ;; |