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

Quick workaround for detection of Qt/Mac using pkg-config

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2013-07-14 20:27:52 +02:00
parent d788d497aa
commit 3e073ec919
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/qt4.m4
View File

@ -193,9 +193,17 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
AC_SUBST(QT4_VERSION) AC_SUBST(QT4_VERSION)
QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui` QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui`
AC_SUBST(QT4_LIB) AC_SUBST(QT4_LIB)
LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`" dnl LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
fi fi
PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
dnl Actually, the values of QT4_LIB and QT4_CORE_LIB can be completely
dnl wrong on OS X, where everything goes to --libs-only-other.
dnl As a quick workaround, let us assign better values. A better patch
dnl exists for next cycle.
QT4_CORE_LIB=$QT4_CORE_LIBS
QT4_CORE_LDFLAGS=
QT4_LIB=$QT4_FRONTEND_LIBS
QT4_LDFLAGS=
]) ])
AC_DEFUN([QT4_DO_MANUAL_CONFIG], AC_DEFUN([QT4_DO_MANUAL_CONFIG],