ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-06 20:54:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Issue 0020352: Compatibility native qt4 on mandriva 2009.1 for check_qt

Browse Source
This commit is contained in:
vsr 2009-05-18 08:46:31 +00:00
parent 802997cf75
commit af7caec60f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adm_local/unix/config_files/check_qt.m4
View File

@ -94,6 +94,15 @@ else
else else
dnl Using QTDIR environment variable dnl Using QTDIR environment variable
AC_MSG_RESULT(QTDIR is $QTDIR) AC_MSG_RESULT(QTDIR is $QTDIR)
dnl
if test $QTDIR = /usr/lib/qt3 ; then
if test -d /usr/lib/qt4 ; then
AC_MSG_RESULT(it is strange for a qt4 installation !)
AC_MSG_RESULT(/usr/lib/qt4 is present)
AC_MSG_RESULT(replacing QTDIR by /usr/lib/qt4)
QTDIR=/usr/lib/qt4
fi
fi
fi fi
fi fi
@ -323,7 +332,7 @@ then
CXXFLAGS="$CXXFLAGS $QT_INCLUDES" CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
LIBS_old=$LIBS LIBS_old=$LIBS
if test "x$QTDIR" = "x/usr" if test "x$QTDIR" = "x/usr" || test "x$QTDIR" = "x/usr/lib/qt4"
then then
QT_LIB_DIR="" QT_LIB_DIR=""
elif test -d ${QTDIR}/lib; then elif test -d ${QTDIR}/lib; then