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

Issue 0020010: EDF GUI : Some remarks on GUI configure step

Browse Source 
Additional fix for native Qt4 detection
This commit is contained in:
vsr 2009-10-08 14:35:15 +00:00
parent e0a2847a0a
commit 636d85bf75
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,35 +75,33 @@ fi
if test "x$with_qt" != "x" ; then if test "x$with_qt" != "x" ; then
dnl Using "--with-qt" prefix path dnl Using "--with-qt" prefix path
QTDIR="$with_qt" QTDIR="$with_qt"
else elif test "$QTDIR" = "/usr/lib/qt3" ; then
if test -z $QTDIR ; then dnl Using QTDIR environment variable
AC_MSG_WARN(undefined QTDIR variable which specify where Qt product was installed) AC_MSG_RESULT(current QTDIR is $QTDIR)
for d in /usr/local/lib/qt4 /usr/lib/qt4 ; do dnl
if test -f ${d}/include/Qt/qconfig.h ; then if test -d /usr/lib/qt4 ; then
AC_MSG_RESULT(trying ${d}) AC_MSG_RESULT(it is strange for a qt4 installation !)
QTDIR="${d}" AC_MSG_RESULT(/usr/lib/qt4 is present)
break AC_MSG_RESULT(replacing QTDIR by /usr/lib/qt4)
else QTDIR=/usr/lib/qt4
if test -f ${d}/include/qconfig.h ; then
AC_MSG_RESULT(trying ${d})
QTDIR="${d}"
break
fi
fi
done
else
dnl Using QTDIR environment variable
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
elif test -z $QTDIR ; then
AC_MSG_WARN(undefined QTDIR variable which specify where Qt product was installed)
for d in /usr/local/lib/qt4 /usr/lib/qt4 /usr ; do
if test -f ${d}/lib/libQtCore.so ; then
AC_MSG_RESULT(trying ${d})
QTDIR="${d}"
break
elif test -f ${d}/lib64/libQtCore.so ; then
AC_MSG_RESULT(trying ${d})
QTDIR="${d}"
break
elif test -f ${d}/libQtCore.so ; then
AC_MSG_RESULT(trying ${d})
QTDIR="${d}"
break
fi
done
fi fi
# #
@ -178,7 +176,7 @@ then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
qt_ok=yes qt_ok=yes
else else
AC_MSG_RESULT(moc tool and Qt product are inpompatible $MOC_VERSION) AC_MSG_RESULT(moc tool and Qt product are incompatible $MOC_VERSION)
qt_ok=no qt_ok=no
fi fi
fi fi
@ -235,7 +233,7 @@ then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
qt_ok=yes qt_ok=yes
else else
AC_MSG_RESULT(rcc tool and Qt product are inpompatible) AC_MSG_RESULT(rcc tool and Qt product are incompatible)
qt_ok=no qt_ok=no
fi fi
fi fi
@ -271,7 +269,7 @@ then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
qt_ok=yes qt_ok=yes
else else
AC_MSG_RESULT(lrelease tool and Qt product are inpompatible) AC_MSG_RESULT(lrelease tool and Qt product are incompatible)
qt_ok=no qt_ok=no
fi fi
fi fi
@ -332,7 +330,7 @@ then
CXXFLAGS="$CXXFLAGS $QT_INCLUDES" CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
LIBS_old=$LIBS LIBS_old=$LIBS
if test "x$QTDIR" = "x/usr" || test "x$QTDIR" = "x/usr/lib/qt4" if test "x$QTDIR" = "x/usr"
then then
QT_LIB_DIR="" QT_LIB_DIR=""
elif test -d ${QTDIR}/lib; then elif test -d ${QTDIR}/lib; then