anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

output Qt version

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5293 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-09-12 17:10:04 +00:00
parent 0d325e0e3f
commit 6c5e002ef2
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/ChangeLog
View File

@ -1,3 +1,9 @@
2002-09-12 John Levon <levon@movementarian.org>
* configure.ac:
* configure.in:
* qt.m4: output Qt version
2002-09-12 John Levon <levon@movementarian.org>
* qt.m4: make $FATAL actually work

4
config/configure.ac
View File

@ -195,7 +195,9 @@ case "$lyx_use_frontend" in
FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
FRONTEND_LIBS="\$(QT_LIB)";;
FRONTEND_LIBS="\$(QT_LIB)"
FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
;;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac

4
config/configure.in
View File

@ -196,7 +196,9 @@ case "$lyx_use_frontend" in
FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
FRONTEND_LIBS="\$(QT_LIB)";;
FRONTEND_LIBS="\$(QT_LIB)"
FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
;;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac

28
config/qt.m4
View File

@ -129,6 +129,32 @@ AC_DEFUN(QT_CHECK_COMPILE,
fi
])
dnl get Qt version we're using
AC_DEFUN(QT_GET_VERSION,
[
AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
[
AC_LANG_CPLUSPLUS
SAVE_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $QT_INCLUDES"
cat > conftest.$ac_ext <<EOF
#line __oline__ "configure"
#include "confdefs.h"
#include <qglobal.h>
"%%%"QT_VERSION_STR"%%%"
EOF
lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
grep '^"%%%"' 2>/dev/null | \
sed -e 's/^"%%%""\(.*\)""%%%"/\1/' -e 's/ //g'`
rm -f conftest.$ac_ext
CPPFLAGS=$SAVE_CPPFLAGS
])
QT_VERSION=$lyx_cv_qtversion
AC_SUBST(QT_VERSION)
])
dnl start here
AC_DEFUN(QT_DO_IT_ALL,
[
@ -183,4 +209,6 @@ AC_DEFUN(QT_DO_IT_ALL,
QT_LIB=$qt_cv_libname;
AC_SUBST(QT_LIB)
QT_GET_VERSION
])