Search for pkgconfig Qt4 files in architecture specific dir only if fails in standard location.

Fixes bug #205 reported by Mandriva.


git-svn-id: http://voip.null.ro/svn/yate@3141 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-03-23 14:43:29 +00:00
parent ab2dd05c41
commit 257744e4e3
1 changed files with 4 additions and 3 deletions

View File

@ -966,10 +966,11 @@ AC_ARG_WITH(libqt4,AC_HELP_STRING([--with-libqt4],[use Qt for graphical clients
if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
AC_MSG_CHECKING([for Qt4 >= 4.2.0 using pkg-config])
pkgd="/usr/lib/qt4/$ARCHLIB/pkgconfig"
if [[ -d "$pkgd" ]]; then
export PKG_CONFIG_LIBDIR="$pkgd"
fi
verqt=`pkg-config --modversion QtCore 2>/dev/null`
if [[ -z "$verqt" -a -d "$pkgd" ]]; then
export PKG_CONFIG_LIBDIR="$pkgd"
verqt=`pkg-config --modversion QtCore 2>/dev/null`
fi
incqt=`pkg-config --cflags QtNetwork QtGui QtXml QtCore 2>/dev/null | sed 's/QtNetwork/QtUiTools/'`
libqt=`pkg-config --libs QtNetwork QtGui QtXml QtCore 2>/dev/null | sed 's/QtNetwork/QtUiTools/'`
unset PKG_CONFIG_LIBDIR