sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

tweaks to Qt detection

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@312 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2003-11-30 01:37:43 +00:00
parent 9b1b959572
commit e4bdd8ce0d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
acinclude.m4
View File

@ -86,12 +86,13 @@ case "${host}" in
;;
*)
QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null`
QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null`
if test "x$QT_IS_STATIC" = x; then
QT_IS_STATIC="no"
else
QT_IS_STATIC="yes"
fi
#echo "QT_IS_STATIC=$QT_IS_STATIC"
if test x$QT_IS_STATIC = xno ; then
QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null`
if test "x$QT_IS_DYNAMIC" = x; then
@ -99,10 +100,10 @@ case "${host}" in
fi
fi
if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then
QT_LIB="-lqt"
QT_IS_MT="no"
elif test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
elif test "x`ls $QTDIR/lib/libqt-mt.so* 2> /dev/null`" != x ; then
QT_LIB="-lqt-mt"
QT_IS_MT="yes"
elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
@ -116,6 +117,7 @@ case "${host}" in
fi
;;
esac
#echo "QT_LIB is $QT_LIB"
AC_MSG_CHECKING([if Qt is static])
AC_MSG_RESULT([$QT_IS_STATIC])
AC_MSG_CHECKING([if Qt is multithreaded])
@ -125,6 +127,7 @@ AC_MSG_RESULT([$QT_IS_EMBEDDED])
QT_GUILINK=""
QASSISTANTCLIENT_LDADD="-lqassistantclient"
#echo "host is ${host}"
case "${host}" in
*irix*)
QT_LIBS="$QT_LIB"
@ -186,7 +189,6 @@ case "${host}" in
esac
if test x"$QT_IS_EMBEDDED" = "xyes" ; then
QT_CXXFLAGS="-DQWS $QT_CXXFLAGS"
fi