#6874 prepare configure based build with Qt4 frameworks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35524 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2010-09-28 15:07:07 +00:00
parent edef4cb8df
commit d18995cd79

View File

@ -28,7 +28,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
SAVE_CXXFLAGS=$CXXFLAGS SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS" CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
for libname in -lQtCore -lQtCore4 for libname in -lQtCore -lQtCore4 '-framework XQtCore'
do do
QT4_TRY_LINK($libname) QT4_TRY_LINK($libname)
if test -n "$qt4_cv_libname"; then if test -n "$qt4_cv_libname"; then
@ -38,7 +38,8 @@ AC_DEFUN([QT4_CHECK_COMPILE],
done done
qt4_cv_libname= qt4_cv_libname=
for libname in '-lQtCore -lQtGui' \ for libname in '-lQtCore -lQtGui' \
'-lQtCore4 -lQtGui4' '-lQtCore4 -lQtGui4' \
'-framework XQtCore -framework XQtGui'
do do
QT4_TRY_LINK($libname) QT4_TRY_LINK($libname)
if test -n "$qt4_cv_libname"; then if test -n "$qt4_cv_libname"; then