Mercurial > hg > octave-nkf
view src/main-cli.cc @ 15596:5f031158c693
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 | ad1a980b0cb5 |
children | 9ede91b3872b |
line wrap: on
line source
/* Copyright (C) 2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "defaults.h" #include "octave.h" int main (int argc, char **argv) { octave_process_command_line (argc, argv); install_defaults (); octave_initialize_interpreter (argc, argv, 0); return octave_execute_interpreter (); }