Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-11-17 07:48:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conditional build of the Qt interface

Browse source
This commit is contained in:
Olivier Teulière 2013-09-25 23:22:11 +02:00
parent 9eb9c063b8
commit 5714912321
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.in
View file

@ -166,7 +166,7 @@ AM_CONDITIONAL([BUILD_NCURSES], [test "${want_ncurses}" = "1"])
dnl Check for Qt
AC_ARG_ENABLE([qt],AS_HELP_STRING([--enable-qt],
[Qt4 interface support (default disabled)]))
[Qt4 interface support (default enabled)]))
qt4_ok=0
AS_IF([test "${enable_qt}" != "no"],
[PKG_CHECK_MODULES(QT, [QtCore QtGui QtNetwork >= 4.2.0],
@ -181,8 +181,6 @@ AS_IF([test "${enable_qt}" != "no"],
[AC_MSG_ERROR([Could not find Qt on your system (using pkg-config)])]
)
])
AM_CONDITIONAL([BUILD_QT], [test "${qt4_ok}" = "1"])
dnl Check for Qt5
AC_ARG_ENABLE([qt5],AS_HELP_STRING([--enable-qt5],
[Qt5 interface support (default disabled)]))
@ -199,7 +197,11 @@ AS_IF([test "${enable_qt5}" = "yes"],
[AC_MSG_ERROR([Could not find Qt5 on your system (using pkg-config)])]
)
])
AM_CONDITIONAL([BUILD_QT], [test "${qt5_ok}" = "1"])
dnl We biuld either with Qt4 or Qt5, but not both
if test "${qt5_ok}" = "1" && "${qt4_ok}" = "1"; then
AC_MSG_ERROR([Please deactivate Qt4 explicitly if you want to build with Qt5])
fi
AM_CONDITIONAL([BUILD_QT], [test "${qt4_ok}" = "1" || "${qt5_ok}" = "1" ])
dnl Enable/disable text version
AC_ARG_ENABLE([text],AS_HELP_STRING([--enable-text],[text interface support (default enabled)]))