qimage_includedir=/usr/include/qt4
qimage_libdir=/usr/lib/qt4
- if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
+ if [ ! -d "$qimage_libdir" -o ! -d "$qimage_includedir" ]
then
qimage_includedir=/usr/include/qt3
qimage_libdir=/usr/lib/qt3
if [ "$QTDIR" != "" ]
then
qimage_includedir="$QTDIR/include"
- qimage_libdir="$QTDIR"
+ qimage_libdir="$QTDIR/lib"
fi
export force_qt3=
then
# test if we have a Qt3 or Qt4
- if test -f $QTDIR/lib/libQtCore.so && [ "$force_qt3" = "" ]
+ if test -f $qimage_libdir/libQtCore.so && [ "$force_qt3" = "" ]
then
echo "Qt version 4.x detected, will compile Qt4 qimage producer"
qt4_found=true
echo "#define USE_QT4" >> config.h
echo "USE_QT4=1" >> config.mak
echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
- echo QTLIBS=-L$qimage_libdir/lib -lQtGui >> config.mak
+ echo QTLIBS=-L$qimage_libdir -lQtGui >> config.mak
else
if [ -d "$kde_includedir" ]
then
echo "USE_KDE=1" >> config.mak
echo "#define USE_QT3" >> config.h
echo "USE_QT3=1" >> config.mak
- echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir >> config.mak
- echo QTLIBS=-L$qimage_libdir/lib -L$kde_libdir/lib -lqt-mt >> config.mak
+ echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir -DQT_THREAD_SUPPORT >> config.mak
+ echo QTLIBS=-L$qimage_libdir -L$kde_libdir/lib -lqt-mt >> config.mak
else
echo "qimage: KDE environment not found - disabling extra image formats"
echo "#define USE_QT3" >> config.h
echo "USE_QT3=1" >> config.mak
- echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
- echo QTLIBS=-L$qimage_libdir/lib -lqt-mt >> config.mak
+ echo QTCXXFLAGS=-I$qimage_includedir -DQT_THREAD_SUPPORT>> config.mak
+ echo QTLIBS=-L$qimage_libdir -lqt-mt >> config.mak
fi
fi
else