anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

search also for libQtCore4 etc, not only libQtCore etc.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13304 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-03-06 17:41:49 +00:00
parent 9a1d905662
commit 0605e01f44
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/ChangeLog
View File

@ -1,6 +1,7 @@
2006-03-06 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* qt.m4 (add QtCore include directory)
* qt.m4: add QtCore include directory
* qt.m4: search also for libQtCore4 etc.
2006-03-06 Lars Gullik Bjønnes <larsbj@lyx.org>

10
config/qt.m4
View File

@ -367,7 +367,14 @@ AC_DEFUN([QT4_CHECK_COMPILE],
AC_LANG_CPLUSPLUS
SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
QT4_TRY_LINK(-lQtCore)
for libname in '-lQtCore -lQtGui -lQtXml -lQt3Support' \
'-lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4'
do
QT4_TRY_LINK($libname)
if test -n "$qt4_cv_libname"; then
break;
fi
done
CXXFLAGS=$SAVE_CXXFLAGS
])
@ -377,7 +384,6 @@ AC_DEFUN([QT4_CHECK_COMPILE],
AC_MSG_ERROR([Cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR !])
fi
else
qt4_cv_libname="$qt4_cv_libname -lQtGui -lQt3Support"
AC_MSG_RESULT([$qt4_cv_libname])
fi
])