Mercurial > octave-nkf

comparison libinterp/oct-conf.in.h @ 15596:5f031158c693

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use pkg-config to discover Qt (pkg-config is already a requirement anyway). * build-aux/common.mk (do_subst_config_vals): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * configure.ac: Likewise and use pkg-config to discover the new variables. * libgui/Makefile.am (QT_INCDIR, QT_LIBDIR, QT_LIBS, QT_LDFLAGS): Delete variable definitions. * libgui/link-deps.mk (LIBOCTGUI_LINK_DEPS): Use automake @QT_LIBS@. (LIBOCTGUI_LIK_OPTS): Use automake @QT_LDFLAGS@. * libgui/qterminal-module.mk (qterminal_libqterminal_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. (MOC_CPPFLAGS): Define Q_OS_WIN32 instead of WIN32. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. * libinterp/interpfcn/toplev.cc (Foctave_config_info): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * libinterp/oct-conf.in.h: Replace OCTAVE_CONF_QT_INCDIR and OCTAVE_CONF_QT_LIBDIR with OCTAVE_CONF_QT_CPPFLAGS, OCTAVE_CONF_QT_LDFLAGS and OCTAVE_CONF_QT_LIBS. * m4/acinclude.m4 (OCTAVE_CHECK_FUNC_FINDFIRST_MODERN, OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT): Use QT_CPPFLAGS instead of QT_INCDIR.
author Michael Goffioul <michael.goffioul@gmail.com>
date Mon, 05 Nov 2012 01:47:49 +0000
parents cabe2fa4566c
children cf6788da4152
comparison
equal deleted inserted replaced
15595:6e780fb15c14 15596:5f031158c693
480 480
481 #ifndef OCTAVE_CONF_QRUPDATE_LIBS 481 #ifndef OCTAVE_CONF_QRUPDATE_LIBS
482 #define OCTAVE_CONF_QRUPDATE_LIBS %OCTAVE_CONF_QRUPDATE_LIBS% 482 #define OCTAVE_CONF_QRUPDATE_LIBS %OCTAVE_CONF_QRUPDATE_LIBS%
483 #endif 483 #endif
484 484
485 #ifndef OCTAVE_CONF_QT_INCDIR 485 #ifndef OCTAVE_CONF_QT_CPPFLAGS
486 #define OCTAVE_CONF_QT_INCDIR %OCTAVE_CONF_QT_INCDIR% 486 #define OCTAVE_CONF_QT_CPPFLAGS %OCTAVE_CONF_QT_CPPFLAGS%
487 #endif 487 #endif
488 488
489 #ifndef OCTAVE_CONF_QT_LIBDIR 489 #ifndef OCTAVE_CONF_QT_LDFLAGS
490 #define OCTAVE_CONF_QT_LIBDIR %OCTAVE_CONF_QT_LIBDIR% 490 #define OCTAVE_CONF_QT_LDFLAGS %OCTAVE_CONF_QT_LDFLAGS%
491 #endif
492
493 #ifndef OCTAVE_CONF_QT_LIBS
494 #define OCTAVE_CONF_QT_LIBS %OCTAVE_CONF_QT_LIBS%
491 #endif 495 #endif
492 496
493 #ifndef OCTAVE_CONF_RANLIB 497 #ifndef OCTAVE_CONF_RANLIB
494 #define OCTAVE_CONF_RANLIB %OCTAVE_CONF_RANLIB% 498 #define OCTAVE_CONF_RANLIB %OCTAVE_CONF_RANLIB%
495 #endif 499 #endif