anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix manual qt configuration in these cases:

Browse Source 
- pkgconfig is missing
- pkgconfig is available, but it does not have any qt information
by Jean-Marc and me


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16271 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-12-13 21:18:44 +00:00
parent 272fd4d7df
commit b89f97f0b4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/qt4.m4
View File

@ -28,7 +28,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
AC_LANG_CPLUSPLUS
SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
for libname in '-lQtCore -lQtCore4'
for libname in -lQtCore -lQtCore4
do
QT4_TRY_LINK($libname)
if test -n "$qt4_cv_libname"; then
@ -36,6 +36,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
break;
fi
done
qt4_cv_libname=
for libname in '-lQtCore -lQtGui' \
'-lQtCore4 -lQtGui4'
do
@ -150,7 +151,7 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
PKG_CONFIG_PATH=$qt4_cv_dir/lib:$PKG_CONFIG_PATH
export PKG_CONFIG_PATH
fi
PKG_CHECK_MODULES(QT4_CORE, QtCore)
PKG_CHECK_MODULES(QT4_CORE, QtCore,,[:])
if test "$pkg_failed" == "no" ; then
QT4_CORE_INCLUDES=$QT4_CORE_CFLAGS
AC_SUBST(QT4_CORE_INCLUDES)
@ -159,7 +160,7 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
QT4_CORE_LIB=`$PKG_CONFIG --libs-only-l QtCore`
AC_SUBST(QT4_CORE_LIB)
fi
PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui)
PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui,,[:])
if test "$pkg_failed" == "no" ; then
QT4_INCLUDES=$QT4_FRONTEND_CFLAGS
dnl QT4_LDFLAGS=$QT4_FRONTEND_LIBS