Mercurial > octave

comparison src/module.mk @ 21374:1487a68a496a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
untangle configuration of OpenGL, FLTK, and Qt (bug #47263) * configure.ac: Disentangle checks for FLTK, Qt, OpenGL, freetype, fontconfig, etc. * configure.ac (AMCOND_BUILD_QT_GRAPHICS): New automake conditional. * libgui/graphics/module.mk: Use it. * configure.ac (AMCOND_BUILD_QT_GUI): Rename from AMCOND_BUILD_GUI. Change all uses. (HAVE_OCTAVE_QT_GUI): Rename from HAVE_OCTAVE_GUI. Change all uses. * octave-gui.cc: Only initialize qt graphics toolkit if it is available. * __init_fltk__.cc: Only initialize fltk graphics toolkit if it is available. Allow compilation to succeed if FTLk widgets are availble but OpenGL is not. * __osmesa_print__.cc: Build even if OpenGL is not available. * acinclude.m4 (OCTAVE_CHECK_LIB_OPENGL): Move AC_DEFINE for HAVE_OPENGL here. * libinterp/link-deps.mk (LIBOCTINTERP_LINK_DEPS): Include $(FONTCONFIG_LIBS) and $(FREETYPE_LIBS) in the list.
author John W. Eaton <jwe@octave.org>
date Sun, 28 Feb 2016 23:03:54 -0500
parents 1309edb344e1
children 7e8a410e6124
comparison
equal deleted inserted replaced
21373:21c3641422e0 21374:1487a68a496a
41 src/display-available.h \ 41 src/display-available.h \
42 src/shared-fcns.h 42 src/shared-fcns.h
43 43
44 OCTAVE_VERSION_LINKS += src/octave-cli-$(version)$(EXEEXT) 44 OCTAVE_VERSION_LINKS += src/octave-cli-$(version)$(EXEEXT)
45 45
46 if AMCOND_BUILD_GUI 46 if AMCOND_BUILD_QT_GUI
47 archlib_PROGRAMS += src/octave-gui 47 archlib_PROGRAMS += src/octave-gui
48 OCTAVE_VERSION_LINKS += src/octave-gui-$(version)$(EXEEXT) 48 OCTAVE_VERSION_LINKS += src/octave-gui-$(version)$(EXEEXT)
49 49
50 OCTAVE_INTERPRETER_TARGETS += src/octave-gui$(EXEEXT) 50 OCTAVE_INTERPRETER_TARGETS += src/octave-gui$(EXEEXT)
51 endif 51 endif
66 src_octave_LDFLAGS = \ 66 src_octave_LDFLAGS = \
67 $(NO_UNDEFINED_LDFLAG) \ 67 $(NO_UNDEFINED_LDFLAG) \
68 $(OCTAVE_LINK_OPTS) \ 68 $(OCTAVE_LINK_OPTS) \
69 $(WARN_LDFLAGS) 69 $(WARN_LDFLAGS)
70 70
71 if AMCOND_BUILD_GUI 71 if AMCOND_BUILD_QT_GUI
72 OCTAVE_CPPFLAGS = -DHAVE_OCTAVE_GUI 72 OCTAVE_CPPFLAGS = -DHAVE_OCTAVE_QT_GUI
73 endif 73 endif
74 74
75 src_octave_CPPFLAGS = \ 75 src_octave_CPPFLAGS = \
76 $(SRC_DIR_CPPFLAGS) \ 76 $(SRC_DIR_CPPFLAGS) \
77 $(OCTAVE_CPPFLAGS) 77 $(OCTAVE_CPPFLAGS)
97 97
98 src_octave_cli_CXXFLAGS = \ 98 src_octave_cli_CXXFLAGS = \
99 $(AM_CXXFLAGS) \ 99 $(AM_CXXFLAGS) \
100 $(WARN_CXXFLAGS) 100 $(WARN_CXXFLAGS)
101 101
102 if AMCOND_BUILD_GUI 102 if AMCOND_BUILD_QT_GUI
103 src_octave_gui_SOURCES = src/main-gui.cc 103 src_octave_gui_SOURCES = src/main-gui.cc
104 OCTAVE_GUI_LIBS = libgui/liboctgui.la 104 OCTAVE_GUI_LIBS = libgui/liboctgui.la
105 OCTAVE_GUI_CPPFLAGS = -I$(srcdir)/libgui/src 105 OCTAVE_GUI_CPPFLAGS = -I$(srcdir)/libgui/src
106 endif 106 endif
107 107