anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust autotools default configure options for Qt5.

Browse Source 
* Disable concept-checks unless explicitly required (errors out with Qt5).
* Add -fPIC to CPPFLAGS for elf targets (required with Qt5).
This commit is contained in:
Enrico Forestieri 2015-01-04 18:07:11 +01:00
parent bee845b60c
commit dd2a8b616e
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/lyxinclude.m4
View File

@ -62,6 +62,18 @@ AC_MSG_RESULT([$withval])
]) ])
dnl Check whether to configure for Qt5. Default is Qt4.
dnl
AC_DEFUN([LYX_CHECK_QT5],[
AC_MSG_CHECKING([whether Qt5 is requested])
AC_ARG_ENABLE([qt5],
[ --enable-qt5 use Qt5 for building],
USE_QT5=$enableval, USE_QT5=no)
AC_MSG_RESULT([$USE_QT5])
AC_SUBST([USE_QT5])
])
dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the
dnl flag lyx_warning to yes. dnl flag lyx_warning to yes.
AC_DEFUN([LYX_WARNING],[ AC_DEFUN([LYX_WARNING],[
@ -219,6 +231,9 @@ AC_ARG_ENABLE(concept-checks,
AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),, AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),,
[AS_CASE([$build_type], [dev*|pre*], [enable_concept_checks=yes], [AS_CASE([$build_type], [dev*|pre*], [enable_concept_checks=yes],
[enable_concept_checks=no])] [enable_concept_checks=no])]
if test x$USE_QT5 = xyes ; then
enable_concept_checks=no
fi
) )
### set up optimization ### set up optimization
@ -285,6 +300,9 @@ if test x$GXX = xyes; then
fi fi
fi fi
if test "$ac_env_CPPFLAGS_set" != set; then if test "$ac_env_CPPFLAGS_set" != set; then
if test x$USE_QT5 = xyes ; then
AS_CASE([$host], [*mingw*|*cygwin*], [], [CPPFLAGS="-fPIC $CPPFLAGS"])
fi
if test x$enable_warnings = xyes ; then if test x$enable_warnings = xyes ; then
case $gxx_version in case $gxx_version in
3.1*|3.2*|3.3*) 3.1*|3.2*|3.3*)

8
config/qt4.m4
View File

@ -112,14 +112,6 @@ EOF
dnl start here dnl start here
AC_DEFUN([QT_DO_IT_ALL], AC_DEFUN([QT_DO_IT_ALL],
[ [
AC_MSG_CHECKING([whether Qt5 is requested])
dnl Default is Qt4
AC_ARG_ENABLE([qt5],
[ --enable-qt5 use Qt5 for building],
USE_QT5=$enableval, USE_QT5=no)
AC_MSG_RESULT([$USE_QT5])
AC_SUBST([USE_QT5])
dnl this variable is precious dnl this variable is precious
AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4]) AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])

1
configure.ac
View File

@ -13,6 +13,7 @@ AC_CONFIG_AUX_DIR(config)
# First check the version # First check the version
LYX_CHECK_VERSION LYX_CHECK_VERSION
LYX_VERSION_SUFFIX LYX_VERSION_SUFFIX
LYX_CHECK_QT5
# Check how the files should be packaged # Check how the files should be packaged
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
LYX_USE_PACKAGING LYX_USE_PACKAGING