Mercurial > octave-nkf

comparison configure.ac @ 17599:f5950975a172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
community news dock widget and other user info in GUI * news-dock-widget.h, news-dock-widget.cc: New files. * libgui/src/module.mk: Update file lists. * configure.ac: Check for QtWebKit module. * default-qt-settings.in: Update default geometry. * main-window.cc, main-window.h (main_window::news_window): New data member. (main_window::dock_widget_list): Include it in the list. (main_window::display_release_notes, main_window::display_url_in_window, main_window::construct_news_menu): New functions. (main_window::construct): Add news_window dock widget. (main_window::construct_menu_bar): Call construct_news_menu. (main_window::construct_window_menu): New items for Showing news window and menu.
author John W. Eaton <jwe@octave.org>
date Mon, 07 Oct 2013 21:13:11 -0400
parents 1c7d768c3847
children 482222fe5b35
comparison
equal deleted inserted replaced
17598:d8d71c89fff2 17599:f5950975a172
2621 [AS_HELP_STRING([--disable-gui], [don't build the GUI])], 2621 [AS_HELP_STRING([--disable-gui], [don't build the GUI])],
2622 [if test "$enableval" = no; then build_gui=no; fi], []) 2622 [if test "$enableval" = no; then build_gui=no; fi], [])
2623 2623
2624 if test $build_gui = yes; then 2624 if test $build_gui = yes; then
2625 ## Check for Qt libraries 2625 ## Check for Qt libraries
2626 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork], 2626 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork, QtWebKit],
2627 [], 2627 [],
2628 [AC_MSG_WARN([Qt libraries not found -- disabling GUI]) 2628 [AC_MSG_WARN([Qt libraries not found -- disabling GUI])
2629 build_gui=no]) 2629 build_gui=no])
2630 2630
2631 if test $build_gui = yes; then 2631 if test $build_gui = yes; then
2632 ## Retrieve Qt compilation and linker flags 2632 ## Retrieve Qt compilation and linker flags
2633 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork`" 2633 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork QtWebKit`"
2634 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork`" 2634 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork QtWebKit`"
2635 QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork`" 2635 QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork QtWebKit`"
2636 2636
2637 ## Check for Qt4 2637 ## Check for Qt4
2638 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then 2638 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then
2639 AC_MSG_WARN([Qt >= 4.0.0 not found -- disabling GUI]) 2639 AC_MSG_WARN([Qt >= 4.0.0 not found -- disabling GUI])
2640 build_gui=no 2640 build_gui=no