Mercurial > hg > octave-lyh
annotate configure.ac @ 16019:5b2126a8c84f
install tests and functions to run them
* configure.ac (octtestsdir): New variable.
* build-aux/common.mk (octtestsdir): New variable.
(do_subst_default_vals): Substitute it.
(test-file-commands): New macro.
(%.cc-tst:%.cc, %.yy-tst:%.yy, %.ll-tst:%.ll): New rules.
* libinterp/Makefile.am (TST_FILES_SRC, TST_FILES, libinterptestsdir,
nobase_libinterptests_DATA): New variables.
* defaults.in.h (OCTAVE_OCTTESTSDIR): New macro.
* liboctave/Makefile.am (LIBOCTAVE_TST_SRC, TST_FILES_SRC, TST_FILES,
liboctavetestsdir, nobase_liboctavetests_DATA): New variables.
* toplev.cc (Foctave_config_info): Include octtestsdir in the struct.
* fntests.m: Look in topbuilddir for C++ test files.
* __run_test_suite__.m: New function, extracted from
test/fntests.m. Look for -tst files, not .cc files. Don't report
-tst files that are missing tests (there won't be any).
* __prog_output_assert__.m, __printf_assert__.m: New functions,
extracted from __run_test_suite__.m and renamed from
prog_output_assert and printf_assert. Change all uses.
* scripts/testfun/module.mk (testfun_FCN_FILES): Include new files in
the list.
* test/Makefile.am (GENERATED_BC_OVERLOADS_DIRS,
GENERATED_BC_OVERLOADS_FILES, fixedtestsdir, nobase_fixedtests_DATA):
New variables.
(CLEANFILES): Include $(GENERATED_BC_OVERRLOADS_FILES) in the list.
(clean-local): Use $(GENERATED_BC_OVERLOADS_DIRS).
* build_bc_overload_tests.sh: New options, --list-files, --list-dirs,
and --list-classes.
* test/classes/module.mk (classes_FCN_FILES): Include recently added
.m files in the list.
* test.m: Use "var" argument for exist in tests.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 08 Feb 2013 16:53:14 -0500 |
parents | ca37c6023a79 |
children | 23a7661e529a |
rev | line source |
---|---|
5 | 1 dnl Process this file with autoconf to produce a configure script. |
2 dnl | |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14103
diff
changeset
|
3 dnl Copyright (C) 1993-2012 John W. Eaton |
869 | 4 ### |
5 ### This file is part of Octave. | |
6 ### | |
7 ### Octave is free software; you can redistribute it and/or modify it | |
8 ### under the terms of the GNU General Public License as published by the | |
7016 | 9 ### Free Software Foundation; either version 3 of the License, or (at |
10 ### your option) any later version. | |
869 | 11 ### |
12 ### Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 ### FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 ### for more details. | |
16 ### | |
17 ### You should have received a copy of the GNU General Public License | |
7016 | 18 ### along with Octave; see the file COPYING. If not, see |
19 ### <http://www.gnu.org/licenses/>. | |
869 | 20 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
21 AC_PREREQ([2.62]) |
15883
fefd7c4a1309
maint: bump version number to 3.7.1+
John W. Eaton <jwe@octave.org>
parents:
15882
diff
changeset
|
22 AC_INIT([GNU Octave], [3.7.1+], [http://octave.org/bugs.html], [octave]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
23 |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
24 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
25 OCTAVE_VERSION="$PACKAGE_VERSION" |
14204 | 26 OCTAVE_API_VERSION_NUMBER="48" |
9917
c1210502785b
provide OCTAVE_API_VERSION_NUMBER
John W. Eaton <jwe@octave.org>
parents:
9915
diff
changeset
|
27 OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" |
15880 | 28 OCTAVE_RELEASE_DATE="2013-01-02" |
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14103
diff
changeset
|
29 OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
30 AC_SUBST(OCTAVE_VERSION) |
9917
c1210502785b
provide OCTAVE_API_VERSION_NUMBER
John W. Eaton <jwe@octave.org>
parents:
9915
diff
changeset
|
31 AC_SUBST(OCTAVE_API_VERSION_NUMBER) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
32 AC_SUBST(OCTAVE_API_VERSION) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
33 AC_SUBST(OCTAVE_RELEASE_DATE) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
34 AC_SUBST(OCTAVE_COPYRIGHT) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
35 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
36 dnl FIXME: We should auto-insert the Mercurial changeset ID into the |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
37 dnl AC_REVISION field whenever configure.ac is modified. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
38 dnl AC_REVISION($Revision: 1.603 $) |
15195 | 39 AC_CONFIG_SRCDIR([libinterp/octave.cc]) |
15059
6130d87495b8
configure.ac: replace deprecated AC_CONFIG_HEADER macro
Carnë Draug <carandraug+dev@gmail.com>
parents:
15054
diff
changeset
|
40 AC_CONFIG_HEADERS([config.h]) |
9946 | 41 AC_CONFIG_AUX_DIR([build-aux]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
42 AC_CONFIG_MACRO_DIR([m4]) |
869 | 43 |
9946 | 44 AM_INIT_AUTOMAKE([1.11 tar-ustar]) |
45 | |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
46 OCTAVE_CANONICAL_HOST |
5844 | 47 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
48 AC_DEFINE(OCTAVE_SOURCE, 1, [Define to 1 if this is Octave.]) |
3887 | 49 |
9091
45c832e9976d
configure.in: require autoconf 2.60; eliminate some obsolete macros
John W. Eaton <jwe@octave.org>
parents:
9090
diff
changeset
|
50 AC_USE_SYSTEM_EXTENSIONS |
1667 | 51 |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
52 ### Make configure args available for other uses. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
53 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
54 config_opts=$ac_configure_args |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
55 AC_SUBST(config_opts) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
56 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
57 ### Set default file locations |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
58 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
59 OCTAVE_SET_DEFAULT([octlibdir], '$(libdir)/octave/$(version)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
60 OCTAVE_SET_DEFAULT([archlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
61 '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
62 OCTAVE_SET_DEFAULT([localarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
63 '$(libexecdir)/octave/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
64 OCTAVE_SET_DEFAULT([localapiarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
65 '$(libexecdir)/octave/$(api_version)/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
66 OCTAVE_SET_DEFAULT([localverarchlibdir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
67 '$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
68 OCTAVE_SET_DEFAULT([octfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
69 '$(libdir)/octave/$(version)/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
70 OCTAVE_SET_DEFAULT([localoctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
71 '$(libdir)/octave/site/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
72 OCTAVE_SET_DEFAULT([localapioctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
73 '$(libdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
74 OCTAVE_SET_DEFAULT([localveroctfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
75 '$(libdir)/octave/$(version)/site/oct/$(canonical_host_type)') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
76 OCTAVE_SET_DEFAULT([octincludedir], '$(includedir)/octave-$(version)/octave') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
77 OCTAVE_SET_DEFAULT([fcnfiledir], '$(datadir)/octave/$(version)/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
78 OCTAVE_SET_DEFAULT([localfcnfiledir], '$(datadir)/octave/site/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
79 OCTAVE_SET_DEFAULT([localapifcnfiledir], |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
80 '$(datadir)/octave/site/$(api_version)/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
81 OCTAVE_SET_DEFAULT([localverfcnfiledir], '$(datadir)/octave/$(version)/site/m') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
82 OCTAVE_SET_DEFAULT([octetcdir], '$(datadir)/octave/$(version)/etc') |
15971
e27d9b9b71f4
gui: install translation files into $(datadir)/octave/$(version)/locale
Torsten <ttl@justmail.de>
parents:
15969
diff
changeset
|
83 OCTAVE_SET_DEFAULT([octlocaledir], '$(datadir)/octave/$(version)/locale') |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
84 OCTAVE_SET_DEFAULT([doc_cache_file], '$(octetcdir)/doc-cache') |
16019
5b2126a8c84f
install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents:
16012
diff
changeset
|
85 OCTAVE_SET_DEFAULT([octtestsdir], '$(octetcdir)/tests') |
15857
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
86 OCTAVE_SET_DEFAULT([texi_macros_file], '$(octetcdir)/macros.texi') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
87 OCTAVE_SET_DEFAULT([imagedir], '$(datadir)/octave/$(version)/imagelib') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
88 OCTAVE_SET_DEFAULT([man1dir], '$(mandir)/man1') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
89 OCTAVE_SET_DEFAULT([man1ext], '.1') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
90 OCTAVE_SET_DEFAULT([infofile], '$(infodir)/octave.info') |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
91 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
92 ### Check for programs used in building, installing, and running Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
93 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
94 ## Programs used in configuring Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
95 ## Find pkg-config executable (sets $PKG_CONFIG) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
96 PKG_PROG_PKG_CONFIG |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
97 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
98 ## Programs used in Makefiles. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
99 AC_PROG_AWK |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
100 OCTAVE_PROG_FIND |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
101 OCTAVE_PROG_SED |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
102 OCTAVE_PROG_PERL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
103 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
104 ## Programs used to build parts of Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
105 OCTAVE_PROG_GPERF |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
106 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
107 OCTAVE_PROG_FLEX |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
108 AC_SUBST([LEX_OUTPUT_ROOT], [lex.octave_]) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
109 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
110 OCTAVE_PROG_BISON |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
111 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
112 OCTAVE_PROG_MAKEINFO |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
113 OCTAVE_PROG_TEXI2DVI |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
114 OCTAVE_PROG_TEXI2PDF |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
115 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
116 ## Programs used when installing Octave. |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
117 AC_PROG_LN_S |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
118 AC_PROG_MKDIR_P |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
119 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
120 AC_PROG_INSTALL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
121 INSTALL_SCRIPT='${INSTALL}' |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
122 AC_SUBST(INSTALL_SCRIPT) |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
123 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
124 OCTAVE_PROG_DESKTOP_FILE_INSTALL |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
125 |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
126 ## Programs used when running Octave |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
127 OCTAVE_PROG_GHOSTSCRIPT |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
128 OCTAVE_PROG_GNUPLOT |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
129 OCTAVE_PROG_PAGER |
715d324b1b72
configure.ac: Move tests for programs necessary to build Octave close to top of file.
Rik <rik@octave.org>
parents:
15856
diff
changeset
|
130 OCTAVE_PROG_PYTHON |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
131 |
5451 | 132 ### Path separator. |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
133 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
134 sepchar=':' |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
135 AC_ARG_WITH([sepchar], |
5842 | 136 [AS_HELP_STRING([--with-sepchar=<char>], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
137 [use <char> as the path separation character])]) |
5451 | 138 case $with_sepchar in |
139 yes | "") | |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
140 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
141 mingw* | msdosmsvc) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
142 sepchar=';' ;; |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
143 esac |
5451 | 144 ;; |
145 no) | |
146 AC_MSG_ERROR([You are required to define a path separation character]) | |
147 ;; | |
148 *) | |
149 sepchar=$with_sepchar | |
150 ;; | |
151 esac | |
152 AC_SUBST(sepchar) | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
153 AC_DEFINE_UNQUOTED(SEPCHAR, ['$sepchar'], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
154 [Define this to be the path separator for your system, as a character constant.]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
155 AC_DEFINE_UNQUOTED(SEPCHAR_STR, ["$sepchar"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
156 [Define this to be the path separator for your system, as a string.]) |
5451 | 157 |
15756
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
158 ### Define the path to the shell on the host system. Most systems will |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
159 ### ensure /bin/sh is the default shell so this can be safely ignored by |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
160 ### almost everyone. However, when building for Android, for example, |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
161 ### this will need to be set. |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
162 SHELL_PATH=/bin/sh |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
163 AC_ARG_WITH([shell], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
164 [AS_HELP_STRING([--with-shell=SHELL], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
165 [use SHELL as the shell interpreter (default: /bin/sh)])]) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
166 case $with_shell in |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
167 no) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
168 AC_MSG_ERROR([A shell interpreter is required]) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
169 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
170 yes | "") |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
171 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
172 *) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
173 SHELL_PATH=$with_shell |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
174 ;; |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
175 esac |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
176 AC_DEFINE_UNQUOTED([SHELL_PATH], ["$SHELL_PATH"], |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
177 [Define this to be the path to the shell command interpreter.]) |
ea1a1fb00744
Make the path to the shell interpreter configuable
Mike Miller <mtmiller@ieee.org>
parents:
15739
diff
changeset
|
178 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
179 ### Enable bounds checking on element references within Octave's array and |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
180 ### matrix classes. This slows down some operations a bit, so it is turned off |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
181 ### by default. |
2108 | 182 |
2450 | 183 BOUNDS_CHECKING=false |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
184 AC_ARG_ENABLE([bounds-check], |
5844 | 185 [AS_HELP_STRING([--enable-bounds-check], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
186 [enable bounds checking for indexing in internal array classes])], |
3060 | 187 [if test "$enableval" = yes; then BOUNDS_CHECKING=true; fi], []) |
2108 | 188 if $BOUNDS_CHECKING; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
189 AC_DEFINE(BOUNDS_CHECKING, 1, [Define to 1 to use internal bounds checking.]) |
2108 | 190 fi |
191 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
192 ### Use Octave's built-in memory allocator rather than straightforward malloc. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
193 ### Disabled by default. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
194 |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
195 USE_OCTAVE_ALLOCATOR=false |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
196 AC_ARG_ENABLE([octave-allocator], |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
197 [AS_HELP_STRING([--enable-octave-allocator], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
198 [use the obsolete octave_allocator class for many of Octave's objects (mostly octave_value types). You probably do NOT want to enable this feature.])], |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
199 [if test "$enableval" = yes; then USE_OCTAVE_ALLOCATOR=true; fi], []) |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
200 if $USE_OCTAVE_ALLOCATOR; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
201 AC_DEFINE(USE_OCTAVE_ALLOCATOR, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
202 [Define to 1 to use octave_allocator class.]) |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
203 fi |
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
204 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
205 ### Use atomic operations for internal reference counting. This is required |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
206 ### for thread-safe behavior but incurs a significant slowdown, and is thus |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
207 ### disabled by default. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
208 |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
209 USE_ATOMIC_REFCOUNT=false |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
210 AC_ARG_ENABLE([atomic-refcount], |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
211 [AS_HELP_STRING([--enable-atomic-refcount], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
212 [use atomic operations for internal reference counting. This is required for thread-safe behavior but does not by itself make Octave internals thread safe.])], |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
213 [if test "$enableval" = yes; then USE_ATOMIC_REFCOUNT=true; fi], []) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
214 if $USE_ATOMIC_REFCOUNT; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
215 AC_DEFINE(USE_ATOMIC_REFCOUNT, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
216 [Define to 1 to use atomic operations for reference counting.]) |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
217 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
218 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
219 ### Disable running Make in the doc directory. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
220 ### This is useful, for example, when building Octave on systems without TeX. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
221 |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
222 DOCDIR=doc |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
223 AC_ARG_ENABLE([docs], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
224 [AS_HELP_STRING([--disable-docs], [don't build documentation files])], |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
225 [if test "$enableval" = no; then |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
226 DOCDIR= |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
227 warn_docs="building documentation disabled; make dist will fail" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
228 OCTAVE_CONFIGURE_WARNING([warn_docs]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
229 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
230 []) |
10092
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
231 AC_SUBST(DOCDIR) |
02453ee20140
allow building of docs to be disabled
John W. Eaton <jwe@octave.org>
parents:
10077
diff
changeset
|
232 |
5275 | 233 ### If possible, use a 64-bit integer type for array dimensions and indexing. |
234 | |
235 USE_64_BIT_IDX_T=false | |
236 OCTAVE_IDX_TYPE=int | |
237 AC_ARG_ENABLE(64, | |
5844 | 238 [AS_HELP_STRING([--enable-64], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
239 [(EXPERIMENTAL) use 64-bit integers for array dimensions and indexing])], |
5275 | 240 [if test "$enableval" = yes; then USE_64_BIT_IDX_T=true; fi], []) |
241 if $USE_64_BIT_IDX_T; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
242 AC_CHECK_SIZEOF([void *]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
243 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
244 AC_CHECK_SIZEOF([long]) |
5275 | 245 if test $ac_cv_sizeof_void_p -eq 8; then |
246 if test $ac_cv_sizeof_int -eq 8; then | |
247 OCTAVE_IDX_TYPE=int | |
248 elif test $ac_cv_sizeof_long -eq 8; then | |
249 OCTAVE_IDX_TYPE=long | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
250 AC_DEFINE(IDX_TYPE_LONG, 1, [Define to 1 if octave index type is long.]) |
5275 | 251 else |
5857 | 252 warn_64_bit="no suitable type found for octave_idx_type so disabling 64-bit features" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
253 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
5275 | 254 USE_64_BIT_IDX_T=false |
255 fi | |
256 else | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
257 warn_64_bit="pointers are not 64-bits wide; disabling 64-bit features" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
258 OCTAVE_CONFIGURE_WARNING([warn_64_bit]) |
5275 | 259 USE_64_BIT_IDX_T=false |
260 fi | |
261 fi | |
262 AC_SUBST(OCTAVE_IDX_TYPE) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
263 AC_DEFINE_UNQUOTED(OCTAVE_IDX_TYPE, [$OCTAVE_IDX_TYPE], |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
264 [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) |
5275 | 265 if $USE_64_BIT_IDX_T; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
266 AC_DEFINE(USE_64_BIT_IDX_T, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
267 [Define to 1 if using 64-bit integers for array dimensions and indexing.]) |
5275 | 268 fi |
269 AC_SUBST(USE_64_BIT_IDX_T) | |
270 | |
3215 | 271 ### It seems that there are some broken inline assembly functions in |
272 ### the GNU libc. Since I'm not sure how to test whether we are using | |
273 ### GNU libc, just disable them for all platforms. | |
274 | |
5844 | 275 AC_MSG_NOTICE([defining __NO_MATH_INLINES avoids buggy GNU libc exp function]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
276 AC_DEFINE(__NO_MATH_INLINES, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
277 [Define to 1 if your version of GNU libc has buggy inline assembly code for math functions like exp.]) |
3215 | 278 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
279 ### Determine which C++ compiler to use (we expect to find g++). |
869 | 280 |
405 | 281 AC_PROG_CXX |
282 AC_PROG_CXXCPP | |
869 | 283 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
284 ### Check version number when using g++. |
869 | 285 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
286 GXX_VERSION= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
287 if test "$GXX" = yes; then |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
288 gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
289 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
3107 | 290 |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
291 AX_COMPARE_VERSION([$gxx_version], [lt], [3.5], |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
292 [AC_MSG_ERROR([g++ version $gxx_version will probably fail to compile Octave])]) |
869 | 293 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
294 GXX_VERSION=$gxx_version |
1894 | 295 fi |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
296 AC_SUBST(GXX_VERSION) |
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
297 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
298 ## FIXME: CXX_VERSION is deprecated and should be removed in Octave version 3.12 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
299 CXX_VERSION=$gxx_version |
1894 | 300 AC_SUBST(CXX_VERSION) |
301 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
302 ### Determine which C compiler to use (we expect to find gcc). |
869 | 303 |
5 | 304 AC_PROG_CC |
405 | 305 AC_PROG_CPP |
832 | 306 AC_PROG_GCC_TRADITIONAL |
869 | 307 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
308 ## Check for MSVC |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
309 have_msvc=no |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
310 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
311 msdosmsvc) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
312 have_msvc=yes |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
313 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
314 mingw*) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
315 AC_MSG_CHECKING([for MSVC compiler]) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
316 AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
317 #ifndef _MSC_VER |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
318 #error "Not MSVC compiler" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
319 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
320 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
321 have_msvc=yes, have_msvc=no) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
322 AC_MSG_RESULT([$have_msvc]) |
405 | 323 ;; |
5 | 324 esac |
869 | 325 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
326 ### gnulib initialization: part 1 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
327 ### Must take place immediately after a compiler is determined |
9946 | 328 |
329 gl_EARLY | |
330 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
331 ### Check version number when using gcc. |
869 | 332 |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
333 GCC_VERSION= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
334 if test "$GCC" = yes; then |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
335 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \ |
15168
66dcad99b55e
configure.ac: Correct GCC_VERSION test to return only version number and no other text.
Rik <rik@octave.org>
parents:
15167
diff
changeset
|
336 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` |
66dcad99b55e
configure.ac: Correct GCC_VERSION test to return only version number and no other text.
Rik <rik@octave.org>
parents:
15167
diff
changeset
|
337 |
15170
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
338 AX_COMPARE_VERSION([$gcc_version], [lt], [3], |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
339 [warn_gcc_version="gcc version $gcc_version is likely to cause problems" |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
340 OCTAVE_CONFIGURE_WARNING([warn_gcc_version])]) |
a44ff4f0a20b
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler.
Rik <rik@octave.org>
parents:
15168
diff
changeset
|
341 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
342 GCC_VERSION=$gcc_version |
1894 | 343 fi |
344 AC_SUBST(CC_VERSION) | |
345 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
346 ## FIXME: CC_VERSION is deprecated and should be removed in Octave version 3.12 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
347 CC_VERSION=$gcc_version |
15167
1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Rik <rik@octave.org>
parents:
15166
diff
changeset
|
348 AC_SUBST(GCC_VERSION) |
3775 | 349 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
350 ### Determine the compiler flag necessary to create dependencies |
3775 | 351 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
352 ## Assume GCC. |
6087 | 353 INCLUDE_DEPS=true |
3775 | 354 DEPEND_FLAGS="-M" |
355 DEPEND_EXTRA_SED_PATTERN="" | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
356 if test "$GCC" != yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
357 case $canonical_host_type in |
6087 | 358 sparc-sun-solaris2* | i386-pc-solaris2*) |
3775 | 359 DEPEND_FLAGS="-xM1" |
360 DEPEND_EXTRA_SED_PATTERN="-e '/\/opt\/SUNWspro/d'" | |
6087 | 361 ;; |
7451 | 362 *-*-msdosmsvc) |
363 ;; | |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
364 *-*-mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
365 if test $have_msvc = no; then |
12451 | 366 INCLUDE_DEPS=false |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
367 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
368 ;; |
6087 | 369 *) |
370 INCLUDE_DEPS=false | |
371 ;; | |
372 esac | |
373 fi | |
374 AC_SUBST(INCLUDE_DEPS) | |
3775 | 375 AC_SUBST(DEPEND_FLAGS) |
376 AC_SUBST(DEPEND_EXTRA_SED_PATTERN) | |
377 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
378 ### Check for pthread library |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
379 |
10951 | 380 AX_PTHREAD |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
381 ## Include pthread libs and flags early in case other tests need them. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
382 ## They seem to be required for the OpenGL tests on Debian systems. |
9970
cc7ea6083774
configure.ac: use pthread flags and libs for tests
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
383 LIBS="$PTHREAD_LIBS $LIBS" |
cc7ea6083774
configure.ac: use pthread flags and libs for tests
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
384 CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
15123
4e0ab3b28418
Eliminate duplicate PTHREAD_CFLAGS inclusion in build process.
Rik <rik@octave.org>
parents:
15071
diff
changeset
|
385 CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" |
8595
dee5d60257e4
Use Carbon framework to determine ScreenSize on Mac.
Thomas Treichl <Thomas.Treichl@gmx.net>
parents:
8577
diff
changeset
|
386 |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
387 ### When compiling math for x87, problems may arise in some code comparing |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
388 ### floating-point intermediate results. |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
389 ### Generally, it helps to store the result in a local volatile variable, |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
390 ### but it also degrades performance. |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
391 ### Thus, we provide a FLOAT_TRUNCATE macro that may be defined to "volatile" |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
392 ### when compiling for x87 target, or left empty for modern SSE math, that |
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
393 ### doesn't suffer from this problem at all. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
394 AC_ARG_ENABLE([float-truncate], |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
395 [AS_HELP_STRING([--enable-float-truncate], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
396 [enables truncating intermediate FP results.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
397 [if test "$enableval" = yes; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
398 ac_float_truncate=volatile |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
399 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
400 ac_float_truncate= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
401 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
402 [ac_float_truncate=]) |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
403 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
404 AC_DEFINE_UNQUOTED(FLOAT_TRUNCATE, [$ac_float_truncate], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
405 [Define to volatile if you need to truncate intermediate FP results.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
406 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
407 ### Determine extra CFLAGS that may be necessary for Octave. |
9603
8bea4e89326f
implement FLOAT_STORE to allow safer complex comparisons on x87
Jaroslav Hajek <highegg@gmail.com>
parents:
9596
diff
changeset
|
408 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
409 ## On Intel systems with gcc, we may need to compile with -mieee-fp |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
410 ## to get full support for IEEE floating point. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
411 ## |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
412 ## On Alpha/OSF systems, we need -mieee. |
869 | 413 |
3126 | 414 ieee_fp_flag= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
415 case $canonical_host_type in |
3887 | 416 i[[3456789]]86-*-*) |
5076 | 417 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
418 OCTAVE_CC_FLAG([-mieee-fp], [ |
5076 | 419 ieee_fp_flag=-mieee-fp |
420 XTRA_CFLAGS="$XTRA_CFLAGS -mieee-fp" | |
5844 | 421 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CFLAGS])]) |
5076 | 422 fi |
423 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
424 OCTAVE_CXX_FLAG([-mieee-fp], [ |
12451 | 425 ieee_fp_flag=-mieee-fp |
426 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee-fp" | |
427 AC_MSG_NOTICE([adding -mieee-fp to XTRA_CXXFLAGS])]) | |
5076 | 428 fi |
324 | 429 ;; |
3127 | 430 alpha*-*-*) |
4284 | 431 if test "$GCC" = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
432 OCTAVE_CC_FLAG([-mieee], [ |
12451 | 433 ieee_fp_flag=-mieee |
434 XTRA_CFLAGS="$XTRA_CFLAGS -mieee" | |
435 AC_MSG_NOTICE([adding -mieee to XTRA_CFLAGS])]) | |
5076 | 436 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
437 OCTAVE_CC_FLAG([-ieee], [ |
12451 | 438 ieee_fp_flag=-ieee |
439 XTRA_CFLAGS="$XTRA_CFLAGS -ieee" | |
440 AC_MSG_NOTICE([adding -ieee to XTRA_CFLAGS])]) | |
5076 | 441 fi |
442 if test "$GXX" = yes; then | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
443 OCTAVE_CXX_FLAG([-mieee], [ |
12451 | 444 ieee_fp_flag=-mieee |
445 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mieee" | |
446 AC_MSG_NOTICE([adding -mieee to XTRA_CXXFLAGS])]) | |
4284 | 447 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
448 OCTAVE_CXX_FLAG([-ieee], [ |
12451 | 449 ieee_fp_flag=-ieee |
450 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -ieee" | |
451 AC_MSG_NOTICE([adding -ieee to XTRA_CXXFLAGS])]) | |
4284 | 452 fi |
2020 | 453 ;; |
3176 | 454 *ibm-aix4*) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
455 OCTAVE_CC_FLAG([-mminimal-toc], [ |
3351 | 456 XTRA_CFLAGS="$XTRA_CFLAGS -mminimal-toc"]) |
3176 | 457 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
458 OCTAVE_CXX_FLAG([-mminimal-toc], [ |
3351 | 459 XTRA_CXXFLAGS="$XTRA_CXXFLAGS -mminimal-toc"]) |
3176 | 460 ;; |
324 | 461 esac |
3126 | 462 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
463 AC_SUBST(XTRA_CFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
464 AC_SUBST(XTRA_CXXFLAGS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
465 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
466 ### Test whether the compiler supports OpenMP. This is experimental so disable |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
467 ### it by default. Enable it with the flag --enable-openmp. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
468 |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
469 USE_OPENMP=false |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
470 AC_ARG_ENABLE([openmp], |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
471 [AS_HELP_STRING([--enable-openmp], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
472 [(EXPERIMENTAL) use OpenMP SMP multi-threading])], |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
473 [if test "$enableval" = yes; then USE_OPENMP=true; fi], []) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
474 if $USE_OPENMP; then |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
475 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
476 mingw* | cygwin* | *-gnu*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
477 OCTAVE_CHECK_OPENMP(-fopenmp) |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
478 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
479 msdosmsvc) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
480 ## FIXME: is this the right flag for MSVC? |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
481 OCTAVE_CHECK_OPENMP(-openmp) |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
482 ;; |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
483 ## Add other compilers supporting OpenMP here |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
484 esac |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
485 fi |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
486 |
4094 | 487 ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are |
488 ### the compilers that we use for building tools on the build system. | |
4098 | 489 ### For now, we assume that the only cross compiling we can do is |
4298 | 490 ### with gcc on a Unixy system, but the dedicated hacker can override these. |
4094 | 491 |
492 if test "$cross_compiling" = yes; then | |
493 BUILD_CC="gcc" | |
494 BUILD_CFLAGS="-O2 -g" | |
495 BUILD_CXX="g++" | |
496 BUILD_CXXFLAGS="-O2 -g" | |
4298 | 497 BUILD_LDFLAGS="" |
4098 | 498 BUILD_EXEEXT="" |
4094 | 499 else |
4298 | 500 BUILD_CC='$(CC)' |
501 BUILD_CFLAGS='$(CFLAGS)' | |
502 BUILD_CXX='$(CXX)' | |
503 BUILD_CXXFLAGS='$(CXXFLAGS)' | |
504 BUILD_LDFLAGS='$(LDFLAGS)' | |
505 BUILD_EXEEXT='$(EXEEXT)' | |
4094 | 506 fi |
507 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
508 AC_ARG_VAR([BUILD_CC], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
509 [build system C compiler (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
510 AC_ARG_VAR([BUILD_CFLAGS], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
511 [build system C compiler flags (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
512 AC_ARG_VAR([BUILD_CXX], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
513 [build system C++ compiler (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
514 AC_ARG_VAR([BUILD_CXXFLAGS], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
515 [build system C++ compiler flags (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
516 AC_ARG_VAR([BUILD_LDFLAGS], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
517 [build system C++ compiler link flags (used if cross compiling)]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
518 AC_ARG_VAR([BUILD_EXEEXT], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
519 [build system executable extension (used if cross compiling)]) |
3222 | 520 |
3232 | 521 |
522 ### Look for math library. If found, this will add -lm to LIBS. | |
523 | |
15875
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
524 dnl Keep this check before the check for the Fortran compiler, |
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
525 dnl in case -lm is needed to compile Fortran programs. |
c18692212b90
configure.ac: Simplify test for math library.
Rik <rik@octave.org>
parents:
15874
diff
changeset
|
526 AC_CHECK_LIB(m, sin) |
3232 | 527 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
528 ### Determine the Fortran compiler and how to invoke it |
3232 | 529 |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
530 ## Default FFLAGS is -O. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
531 if test x"$FFLAGS" = x""; then |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
532 FFLAGS="-O" |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
533 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
534 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
535 ## the F77 variable, if set, overrides AC_PROG_F77 automatically |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
536 AC_PROG_F77 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
537 AC_F77_LIBRARY_LDFLAGS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
538 AC_F77_DUMMY_MAIN |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
539 AC_F77_WRAPPERS |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
540 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
541 F77_TOLOWER=true |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
542 F77_APPEND_UNDERSCORE=true |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
543 F77_APPEND_EXTRA_UNDERSCORE=true |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
544 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
545 case $ac_cv_f77_mangling in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
546 "upper case") F77_TOLOWER=false ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
547 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
548 case $ac_cv_f77_mangling in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
549 "no underscore") F77_APPEND_UNDERSCORE=false ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
550 esac |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
551 case $ac_cv_f77_mangling in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
552 "no extra underscore") F77_APPEND_EXTRA_UNDERSCORE=false ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
553 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
554 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
555 case $canonical_host_type in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
556 i[[3456789]]86-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
557 if test $ac_cv_f77_compiler_gnu = yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
558 OCTAVE_F77_FLAG([-mieee-fp]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
559 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
560 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
561 alpha*-*-*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
562 if test $ac_cv_f77_compiler_gnu = yes; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
563 OCTAVE_F77_FLAG([-mieee]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
564 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
565 OCTAVE_F77_FLAG([-ieee]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
566 OCTAVE_F77_FLAG([-fpe1]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
567 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
568 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
569 powerpc-apple-machten*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
570 FFLAGS= |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
571 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
572 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
573 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
574 if test -n "$FFLAGS"; then |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
575 AC_MSG_NOTICE([defining FFLAGS to be $FFLAGS]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
576 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
577 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
578 AC_SUBST(F77_TOLOWER) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
579 AC_SUBST(F77_APPEND_UNDERSCORE) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
580 AC_SUBST(F77_APPEND_EXTRA_UNDERSCORE) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
581 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
582 if test -z "$F77"; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
583 AC_MSG_ERROR([in order to build Octave, you must have a compatible Fortran compiler or wrapper script for f2c that functions as a Fortran compiler installed and in your path. See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
584 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
585 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
586 OCTAVE_CHECK_FUNC_FORTRAN_ISNAN |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
587 F77_ISNAN_MACRO= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
588 if test $octave_cv_func_fortran_isnan = no; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
589 AC_MSG_NOTICE([substituting ISNAN(X) with X.NE.X in Fortran sources]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
590 F77_ISNAN_MACRO="s|ISNAN(\(@<:@^)@:>@*\))|(\1.NE.\1)|" |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
591 fi |
14550
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
592 AC_SUBST(F77_ISNAN_MACRO) |
bc4c574ab3b6
Add configure check for isnan in fortran.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14398
diff
changeset
|
593 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
594 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
595 if test $octave_cv_sizeof_fortran_integer = no; then |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
596 if $USE_64_BIT_IDX_T; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
597 case $F77 in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
598 *gfortran*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
599 case $F77_INTEGER_8_FLAG in |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
600 *-fdefault-integer-8*) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
601 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
602 *) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
603 case $FFLAGS in |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
604 *-fdefault-integer-8*) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
605 AC_MSG_NOTICE([setting -fdefault-integer-8 in F77_INTEGER_8_FLAG instead of FFLAGS]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
606 FFLAGS=`echo $FFLAGS | sed 's/-fdefault-integer-8//g'` |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
607 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
608 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
609 *) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
610 AC_MSG_NOTICE([adding -fdefault-integer-8 to F77_INTEGER_8_FLAG]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
611 F77_INTEGER_8_FLAG="-fdefault-integer-8" |
12451 | 612 ## Invalidate the cache and try again. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
613 $as_unset octave_cv_sizeof_fortran_integer |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
614 ;; |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
615 esac |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
616 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
617 esac |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
618 ;; |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
619 esac |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
620 if test -z "$octave_cv_sizeof_fortran_integer"; then |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
621 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
622 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
623 if test $octave_cv_sizeof_fortran_integer = no; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
624 AC_MSG_ERROR([in order to build Octave with 64-bit indexing support your Fortran compiler must have an option for setting the default integer size to 8 bytes. See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
625 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
626 else |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
627 AC_MSG_ERROR([your Fortran compiler must have an option to make integers the same size as octave_idx_type ($OCTAVE_IDX_TYPE). See the file INSTALL for more information.]) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
628 fi |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
629 fi |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
630 AC_SUBST(F77_INTEGER_8_FLAG) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
631 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
632 ## FIXME: Is this really used? Makefile seems to use $F77 for compiler |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
633 FC=$F77 |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
634 AC_SUBST(FC) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
635 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
636 OCTAVE_F77_FLAG([-ffloat-store], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
637 AC_MSG_RESULT([setting F77_FLOAT_STORE_FLAG to -ffloat-store]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
638 F77_FLOAT_STORE_FLAG=-ffloat-store |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
639 AC_SUBST(F77_FLOAT_STORE_FLAG) |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
640 ]) |
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
641 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
642 ### Check for the Qhull library |
9596
f26229391ea1
configure.in, aclocal.m4: check fortran integer size
John W. Eaton <jwe@octave.org>
parents:
9583
diff
changeset
|
643 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
644 OCTAVE_CHECK_LIB(qhull, QHull, |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
645 [Qhull library not found -- this will result in loss of functionality of some geometry functions.], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
646 [libqhull/libqhull.h qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
647 [qh_qhull], [], [], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
648 [warn_qhull= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
649 OCTAVE_CHECK_QHULL_VERSION |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
650 OCTAVE_CHECK_LIB_QHULL_OK( |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
651 [TEXINFO_QHULL="@set HAVE_QHULL" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
652 AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
653 [warn_qhull="Qhull library found, but does not seem to work properly -- this will result in loss of functionality of some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])]) |
6855 | 654 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
655 ### Check for PCRE regex library. |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
656 |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
657 REGEX_LIBS= |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
658 |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
659 pcre_fail_msg="to build Octave, you must have the PCRE library and header files installed" |
7173 | 660 |
14025
9867be070ee1
use pcre/pcre.h if it is present
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
661 AC_CHECK_HEADERS([pcre.h pcre/pcre.h]) |
9867be070ee1
use pcre/pcre.h if it is present
John W. Eaton <jwe@octave.org>
parents:
13985
diff
changeset
|
662 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
663 AC_CACHE_CHECK([whether pcre.h defines the macros we need], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
664 [ac_cv_pcre_h_macros_present], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
665 [AC_EGREP_CPP([PCRE_HAS_MACROS_WE_NEED], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
666 #if defined (HAVE_PCRE_H) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
667 # include <pcre.h> |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
668 #elif defined (HAVE_PCRE_PCRE_H) |
15523
bf466a60651f
maint: periodic merge of stable to default
Jordi Gutiérrez Hermoso <jordigh@octave.org>
diff
changeset
|
669 # include <pcre/pcre.h> |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
670 #error "NO PCRE HEADER" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
671 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
672 #if defined (PCRE_INFO_NAMECOUNT) \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
673 && defined (PCRE_INFO_NAMEENTRYSIZE) \ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
674 && defined (PCRE_INFO_NAMETABLE) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
675 PCRE_HAS_MACROS_WE_NEED |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
676 #endif], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
677 ac_cv_pcre_h_macros_present=yes, ac_cv_pcre_h_macros_present=no)]) |
7169 | 678 |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
679 if test $ac_cv_pcre_h_macros_present = yes; then |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
680 ## check for pcre-config, and if so, set XTRA_CXXFLAGS appropriately |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
681 AC_CHECK_PROG(HAVE_PCRE_CONFIG, pcre-config, [yes], [no]) |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
682 if test $HAVE_PCRE_CONFIG = yes; then |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
683 XTRA_CXXFLAGS="$XTRA_CXXFLAGS `pcre-config --cflags`" |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
684 REGEX_LIBS=`pcre-config --libs` |
7173 | 685 else |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
686 REGEX_LIBS="-lpcre" |
7173 | 687 fi |
8621
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
688 save_LIBS="$LIBS" |
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
689 LIBS="$REGEX_LIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
690 AC_CHECK_FUNCS([pcre_compile], |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
691 [AC_SUBST(REGEX_LIBS)], |
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
692 [AC_MSG_ERROR([$pcre_fail_msg])]) |
8621
f1534e248260
configure.in: check for pcre_compile, don't check for other regex functions if pcre library is found
John W. Eaton <jwe@octave.org>
parents:
8618
diff
changeset
|
693 LIBS="$save_LIBS" |
7174 | 694 else |
12464
dfeea9cae79e
require PCRE to build Octave
John W. Eaton <jwe@octave.org>
parents:
12451
diff
changeset
|
695 AC_MSG_ERROR([$pcre_fail_msg]) |
6133 | 696 fi |
7169 | 697 |
5270 | 698 ### Check for ZLIB library. |
3820 | 699 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
700 OCTAVE_CHECK_LIB(z, ZLIB, |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
701 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.], |
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
702 [zlib.h], [gzclearerr]) |
3687 | 703 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
704 ### Check for the LLVM library |
15001
894cf2c07f92
Properly restore compiler and linker flags after llvm tests
Carlo de Falco <cdf@users.sourceforge.net>
parents:
14994
diff
changeset
|
705 |
15308
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
706 build_jit=false |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
707 AC_ARG_ENABLE([jit], |
15308
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
708 [AS_HELP_STRING([--enable-jit], |
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
709 [(EXPERIMENTAL) enable JIT compiler])], |
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
710 [if test "$enableval" = yes; then |
a4d7909c4edb
configure.ac: Disable JIT compilation by default. Added --enable-jit to compile JIT.
Rik <rik@octave.org>
parents:
15306
diff
changeset
|
711 build_jit=true |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
712 fi], |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
713 []) |
14932
1f914446157d
Locate and link with LLVM properly
Max Brister <max@2bass.com>
parents:
14931
diff
changeset
|
714 |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
715 LLVM_CXXFLAGS= |
14899 | 716 LLVM_CPPFLAGS= |
717 LLVM_LDFLAGS= | |
718 LLVM_LIBS= | |
719 | |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
720 if test $build_jit = true; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
721 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
722 ## Find llvm-config program from environment variable or by searching |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
723 AC_ARG_VAR([LLVM_CONFIG], [path to llvm-config utility]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
724 AC_CHECK_PROG([LLVM_CONFIG], llvm-config, llvm-config, []) |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
725 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
726 if test -z "$LLVM_CONFIG"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
727 warn_llvm="llvm-config utility not found. JIT compiler is disabled." |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
728 else |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
729 dnl Preset warning message in case compile fails |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
730 warn_llvm="LLVM was not found or is to old. JIT compiler is disabled." |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
731 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
732 save_CPPFLAGS="$CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
733 save_CXXFLAGS="$CXXFLAGS" |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
734 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
735 ## Use -isystem if available because we don't want to see warnings in LLVM |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
736 LLVM_INCLUDE_FLAG=-I |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
737 OCTAVE_CC_FLAG([-isystem .], [ |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
738 LLVM_INCLUDE_FLAG=-isystem |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
739 AC_MSG_NOTICE([using -isystem for LLVM headers])]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
740 |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
741 dnl Use -isystem so we don't get warnings from llvm headers |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
742 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
743 LLVM_CXXFLAGS= |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
744 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
745 LLVM_LIBS=`$LLVM_CONFIG --libs` |
14994
bbc825cb2ea0
Use -I instead of -isystem if -isystem is not avaiable
Max Brister <max@2bass.com>
parents:
14993
diff
changeset
|
746 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
747 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
748 dnl Define some extra flags that LLVM requires in order to include headers. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
749 dnl Ideally we should get these from llvm-config, but llvm-config isn't |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
750 dnl very helpful. |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
751 dnl |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
752 CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
753 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
754 AC_LANG_PUSH(C++) |
15369
715220d2b511
configure.ac: Simplify test for LLVM dependencies.
Rik <rik@octave.org>
parents:
15362
diff
changeset
|
755 AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [ |
715220d2b511
configure.ac: Simplify test for LLVM dependencies.
Rik <rik@octave.org>
parents:
15362
diff
changeset
|
756 warn_llvm= |
715220d2b511
configure.ac: Simplify test for LLVM dependencies.
Rik <rik@octave.org>
parents:
15362
diff
changeset
|
757 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"]) |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
758 AC_LANG_POP(C++) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
759 CPPFLAGS="$save_CPPFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
760 CXXFLAGS="$save_CXXFLAGS" |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
761 fi |
14993
06f2e9bdade6
configure.ac: Skip compiling JIT if LLVM_CONFIG is not specified
Max Brister <max@2bass.com>
parents:
14990
diff
changeset
|
762 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
763 if test -z "$warn_llvm"; then |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
764 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
765 else |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
766 build_jit=false |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
767 LLVM_CPPFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
768 LLVM_CXXFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
769 LLVM_LDFLAGS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
770 LLVM_LIBS= |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
771 OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
772 fi |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
773 dnl FIXME: Re-instate when JIT is enabled by default |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
774 dnl else |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
775 dnl ## JIT build disabled |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
776 dnl warn_llvm="JIT compiler disabled, some performance loss for loops" |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
777 dnl OCTAVE_CONFIGURE_WARNING([warn_llvm]) |
14899 | 778 fi |
779 | |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
780 AC_SUBST(LLVM_CPPFLAGS) |
14990
149d1e2224f0
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
Max Brister <max@2bass.com>
parents:
14956
diff
changeset
|
781 AC_SUBST(LLVM_CXXFLAGS) |
14899 | 782 AC_SUBST(LLVM_LDFLAGS) |
783 AC_SUBST(LLVM_LIBS) | |
784 | |
9538
d0239bddf621
use OCTAVE_CHECK_LIB to check for zlib
John W. Eaton <jwe@octave.org>
parents:
9536
diff
changeset
|
785 ### Check for HDF5 library. |
5270 | 786 |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
787 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
788 save_LIBS="$LIBS" |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
789 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
790 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
791 OCTAVE_CHECK_LIB(hdf5, HDF5, |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
792 [HDF5 library not found. Octave will not be able to save or load HDF5 data files.], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
793 [hdf5.h], [H5Gget_num_objs], [], [], |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
794 [warn_hdf5= |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
795 OCTAVE_CHECK_HDF5_HAS_VER_16_API |
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9882
diff
changeset
|
796 TEXINFO_HDF5="@set HAVE_HDF5" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
797 AC_DEFINE(HAVE_HDF5, 1, |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
798 [Define to 1 if HDF5 is available and newer than version 1.6.]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
799 if test $have_msvc = yes; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
800 OCTAVE_CHECK_LIB_HDF5_DLL |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
801 fi |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
802 ]) |
9542
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
803 CPPFLAGS="$save_CPPFLAGS" |
f5ec5dc66824
use OCTAVE_CHECK_LIBRARY to check for HDF5
John W. Eaton <jwe@octave.org>
parents:
9540
diff
changeset
|
804 LIBS="$save_LIBS" |
5270 | 805 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
806 ### Check for FFTW library. Default to Fortran FFTPACK if it is not available. |
5203 | 807 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
808 ## Check for FFTW header and library. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
809 OCTAVE_CHECK_LIB(fftw3, FFTW3, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
810 [FFTW3 library not found. The slower FFTPACK library will be used instead.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
811 [fftw3.h], [fftw_plan_dft_1d]) |
3827 | 812 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
813 OCTAVE_CHECK_LIB(fftw3f, FFTW3F, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
814 [FFTW3F library not found. The slower FFTPACK library will be used instead.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
815 [fftw3.h], [fftwf_plan_dft_1d]) |
3827 | 816 |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
817 ## Check for the multithreaded FFTW library. |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
818 ## Fallback to singlethreaded if not found or disabled |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
819 build_fftw_threads=true |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
820 AC_ARG_ENABLE([fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
821 [AS_HELP_STRING([--disable-fftw-threads], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
822 [disable Multi-threaded FFTW])], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
823 [if test "$enableval" = no; then |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
824 build_fftw_threads=false |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
825 fi], |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
826 []) |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
827 |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
828 if test $build_fftw_threads = true; then |
15969
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15960
diff
changeset
|
829 OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads) |
139f4b19a3ac
build: Improve detection of FFTW multi-threading
Mike Miller <mtmiller@ieee.org>
parents:
15960
diff
changeset
|
830 OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads) |
15960
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
831 fi |
bde7731b2b83
added FFTW multithreaded library support
Andreas Weber <andy.weber.aw@gmail.com>
parents:
15946
diff
changeset
|
832 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
833 AM_CONDITIONAL([AMCOND_HAVE_FFTW], |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
834 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) |
3827 | 835 |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
836 ## Subdirectory of liboctave/cruft to build if FFTW is not found. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
837 FFT_DIR="fftpack" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
838 AC_SUBST(FFT_DIR) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
839 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
840 ### Check for GLPK library and header. |
5235 | 841 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
842 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
843 save_LIBS="$LIBS" |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
844 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
845 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
846 OCTAVE_CHECK_LIB(glpk, GLPK, |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
847 [GLPK library not found. The glpk function for solving linear programs will be disabled.], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
848 [glpk/glpk.h glpk.h], [_glp_lpx_simplex]) |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
849 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
850 CPPFLAGS="$save_CPPFLAGS" |
5235 | 851 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
852 ### Checks for cURL header and library. |
6043 | 853 |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
854 save_CPPFLAGS="$CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
855 save_LIBS="$LIBS" |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
856 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
857 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
858 OCTAVE_CHECK_LIB(curl, cURL, |
9880 | 859 [cURL library not found. The ftp objects, urlread and urlwrite functions will be disabled.], |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
860 [curl/curl.h], [curl_easy_escape]) |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
861 if test -z "$warn_curl"; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
862 ## Additional check on cURL library that was found |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
863 AC_CACHE_CHECK([for CURLOPT_DIRLISTONLY in curl/curl.h], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
864 [octave_cv_header_define_curlopt_dirlistonly], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
865 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
866 #include <curl/curl.h> |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
867 ]], [[ |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
868 curl_easy_setopt ((CURL*)NULL, CURLOPT_DIRLISTONLY, 0); |
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
869 ]])], |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
870 [octave_cv_header_define_curlopt_dirlistonly=no], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
871 [octave_cv_header_define_curlopt_dirlistonly=yes]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
872 ]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
873 if test $octave_cv_header_define_curlopt_dirlistonly = yes; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
874 AC_DEFINE(CURLOPT_DIRLISTONLY, CURLOPT_FTPLISTONLY, |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
875 [Define to the legacy option name if using an older version of cURL.])] |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
876 fi |
15323
c42bf5cadb60
Add check for CURLOPT_DIRLISTONLY in libcurl
Mike Miller <mtmiller@ieee.org>
parents:
15317
diff
changeset
|
877 fi |
9540
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
878 LIBS="$save_LIBS" |
79b5fe2d5646
use Z_LIBS in checks for curl and glpk libraries
John W. Eaton <jwe@octave.org>
parents:
9538
diff
changeset
|
879 CPPFLAGS="$save_CPPFLAGS" |
6133 | 880 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
881 ### Check for either of Graphics/ImageMagick++ libraries |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
882 |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
883 AC_ARG_WITH([magick], |
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
884 [AS_HELP_STRING([--with-magick=LIB], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
885 [select library to use for image I/O (options: GraphicsMagick(default) or ImageMagick)])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
886 [magick="$withval"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
887 [magick="GraphicsMagick"]) |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
888 |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
889 warn_magick="$magick++ library not found. The imread function for reading image files will not be fully functional." |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
890 |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
891 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
892 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
893 MAGICK_LIBS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
894 |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
895 PKG_CHECK_EXISTS([$magick++], [ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
896 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
897 ## packages add extra flags that are useful when building |
11041 | 898 ## Graphics/ImageMagick++ extentions. These extra flags break the |
899 ## Octave build. | |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
900 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
901 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
902 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
903 |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
904 warn_magick="$magick++ library fails tests. The imread function for reading image files will not be fully functional." |
7926
d74f996e005d
__magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents:
7921
diff
changeset
|
905 |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
906 save_CPPFLAGS="$CPPFLAGS" |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
907 save_LIBS="$LIBS" |
9583
8dc1531e2149
correctly save and restore LIBS and CPPFLAGS when checking for GraphicsMagick++
John W. Eaton <jwe@octave.org>
parents:
9575
diff
changeset
|
908 CPPFLAGS="$MAGICK_CPPFLAGS $CPPFLAGS" |
8dc1531e2149
correctly save and restore LIBS and CPPFLAGS when checking for GraphicsMagick++
John W. Eaton <jwe@octave.org>
parents:
9575
diff
changeset
|
909 LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS" |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
910 AC_LANG_PUSH(C++) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
911 AC_CHECK_HEADER([Magick++.h], [ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
912 AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
913 [octave_cv_func_magick_colorrgb], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
914 [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
915 #include <Magick++.h> |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
916 ]], [[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
917 Magick::ColorRGB c; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
918 ]])], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
919 octave_cv_func_magick_colorrgb=yes, |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
920 octave_cv_func_magick_colorrgb=no) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
921 ]) |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
922 if test $octave_cv_func_magick_colorrgb = yes; then |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
923 warn_magick= |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
924 fi |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
925 ]) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
926 AC_LANG_POP(C++) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
927 CPPFLAGS="$save_CPPFLAGS" |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
928 LIBS="$save_LIBS" |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
929 |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
930 AC_CHECK_FUNCS([setlocale], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
931 [warn_magick="$magick++ requires setlocale function. The imread function for reading image files will not be fully functional."]) |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
932 ]) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
933 |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
934 if test -z "$warn_magick"; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
935 AC_DEFINE(HAVE_MAGICK, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
936 [Define to 1 if Graphics/ImageMagick++ is available.]) |
7937
6661387827d6
Allow build without GraphicsMagick installed
David Bateman <dbateman@free.fr>
parents:
7934
diff
changeset
|
937 else |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
938 MAGICK_CPPFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
939 MAGICK_LDFLAGS= |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
940 MAGICK_LIBS= |
7926
d74f996e005d
__magick_read__.cc: configuration and style fixes
John W. Eaton <jwe@octave.org>
parents:
7921
diff
changeset
|
941 fi |
9575
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
942 AC_SUBST(MAGICK_CPPFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
943 AC_SUBST(MAGICK_LDFLAGS) |
55ecaefb7d0f
Use pkg-config to configure GraphicsMagick++.
David Grundberg <individ@acc.umu.se>
parents:
9573
diff
changeset
|
944 AC_SUBST(MAGICK_LIBS) |
6043 | 945 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
946 ### Check for X11 libraries |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
947 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
948 AC_PATH_X |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
949 if test "$have_x" = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
950 AC_DEFINE(HAVE_X_WINDOWS, 1, [Define to 1 if you have X11.]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
951 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
952 if test "$x_includes" != "NONE"; then |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
953 X11_INCFLAGS="$x_includes" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
954 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
955 AC_SUBST(X11_INCFLAGS) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
956 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
957 if test -z "$x_libraries"; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
958 AC_CHECK_LIB([X11], XrmInitialize, [X11_LIBS="-lX11"], [X11_LIBS=]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
959 elif test $x_libraries != "NONE"; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
960 AC_CHECK_LIB([X11], XrmInitialize, |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
961 [X11_LIBS="-L$x_libraries -lX11"], [X11_LIBS=], "-L$x_libraries") |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
962 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
963 AC_SUBST(X11_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
964 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
965 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
966 ### Check for the Carbon framework on MacOSX systems |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
967 OCTAVE_HAVE_FRAMEWORK([Carbon], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
968 [[#include <Carbon/Carbon.h>]], [[CGMainDisplayID ()]], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
969 [have_framework_carbon=yes], [have_framework_carbon=no]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
970 if test $have_framework_carbon = yes; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
971 AC_DEFINE(HAVE_FRAMEWORK_CARBON, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
972 [Define to 1 if framework CARBON is available.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
973 CARBON_LIBS="-Wl,-framework -Wl,Carbon" |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
974 AC_MSG_NOTICE([adding -Wl,-framework -Wl,Carbon to CARBON_LIBS]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
975 AC_SUBST(CARBON_LIBS) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
976 fi |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
977 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
978 ### Check for list of libraries needed for native graphics renderer. |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
979 |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
980 native_graphics=true |
7944
c2449e91f50a
configure.in: fix FTGL test to handle either FTGL/ftgl.h or ftgl.h
John W. Eaton <jwe@octave.org>
parents:
7937
diff
changeset
|
981 warn_freetype="" |
7863
2a62d45fa21d
added check for FTGL library
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7834
diff
changeset
|
982 |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
983 check_opengl=false |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
984 AC_ARG_WITH([opengl], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
985 [AS_HELP_STRING([--without-opengl], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
986 [don't use OpenGL libraries, disable native graphics])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
987 [if test x"$withval" = x"no"; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
988 native_graphics=false |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
989 warn_opengl="--without-opengl specified. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
990 OCTAVE_CONFIGURE_WARNING([warn_opengl]) |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
991 else |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
992 check_opengl=true |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
993 fi], |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
994 [check_opengl=true]) |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
995 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
996 ## Check for OpenGL library |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
997 if $check_opengl; then |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
998 OCTAVE_CHECK_LIB_OPENGL |
11208
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
999 fi |
a44ba1cdfbb5
handle --without-opengl configure option
John W. Eaton <jwe@octave.org>
parents:
11119
diff
changeset
|
1000 |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1001 GRAPHICS_LIBS= |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1002 GRAPHICS_CFLAGS= |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1003 |
11214
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1004 if test -z "$OPENGL_LIBS"; then |
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1005 if $check_opengl; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1006 native_graphics=false |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1007 warn_fltk_opengl="OpenGL libs (GL and GLU) not found. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1008 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
11214
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1009 fi |
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1010 fi |
7f19b2b6e093
Remove redundant warning when 'without-opengl' option used.
Rik <octave@nomad.inbox5.com>
parents:
11209
diff
changeset
|
1011 |
7944
c2449e91f50a
configure.in: fix FTGL test to handle either FTGL/ftgl.h or ftgl.h
John W. Eaton <jwe@octave.org>
parents:
7937
diff
changeset
|
1012 if test -n "$OPENGL_LIBS"; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1013 AC_DEFINE(HAVE_OPENGL, 1, [Define to 1 if OpenGL is available.]) |
7863
2a62d45fa21d
added check for FTGL library
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7834
diff
changeset
|
1014 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1015 ## Check for FreeType 2 library |
9845
722bd8f6a750
configure.ac: fix freetype check
John W. Eaton <jwe@octave.org>
parents:
9817
diff
changeset
|
1016 |
15831
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1017 PKG_CHECK_MODULES([FT2], [freetype2], [ |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1018 min_ft2_version=9.03 |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1019 AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version]) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1020 $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1021 ac_status=$? |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1022 if test $ac_status = 0; then |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1023 AC_MSG_RESULT(yes) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1024 AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1025 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS" |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1026 else |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1027 AC_MSG_RESULT(no) |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1028 warn_freetype="FreeType library not found. Native graphics will be disabled." |
1cdca9bf7b7e
USe pkg-config for freetype2 configure check.
John W. Eaton <jwe@octave.org>
parents:
15536
diff
changeset
|
1029 fi]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1030 |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1031 if test -n "$warn_freetype"; then |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1032 OCTAVE_CONFIGURE_WARNING([warn_freetype]) |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1033 native_graphics=false |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1034 fi |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1035 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1036 ## Check for fontconfig library |
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9259
diff
changeset
|
1037 |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1038 warn_fontconfig="" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1039 if test -z "$warn_freetype"; then |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1040 PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1041 [have_fontconfig=yes |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1042 OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1043 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1044 AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1045 [have_fontconfig=no |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1046 warn_fontconfig="Fontconfig library not found. Native graphics will be disabled."]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1047 fi |
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9259
diff
changeset
|
1048 |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1049 if test -n "$warn_fontconfig"; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1050 native_graphics=false |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1051 OCTAVE_CONFIGURE_WARNING([warn_fontconfig]) |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1052 fi |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1053 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1054 ## Check for FLTK (www.fltk.org) library |
11041 | 1055 |
1056 AC_ARG_WITH([fltk-prefix], [ | |
1057 AS_HELP_STRING([--with-fltk-prefix=PFX], | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1058 [prefix where FLTK is installed (optional)])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1059 [fltk_prefix="$withval"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1060 [fltk_prefix=""]) |
11041 | 1061 |
1062 AC_ARG_WITH([fltk-exec-prefix], [ | |
1063 AS_HELP_STRING([--with-fltk-exec-prefix=PFX], | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1064 [exec prefix where FLTK is installed (optional)])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1065 [fltk_exec_prefix="$withval"], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1066 [fltk_exec_prefix=""]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1067 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1068 if test x"$fltk_exec_prefix" != x""; then |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1069 fltk_args="$fltk_args --exec-prefix=$fltk_exec_prefix" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1070 if test "x${FLTK_CONFIG+set}" != xset ; then |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1071 FLTK_CONFIG="$fltk_exec_prefix/bin/fltk-config" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1072 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1073 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1074 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1075 if test x"$fltk_prefix" != x""; then |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1076 fltk_args="$fltk_args --prefix=$fltk_prefix" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1077 if test x${FLTK_CONFIG+set} != xset ; then |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1078 FLTK_CONFIG="$fltk_prefix/bin/fltk-config" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1079 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1080 fi |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1081 |
11041 | 1082 AC_PATH_PROG([FLTK_CONFIG], [fltk-config], [no]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1083 |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1084 warn_fltk_config="" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1085 warn_fltk_opengl="" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1086 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1087 if test "$FLTK_CONFIG" = no; then |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1088 native_graphics=false |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1089 warn_fltk_config="FLTK config script not found. Native graphics will be disabled." |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1090 OCTAVE_CONFIGURE_WARNING([warn_fltk_config]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1091 else |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1092 FLTK_CFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags` |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1093 FLTK_LDFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1094 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1095 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1096 mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1097 FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | sed -e 's/-mwindows//g'` |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1098 ;; |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1099 esac |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1100 |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1101 AC_CACHE_CHECK([for OpenGL support in FLTK], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1102 [octave_cv_fltk_opengl_support], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1103 [save_CFLAGS="$CFLAGS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1104 CFLAGS="$CFLAGS $FLTK_CFLAGS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1105 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1106 #include <FL/gl.h> |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1107 ]], [[ |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1108 int nothing = 0; |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1109 ]])], |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1110 octave_cv_fltk_opengl_support=no, |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1111 octave_cv_fltk_opengl_support=yes) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1112 CFLAGS="$save_CFLAGS" |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1113 ]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1114 if test $octave_cv_fltk_opengl_support = no; then |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1115 warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1116 else |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1117 AC_DEFINE(HAVE_FLTK, 1, [Define to 1 if FLTK is available.]) |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1118 fi |
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1119 |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1120 if test -z "$warn_fltk_opengl"; then |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1121 GRAPHICS_CFLAGS="$FLTK_CFLAGS" |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1122 GRAPHICS_LIBS="$FLTK_LDFLAGS" |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1123 else |
15338
dc39c1d84c5b
build: Use caching on more intermediate results to speed up configure.
Rik <rik@octave.org>
parents:
15329
diff
changeset
|
1124 native_graphics=false |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
1125 OCTAVE_CONFIGURE_WARNING([warn_fltk_opengl]) |
10571
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1126 fi |
2ceb8e013597
add configure test for glu
Shai Ayal <shaiay@users.sourceforge.net>
parents:
10471
diff
changeset
|
1127 fi |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1128 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1129 |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1130 AC_SUBST(GRAPHICS_CFLAGS) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1131 AC_SUBST(GRAPHICS_LIBS) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
1132 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1133 ### Start determination of shared vs. static libraries |
3827 | 1134 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1135 ## Use -static if compiling on Alpha OSF/1 1.3 systems. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1136 case $canonical_host_type in |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1137 alpha*-dec-osf1.3) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1138 LD_STATIC_FLAG=-static |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1139 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1140 esac |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1141 if test -n "$LD_STATIC_FLAG"; then |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1142 AC_MSG_NOTICE([defining LD_STATIC_FLAG to be $LD_STATIC_FLAG]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1143 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1144 AC_SUBST(LD_STATIC_FLAG) |
3827 | 1145 |
3130 | 1146 OCTAVE_PROG_AR |
3012 | 1147 |
9801
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1148 ifdef([LT_INIT], [], [ |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1149 errprint([error: you must have libtool 2.2.2 or a more recent version |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1150 ]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1151 m4exit([1])]) |
13868ea67c71
configure.ac: fail if LT_INIT is not defined
John W. Eaton <jwe@octave.org>
parents:
9799
diff
changeset
|
1152 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1153 LT_PREREQ([2.2.2]) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1154 LT_INIT([disable-static dlopen win32-dll]) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1155 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1156 if test x"$enable_shared" = x"yes"; then |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1157 SHARED_LIBS=true |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1158 else |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1159 SHARED_LIBS=false |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1160 fi |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1161 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1162 if test x"$enable_static" = x"yes"; then |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1163 STATIC_LIBS=true |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1164 else |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1165 STATIC_LIBS=false |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1166 fi |
3012 | 1167 |
6137 | 1168 XTRA_CRUFT_SH_LDFLAGS= |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1169 if test $have_msvc = yes; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1170 FLIBS="$FLIBS -lkernel32" |
15600
fcdc284f96ef
Fix cruft.def location and usage.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15596
diff
changeset
|
1171 XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1172 fi |
6137 | 1173 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) |
6102 | 1174 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1175 ### Check for BLAS and LAPACK libraries: |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1176 |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1177 ## Need to adjust FFLAGS to include correct integer size. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1178 save_FFLAGS="$FFLAGS" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1179 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1180 |
10951 | 1181 AX_BLAS_WITH_F77_FUNC([:], [:]) |
1182 AX_LAPACK([:], [:]) | |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1183 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1184 ## Restore FFLAGS. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1185 FFLAGS="$save_FFLAGS" |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1186 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1187 ## If necessary, try again with -ff2c in FFLAGS |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1188 if test $ax_blas_f77_func_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1189 save_FFLAGS="$FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1190 FFLAGS="-ff2c $FFLAGS $F77_INTEGER_8_FLAG" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1191 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1192 AX_BLAS_WITH_F77_FUNC([:], [:]) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1193 AX_LAPACK([:], [:]) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1194 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1195 ## Restore FFLAGS, with -ff2c if that was helpful |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1196 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1197 if test $ax_blas_f77_func_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1198 FFLAGS="$save_FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1199 else |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1200 FFLAGS="-ff2c $save_FFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1201 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1202 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1203 |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1204 ## On OSX, try again with a wrapper library (without -ff2c!) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1205 if test $ax_blas_f77_func_ok = no; then |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1206 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1207 darwin*) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1208 ## test if wrapper functions help |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1209 octave_blaswrap_save_CFLAGS="$CFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1210 CFLAGS="$CFLAGS -DUSE_BLASWRAP" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1211 AC_LANG_PUSH(C) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1212 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1213 #include "liboctave/cruft/misc/blaswrap.c" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1214 ]])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1215 [mv conftest.$ac_objext blaswrap.$ac_objext |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1216 octave_blaswrap_save_BLAS_LIBS="$BLAS_LIBS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1217 BLAS_LIBS="blaswrap.$ac_objext -framework vecLib" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1218 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1219 save_FFLAGS="$FFLAGS" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1220 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1221 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1222 AX_BLAS_WITH_F77_FUNC([:], [:]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1223 AX_LAPACK([:], [:]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1224 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1225 ## Restore FFLAGS. |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1226 FFLAGS="$save_FFLAGS" |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1227 |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1228 ## remove temp file |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1229 rm -f blaswrap.$ac_objext], |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1230 [AC_MSG_FAILURE([cannot compile liboctave/cruft/misc/blaswrap.c])]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1231 AC_LANG_POP(C) |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1232 CFLAGS="$octave_blaswrap_save_CFLAGS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1233 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1234 if test $ax_blas_f77_func_ok = no; then |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1235 BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS" |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1236 else |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
1237 ## wrapper in cruft, remove from BLAS_LIBS |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1238 BLAS_LIBS=`echo $BLAS_LIBS | sed -e 's/blaswrap.[[^ ]]* //g'` |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1239 AC_DEFINE(USE_BLASWRAP, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1240 [Define to 1 if BLAS functions need to be wrapped (potentially needed for 64-bit OSX only).]) |
12538
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1241 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1242 ;; |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1243 esac |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1244 fi |
6a225fb7d361
Test fortran with -ff2c and with a wrapper for Apple blas/lapack, when needed.
Jarno Rajahalme <jarno.rajahalme@nsn.com>
parents:
12464
diff
changeset
|
1245 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1246 if test $ax_blas_f77_func_ok = no; then |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1247 if $USE_64_BIT_IDX_T && test $ax_blas_integer_size_ok = no; then |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1248 ## Attempt to be more informative. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1249 AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.]) |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1250 else |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1251 AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.]) |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1252 fi |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1253 fi |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1254 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1255 if test $ax_blas_ok = no || test $ax_lapack_ok = no; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1256 AC_MSG_ERROR([BLAS and LAPACK libraries are required]) |
9799
cfd0aa788ae1
remove reference blas and lapack sources
John W. Eaton <jwe@octave.org>
parents:
9794
diff
changeset
|
1257 fi |
3690 | 1258 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1259 ### Check for the qrupdate library |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1260 |
10721
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1261 ## No need to adjust FFLAGS because only link is attempted. |
4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
Jaroslav Hajek <highegg@gmail.com>
parents:
10622
diff
changeset
|
1262 ## Must supply proper LIBS, however. |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1263 save_LIBS="$LIBS" |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1264 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1265 OCTAVE_CHECK_LIB(qrupdate, qrupdate, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1266 [qrupdate not found. The QR & Cholesky updating functions will be slow.], |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1267 [], |
9707
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1268 [sqr1up], |
6f5c4c82c5fc
avoid ugly F77 names in configure
Jaroslav Hajek <highegg@gmail.com>
parents:
9648
diff
changeset
|
1269 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) |
9708 | 1270 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1271 if test $octave_cv_lib_qrupdate = yes; then |
15361
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1272 AC_CACHE_CHECK([for slup1up in $QRUPDATE_LIBS], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1273 [octave_cv_func_slup1up], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1274 [LIBS="$LIBS $QRUPDATE_LIBS" |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1275 AC_LANG_PUSH([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1276 AC_LINK_IFELSE([AC_LANG_CALL([], [slup1up])], |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1277 octave_cv_func_slup1up=yes, octave_cv_func_slup1up=no) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1278 AC_LANG_POP([Fortran 77]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1279 ]) |
01c4f5d8a656
configure.ac: Cache results for QRUPDATE_LUU autoconf test.
Rik <rik@octave.org>
parents:
15350
diff
changeset
|
1280 if test $octave_cv_func_slup1up = yes; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1281 AC_DEFINE(HAVE_QRUPDATE_LUU, 1, [Define to 1 if qrupdate supports LU updates.]) |
9708 | 1282 fi |
1283 fi | |
9570
1ab56c73ec7c
use OCTAVE_CHECK_LIBRARY to check for qrupdate library
John W. Eaton <jwe@octave.org>
parents:
9568
diff
changeset
|
1284 LIBS="$save_LIBS" |
8547
d66c9b6e506a
imported patch qrupdate.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8417
diff
changeset
|
1285 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1286 ### Check for AMD library |
7619 | 1287 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1288 OCTAVE_CHECK_LIB(amd, AMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1289 [AMD library not found. This will result in some lack of functionality for sparse matrices.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1290 [suitesparse/amd.h ufsparse/amd.h amd/amd.h amd.h], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1291 [amd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1292 [], [don't use AMD library, disable some sparse matrix functionality]) |
5451 | 1293 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1294 ### Check for CAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1295 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1296 OCTAVE_CHECK_LIB(camd, CAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1297 [CAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1298 [suitesparse/camd.h ufsparse/camd.h camd/camd.h camd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1299 [camd_postorder], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1300 [], [don't use CAMD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1301 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1302 ### Check for COLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1303 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1304 OCTAVE_CHECK_LIB(colamd, COLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1305 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1306 [suitesparse/colamd.h ufsparse/colamd.h colamd/colamd.h colamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1307 [colamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1308 [], [don't use COLAMD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1309 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1310 ### Check for CCOLAMD library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1311 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1312 OCTAVE_CHECK_LIB(ccolamd, CCOLAMD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1313 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1314 [suitesparse/ccolamd.h ufsparse/ccolamd.h ccolamd/ccolamd.h ccolamd.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1315 [ccolamd], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1316 [], [don't use CCOLAMD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1317 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1318 ### Check for CHOLMOD library. |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1319 ### If your cholmod library requires cblas, then you will need to |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1320 ### configure with --with-cholmod="-lcholmod -lcblas". |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1321 |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1322 save_LIBS="$LIBS" |
10332
5f6298220ced
configure.ac: include colamd and amd libs in LIBS when checking for cholmod library
John W. Eaton <jwe@octave.org>
parents:
10331
diff
changeset
|
1323 LIBS="$COLAMD_LDFLAGS $COLAMD_LIBS $AMD_LDFLAGS $AMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1324 OCTAVE_CHECK_LIB(cholmod, CHOLMOD, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1325 [CHOLMOD library not found. This will result in some lack of functionality for sparse matrices.], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1326 [suitesparse/cholmod.h ufsparse/cholmod.h cholmod/cholmod.h cholmod.h], |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1327 [cholmod_start], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1328 [], [don't use CHOLMOD library, disable some sparse matrix functionality]) |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1329 LIBS="$save_LIBS" |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1330 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1331 ### Check for CXSparse library |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1332 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1333 OCTAVE_CHECK_LIB(cxsparse, CXSparse, |
9571
263a8ed419b0
configure.in: style fixes for messages
John W. Eaton <jwe@octave.org>
parents:
9570
diff
changeset
|
1334 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.], |
15938
398ae067e811
configure.ac: Fix CAMD/COLAMD/CCOLAMD/CXSparse include search directories
Kyle Guinn <elyk03@gmail.com>
parents:
15932
diff
changeset
|
1335 [suitesparse/cs.h ufsparse/cs.h cxsparse/cs.h cs.h], |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
1336 [cs_di_sqr], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1337 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) |
6024 | 1338 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1339 ### Check for UMFPACK library. |
5226 | 1340 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1341 save_LIBS="$LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1342 save_CPPFLAGS="$CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1343 LIBS="$AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1344 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1345 OCTAVE_CHECK_LIB([umfpack], UMFPACK, |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1346 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1347 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1348 [umfpack_zi_get_determinant], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1349 [], [don't use UMFPACK, disable some sparse matrix functionality]) |
9787
cc5bb7b5679f
use AMD_CPPFLAGS when checking for UMFPACK
David Grundberg <davidg@cs.umu.se>
parents:
9763
diff
changeset
|
1350 CPPFLAGS="$save_CPPFLAGS" |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1351 LIBS="$save_LIBS" |
5512 | 1352 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1353 if test -z "$UMFPACK_LIBS"; then |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1354 ## Invalidate the cache and try again with -lcblas. |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1355 $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant |
15350
6a0c0d3d60b6
build: Implement some caching for OCTAVE_CHECK_LIB macro.
Rik <rik@octave.org>
parents:
15349
diff
changeset
|
1356 $as_unset octave_cv_lib_umfpack |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1357 save_LIBS="$LIBS" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1358 LIBS="-lcblas $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1359 OCTAVE_CHECK_LIB([umfpack], UMFPACK, |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1360 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1361 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1362 [umfpack_zi_get_determinant], |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
1363 [], [don't use UMFPACK, disable some sparse matrix functionality]) |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1364 if test -n "$UMFPACK_LIBS"; then |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1365 UMFPACK_LIBS="$UMFPACK_LIBS -lcblas" |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1366 fi |
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1367 LIBS="$save_LIBS" |
6133 | 1368 fi |
5513 | 1369 |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1370 ## Test features of the installed UMFPACK library |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1371 |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1372 if test -n "$UMFPACK_LIBS"; then |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1373 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1374 save_LIBS="$LIBS"; |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1375 LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1376 xtra_libs= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1377 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1378 if test $octave_cv_umfpack_need_suitesparse_time = yes; then |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1379 AC_CHECK_LIB([rt], [clock_gettime], [xtra_libs="-lrt"], [xtra_libs=]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1380 ## FIXME: This library list is only accurate for Linux, Mac OS X. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1381 ## Possibly need other library names for MinGW, Cygwin. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1382 AC_SEARCH_LIBS([SuiteSparse_time], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1383 [suitesparseconfig SuiteSparse], |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1384 [], [], [$xtra_libs]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1385 case $ac_cv_search_SuiteSparse_time in |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1386 -l*) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1387 UMFPACK_LIBS="$UMFPACK_LIBS $ac_cv_search_SuiteSparse_time" |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1388 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1389 no) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1390 UMFPACK_LIBS= |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1391 AC_MSG_WARN([UMFPACK library found but is missing SuiteSparse_time functionality.]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1392 AC_MSG_WARN([UMFPACK library will be disabled.]) |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1393 ;; |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1394 esac |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1395 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1396 LIBS="$save_LIBS" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1397 |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1398 ## Check for UMFPACK separately split complex matrix and RHS. |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1399 if test -n "$UMFPACK_LIBS"; then |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1400 save_LIBS="$LIBS"; |
15349
90c2b2d777bf
configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X)
Rik <rik@octave.org>
parents:
15346
diff
changeset
|
1401 LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" |
15329
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1402 OCTAVE_UMFPACK_SEPARATE_SPLIT |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1403 LIBS="$save_LIBS" |
719ffb2f35a6
Fix Octave builds with SuiteSparse >=4.0 (bug #37031)
Rik <rik@octave.org>
parents:
15323
diff
changeset
|
1404 fi |
9572
ab8a163f2052
use OCTAVE_CHECK_LIB to check for UMFPACK
John W. Eaton <jwe@octave.org>
parents:
9571
diff
changeset
|
1405 fi |
5226 | 1406 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1407 ### Check for ARPACK library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1408 |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1409 save_LIBS="$LIBS" |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1410 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1411 OCTAVE_CHECK_LIB([arpack], ARPACK, |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1412 [ARPACK not found. The eigs function will be disabled.], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1413 [], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1414 [dseupd], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1415 [Fortran 77], [don't use the ARPACK library, disable eigs function], |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1416 [warn_arpack= |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1417 OCTAVE_CHECK_LIB_ARPACK_OK( |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1418 [AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1419 [warn_arpack="ARPACK library found, but does not seem to work properly -- disabling eigs function"])]) |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1420 LIBS="$save_LIBS" |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
1421 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1422 ### Check for readline library. |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1423 |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1424 OCTAVE_ENABLE_READLINE |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1425 |
4128 | 1426 ### Enable dynamic linking. --enable-shared implies this, so |
1427 ### --enable-dl is only need if you are only building static libraries | |
1428 ### and want to try dynamic linking too (works on some systems, for | |
1429 ### example, OS X and Windows). | |
1430 | |
11216
5036b0ff9597
configure.ac: Properly m4 quote AS_HELP_STRING.
Rik <octave@nomad.inbox5.com>
parents:
11214
diff
changeset
|
1431 AC_ARG_ENABLE([dl], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1432 [AS_HELP_STRING([--disable-dl], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1433 [disable loading of dynamically linked modules])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1434 [case $enableval in |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1435 yes) ENABLE_DYNAMIC_LINKING=true ;; |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1436 no) ENABLE_DYNAMIC_LINKING=false ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1437 *) AC_MSG_ERROR([bad value $enableval for --enable-dl]) ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1438 esac], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1439 [ENABLE_DYNAMIC_LINKING=true]) |
4128 | 1440 |
15876
84b38d6442e6
configure.ac: Replace uses of 'true' as a command.
Rik <rik@octave.org>
parents:
15875
diff
changeset
|
1441 if ! $STATIC_LIBS && ! $SHARED_LIBS; then |
15925
1fbeccd44271
configure.ac: Clarify warning about disabling static AND shared libraries.
Rik <rik@octave.org>
parents:
15919
diff
changeset
|
1442 AC_MSG_ERROR([You can't disable building both static AND shared libraries!]) |
3034 | 1443 fi |
1444 | |
2813 | 1445 CPICFLAG=-fPIC |
1446 CXXPICFLAG=-fPIC | |
1447 FPICFLAG=-fPIC | |
1448 SHLEXT=so | |
4190 | 1449 SHLLIB='$(SHLEXT)' |
4102 | 1450 SHLBIN= |
4138 | 1451 SHLEXT_VER='$(SHLEXT).$(version)' |
1452 SHLLIB_VER='$(SHLLIB).$(version)' | |
1453 SHLBIN_VER='$(SHLBIN).$(version)' | |
4126 | 1454 SHLLINKEXT= |
6051 | 1455 LIBPRE=lib |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1456 SHLPRE=lib |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1457 SHLLIBPRE=lib |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1458 SHLBINPRE=lib |
4323 | 1459 SH_LD='$(CXX)' |
2813 | 1460 SH_LDFLAGS=-shared |
4759 | 1461 DL_LD='$(SH_LD)' |
1462 DL_LDFLAGS='$(SH_LDFLAGS)' | |
1463 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' | |
3036 | 1464 SONAME_FLAGS= |
4199 | 1465 NO_OCT_FILE_STRIP=false |
4323 | 1466 TEMPLATE_AR='$(AR)' |
3775 | 1467 TEMPLATE_ARFLAGS="$ARFLAGS" |
6137 | 1468 CRUFT_DLL_DEFS= |
1469 OCTAVE_DLL_DEFS= | |
1470 OCTINTERP_DLL_DEFS= | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1471 OCTGUI_DLL_DEFS= |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1472 OCTGRAPHICS_DLL_DEFS= |
4104 | 1473 library_path_var=LD_LIBRARY_PATH |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1474 ldpreloadsep=" " |
10986
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1475 BUILD_COMPILED_AUX_PROGRAMS=false |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1476 case $canonical_host_type in |
6668 | 1477 *-*-386bsd* | *-*-netbsd*) |
2813 | 1478 SH_LD=ld |
1479 SH_LDFLAGS=-Bshareable | |
1480 ;; | |
6668 | 1481 *-*-openbsd*) |
1482 SH_LDFLAGS='-shared -fPIC' | |
1483 ;; | |
4323 | 1484 *-*-freebsd*) |
5508 | 1485 SH_LDFLAGS="-shared -Wl,-x" |
4323 | 1486 ;; |
3127 | 1487 alpha*-dec-osf*) |
2813 | 1488 CPICFLAG= |
1489 CXXPICFLAG= | |
1490 FPICFLAG= | |
4283 | 1491 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" |
2813 | 1492 ;; |
3956 | 1493 *-*-darwin*) |
15195 | 1494 DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/libinterp/octave $(LDFLAGS)' |
6682 | 1495 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT' |
4759 | 1496 SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)' |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1497 case $canonical_host_type in |
7266 | 1498 powerpc-*) |
1499 CXXPICFLAG= | |
1500 CPICFLAG= | |
1501 FPICFLAG= | |
1502 ;; | |
1503 esac | |
4759 | 1504 SHLEXT=dylib |
1505 SHLLIB='$(SHLEXT)' | |
1506 SHLEXT_VER='$(version).$(SHLEXT)' | |
1507 SHLLIB_VER='$(version).$(SHLLIB)' | |
4199 | 1508 NO_OCT_FILE_STRIP=true |
4786 | 1509 SONAME_FLAGS='-install_name $(octlibdir)/$@' |
12451 | 1510 library_path_var=DYLD_LIBRARY_PATH |
3956 | 1511 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1512 *-*-cygwin*) |
9054
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1513 CPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1514 CXXPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1515 FPICFLAG= |
0735e427c6c0
configure fixes for cygwin
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9049
diff
changeset
|
1516 LIBPRE=lib |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1517 SHLPRE=cyg |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1518 SHLBINPRE=cyg |
8644
fac8c78b4fb9
configure.in: fix shared library definitions for Cygwin and MinGW
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
8641
diff
changeset
|
1519 SHLEXT=dll |
fac8c78b4fb9
configure.in: fix shared library definitions for Cygwin and MinGW
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
8641
diff
changeset
|
1520 SHLLIB=dll.a |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1521 SHLBIN=dll |
5451 | 1522 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
5414 | 1523 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
9241
60bbc66bb0e2
Correct my previous mistake for cygwin SHLBIN and SHLBINPRE
Marco Atzeri <marco_atzeri@yahoo.it>
parents:
9231
diff
changeset
|
1524 SONAME_FLAGS='-Wl,--out-implib=$(patsubst $(SHLPRE)%,$(LIBPRE)%,$@).a' |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1525 ldpreloadsep=":" |
4102 | 1526 ;; |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1527 *-*-mingw*) |
10986
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1528 BUILD_COMPILED_AUX_PROGRAMS=true |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1529 if test $have_msvc = yes; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1530 DL_LDFLAGS="-shared" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1531 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1532 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1533 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1534 SHLEXT=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1535 SHLLIB=lib |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1536 SHLBIN=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1537 LIBPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1538 SHLPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1539 SHLLIBPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1540 SHLBINPRE= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1541 SH_LDFLAGS="-shared" |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1542 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1543 DL_LDFLAGS="$DL_LDFLAGS -g" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1544 SH_LDFLAGS="$SH_LDFLAGS -g" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1545 fi |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1546 NO_OCT_FILE_STRIP=true |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1547 library_path_var=PATH |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1548 NO_OCT_FILE_STRIP=true |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1549 ## Extra compilation flags. |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1550 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1551 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1552 OCTINTERP_DLL_DEFS="-DOCTINTERP_DLL" |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1553 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1554 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1555 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1556 CPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1557 CXXPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1558 FPICFLAG= |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1559 SHLEXT=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1560 SHLLIB=dll.a |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1561 SHLBIN=dll |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1562 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1563 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1564 SONAME_FLAGS='-Wl,--out-implib=$@.a' |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1565 library_path_var=PATH |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1566 fi |
8675
43c6012bd4c2
configure.in: separate cases for cygwin and mingw
Benjamin Lindner <lindnerben@gmx.net>
parents:
8659
diff
changeset
|
1567 ;; |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1568 |
6089 | 1569 *-*-msdosmsvc) |
10986
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1570 BUILD_COMPILED_AUX_PROGRAMS=true |
6794 | 1571 DL_LDFLAGS="-shared" |
6051 | 1572 CPICFLAG= |
1573 CXXPICFLAG= | |
1574 FPICFLAG= | |
1575 SHLEXT=dll | |
1576 SHLLIB=lib | |
1577 SHLBIN=dll | |
1578 LIBPRE= | |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1579 SHLPRE= |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1580 SHLLIBPRE= |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1581 SHLBINPRE= |
6794 | 1582 SH_LDFLAGS="-shared" |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1583 if test -n "`echo $CFLAGS | grep -e '-g'`" || test -n "`echo $CXXFLAGS | grep -e '-g'`"; then |
6794 | 1584 DL_LDFLAGS="$DL_LDFLAGS -g" |
1585 SH_LDFLAGS="$SH_LDFLAGS -g" | |
1586 fi | |
6255 | 1587 NO_OCT_FILE_STRIP=true |
6100 | 1588 library_path_var=PATH |
6718 | 1589 NO_OCT_FILE_STRIP=true |
6087 | 1590 ## Extra compilation flags. |
6137 | 1591 CRUFT_DLL_DEFS="-DCRUFT_DLL" |
1592 OCTAVE_DLL_DEFS="-DOCTAVE_DLL" | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1593 OCTGUI_DLL_DEFS="-DOCTGUI_DLL" |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1594 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" |
6051 | 1595 ;; |
3740 | 1596 *-*-linux* | *-*-gnu*) |
4906 | 1597 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" |
4283 | 1598 SONAME_FLAGS='-Wl,-soname -Wl,$@' |
2813 | 1599 ;; |
3887 | 1600 i[[3456]]86-*-sco3.2v5*) |
4283 | 1601 SONAME_FLAGS='-Wl,-h -Wl,$@' |
3160 | 1602 SH_LDFLAGS=-G |
1603 ;; | |
2813 | 1604 rs6000-ibm-aix* | powerpc-ibm-aix*) |
1605 CPICFLAG= | |
1606 CXXPICFLAG= | |
1607 FPICFLAG= | |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1608 library_path_var=LIBPATH |
2813 | 1609 ;; |
1610 hppa*-hp-hpux*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1611 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1612 FPICFLAG=-fPIC |
1613 else | |
1614 FPICFLAG=+Z | |
1615 fi | |
1616 SHLEXT=sl | |
1617 SH_LDFLAGS="-shared -fPIC" | |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1618 library_path_var=SHLIB_PATH |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1619 ;; |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1620 ia64*-hp-hpux*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1621 if test $ac_cv_f77_compiler_gnu = yes; then |
9172
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1622 FPICFLAG=-fPIC |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1623 else |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1624 FPICFLAG=+Z |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1625 fi |
cd68431b395a
configure.in: shared library fixes for AIX and HPUX
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9171
diff
changeset
|
1626 SH_LDFLAGS="-shared -fPIC" |
2813 | 1627 ;; |
1628 *-sgi-*) | |
1629 CPICFLAG= | |
1630 CXXPICFLAG= | |
1631 FPICFLAG= | |
1632 ;; | |
1633 sparc-sun-sunos4*) | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1634 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1635 FPICFLAG=-fPIC |
1636 else | |
1637 FPICFLAG=-PIC | |
1638 fi | |
3059 | 1639 SH_LD=ld |
1640 SH_LDFLAGS="-assert nodefinitions" | |
2813 | 1641 ;; |
3606 | 1642 sparc-sun-solaris2* | i386-pc-solaris2*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1643 if test $ac_cv_f77_compiler_gnu = yes; then |
2813 | 1644 FPICFLAG=-fPIC |
1645 else | |
3775 | 1646 FPICFLAG=-KPIC |
1647 fi | |
1648 if test "$GCC" = yes; then | |
1649 CPICFLAG=-fPIC | |
1650 else | |
1651 CPICFLAG=-KPIC | |
2813 | 1652 fi |
3775 | 1653 if test "$GXX" = yes; then |
1654 CXXPICFLAG=-fPIC | |
1655 SH_LDFLAGS=-shared | |
1656 else | |
1657 CXXPICFLAG=-KPIC | |
1658 SH_LDFLAGS=-G | |
1659 fi | |
6087 | 1660 ## Template closures in archive libraries need a different mechanism. |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1661 if test "$GXX" != yes; then |
4323 | 1662 TEMPLATE_AR='$(CXX)' |
3775 | 1663 TEMPLATE_ARFLAGS="-xar -o" |
1664 fi | |
2813 | 1665 ;; |
1666 esac | |
1667 | |
10986
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1668 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS], |
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1669 [test x$BUILD_COMPILED_AUX_PROGRAMS = xtrue]) |
20bb05b9fb3f
makefile rules for compiled auxiliary programs
John W. Eaton <jwe@octave.org>
parents:
10951
diff
changeset
|
1670 |
5844 | 1671 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) |
1672 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) | |
1673 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) | |
1674 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT]) | |
1675 AC_MSG_NOTICE([defining SHLLIB to be $SHLLIB]) | |
1676 AC_MSG_NOTICE([defining SHLBIN to be $SHLBIN]) | |
1677 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER]) | |
1678 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) | |
1679 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) | |
1680 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) | |
6051 | 1681 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1682 AC_MSG_NOTICE([defining SHLPRE to be $SHLPRE]) |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1683 AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE]) |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1684 AC_MSG_NOTICE([defining SHLBINPRE to be $SHLBINPRE]) |
5844 | 1685 AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) |
1686 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) | |
1687 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) | |
1688 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) | |
1689 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) | |
1690 AC_MSG_NOTICE([defining SONAME_FLAGS to be $SONAME_FLAGS]) | |
1691 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP]) | |
1692 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) | |
1693 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) | |
6137 | 1694 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) |
1695 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) | |
1696 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1697 AC_MSG_NOTICE([defining OCTGUI_DLL_DEFS to be $OCTGUI_DLL_DEFS]) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1698 AC_MSG_NOTICE([defining OCTGRAPHICS_DLL_DEFS to be $OCTGRAPHICS_DLL_DEFS]) |
5844 | 1699 AC_MSG_NOTICE([defining library_path_var to be $library_path_var]) |
2813 | 1700 AC_SUBST(FPICFLAG) |
1701 AC_SUBST(CPICFLAG) | |
1702 AC_SUBST(CXXPICFLAG) | |
1703 AC_SUBST(SHLEXT) | |
4102 | 1704 AC_SUBST(SHLLIB) |
1705 AC_SUBST(SHLBIN) | |
4126 | 1706 AC_SUBST(SHLEXT_VER) |
1707 AC_SUBST(SHLLIB_VER) | |
1708 AC_SUBST(SHLBIN_VER) | |
1709 AC_SUBST(SHLLINKEXT) | |
6051 | 1710 AC_SUBST(LIBPRE) |
9186
49a0c58a7dcf
Added SHLPRE for SHLEXT instead of SHLLIBPRE
marco_atzeri@yahoo.it
parents:
9178
diff
changeset
|
1711 AC_SUBST(SHLPRE) |
9189
8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
John W. Eaton <jwe@octave.org>
parents:
9187
diff
changeset
|
1712 AC_SUBST(SHLLIBPRE) |
8618
f8b3ece45bda
use separate prefix for shllib and shlbin files
John W. Eaton <jwe@octave.org>
parents:
8607
diff
changeset
|
1713 AC_SUBST(SHLBINPRE) |
2813 | 1714 AC_SUBST(SH_LD) |
1715 AC_SUBST(SH_LDFLAGS) | |
4759 | 1716 AC_SUBST(DL_LD) |
1717 AC_SUBST(DL_LDFLAGS) | |
1718 AC_SUBST(MKOCTFILE_DL_LDFLAGS) | |
3036 | 1719 AC_SUBST(SONAME_FLAGS) |
4199 | 1720 AC_SUBST(NO_OCT_FILE_STRIP) |
3775 | 1721 AC_SUBST(TEMPLATE_AR) |
1722 AC_SUBST(TEMPLATE_ARFLAGS) | |
6141 | 1723 AC_SUBST(CRUFT_DLL_DEFS) |
1724 AC_SUBST(OCTAVE_DLL_DEFS) | |
1725 AC_SUBST(OCTINTERP_DLL_DEFS) | |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
1726 AC_SUBST(OCTGUI_DLL_DEFS) |
7825
13871b7de124
Import sources for OpenGL-based renderer.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7789
diff
changeset
|
1727 AC_SUBST(OCTGRAPHICS_DLL_DEFS) |
4104 | 1728 AC_SUBST(library_path_var) |
9613
16907d1153d1
attempt to fix LD_PRELOAD for Cygwin
John W. Eaton <jwe@octave.org>
parents:
9610
diff
changeset
|
1729 AC_SUBST(ldpreloadsep) |
4102 | 1730 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1731 ### More configure argument checking related to linking |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1732 |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1733 AC_ARG_ENABLE([no-undefined], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1734 [AS_HELP_STRING([--disable-no-undefined], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
1735 [don't pass -no-undefined to libtool when linking Octave and its shared libraries])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1736 [case $enableval in |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1737 yes) NO_UNDEFINED_LDFLAG="-no-undefined" ;; |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1738 no) NO_UNDEFINED_LDFLAG="" ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1739 *) AC_MSG_ERROR([bad value $enableval for --disable-no-undefined]) ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1740 esac], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1741 [NO_UNDEFINED_LDFLAG="-no-undefined"]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1742 AC_SUBST(NO_UNDEFINED_LDFLAG) |
4388 | 1743 |
13024
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1744 AC_ARG_ENABLE([link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1745 [AS_HELP_STRING([--enable-link-all-dependencies], |
f3c53fea9fb5
maint: more linking tweaks
John W. Eaton <jwe@octave.org>
parents:
13016
diff
changeset
|
1746 [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1747 [case $enableval in |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1748 yes) link_all_deps=true ;; |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1749 no) link_all_deps=false ;; |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1750 *) AC_MSG_ERROR([bad value $enableval for --enable-link-all-depenencies]) |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1751 ;; |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1752 esac], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1753 [link_all_deps=false]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1754 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = true]) |
3249 | 1755 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1756 ## Dynamic linking is now enabled only if we are building shared |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1757 ## libs and some API for dynamic linking has been detected. |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
1758 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1759 ## FIXME: A lot of the following duplicates the functionality of |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1760 ## code generated by the dlopen option for LT_INIT. |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1761 |
3705 | 1762 LD_CXX='$(CXX)' |
3232 | 1763 RDYNAMIC_FLAG= |
4110 | 1764 DL_API_MSG="" |
1765 dlopen_api=false | |
1766 shl_load_api=false | |
1767 loadlibrary_api=false | |
4163 | 1768 dyld_api=false |
4110 | 1769 |
4163 | 1770 if $SHARED_LIBS || $ENABLE_DYNAMIC_LINKING; then |
1771 | |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1772 case $lt_cv_dlopen in |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1773 dlopen) |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1774 dlopen_api=true |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1775 DL_API_MSG="(dlopen)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1776 AC_DEFINE(HAVE_DLOPEN_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1777 [Define to 1 if your system has dlopen, dlsym, dlerror, and dlclose for dynamic linking.]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1778 OCTAVE_CXX_FLAG([-rdynamic], [RDYNAMIC_FLAG=-rdynamic]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1779 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1780 shl_load) |
4189 | 1781 shl_load_api=true |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1782 DL_API_MSG="(shl_load)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1783 AC_DEFINE(HAVE_SHL_LOAD_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1784 [Define to 1 if your system has shl_load and shl_findsym for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1785 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1786 LoadLibrary) |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1787 loadlibrary_api=true |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1788 DL_API_MSG="(LoadLibrary)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1789 AC_DEFINE(HAVE_LOADLIBRARY_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1790 [Define to 1 if your system has LoadLibrary for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1791 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1792 dyld) |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1793 dyld_api=true |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1794 DL_API_MSG="(dyld)" |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1795 AC_DEFINE(HAVE_DYLD_API, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
1796 [Define to 1 if your system has dyld for dynamic linking.]) |
10036
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1797 ;; |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1798 esac |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1799 |
0cabc95f0833
configure.ac: use libtool cache variables to simplify checks for dynamic linking api
John W. Eaton <jwe@octave.org>
parents:
10029
diff
changeset
|
1800 DL_LIBS="$lt_cv_dlopen_libs" |
9515 | 1801 AC_SUBST(DL_LIBS) |
4110 | 1802 |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1803 ## Disable dynamic linking if capability is not present. |
4163 | 1804 if $dlopen_api || $shl_load_api || $loadlibrary_api || $dyld_api; then |
15876
84b38d6442e6
configure.ac: Replace uses of 'true' as a command.
Rik <rik@octave.org>
parents:
15875
diff
changeset
|
1805 : # some form of dynamic linking present |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1806 else |
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1807 ENABLE_DYNAMIC_LINKING=false |
1978 | 1808 fi |
4163 | 1809 fi |
1810 | |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1811 if $ENABLE_DYNAMIC_LINKING; then |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
1812 AC_DEFINE(ENABLE_DYNAMIC_LINKING, 1, [Define to 1 if using dynamic linking.]) |
13010
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1813 fi |
edc5ec6e949b
maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents:
12772
diff
changeset
|
1814 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1815 AM_CONDITIONAL([AMCOND_ENABLE_DYNAMIC_LINKING], |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1816 [test x"$ENABLE_DYNAMIC_LINKING" = x"true"]) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1817 |
4163 | 1818 if $SHARED_LIBS; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1819 LIBOCTINTERP="-loctinterp$SHLLINKEXT" |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1820 LIBOCTAVE="-loctave$SHLLINKEXT" |
1978 | 1821 else |
15195 | 1822 LIBOCTINTERP='$(top_builddir)/libinterp/liboctinterp.$(LIBEXT)' |
10004
e517da95bf98
Eliminate TOPDIR variable in favor of built-in automake variables
Rik <rdrider0-list@yahoo.com>
parents:
10003
diff
changeset
|
1823 LIBOCTAVE='$(top_builddir)/liboctave/liboctave.$(LIBEXT)' |
1664 | 1824 fi |
4163 | 1825 |
4110 | 1826 AC_SUBST(LD_CXX) |
3232 | 1827 AC_SUBST(RDYNAMIC_FLAG) |
4128 | 1828 AC_SUBST(ENABLE_DYNAMIC_LINKING) |
4110 | 1829 AC_SUBST(LIBOCTINTERP) |
1830 AC_SUBST(LIBOCTAVE) | |
1901 | 1831 |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
1832 |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1833 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1834 CROSS_TOOL_PREFIX="$ac_tool_prefix" |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1835 MKOCTFILE_AR='$(shell echo $(AR) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1836 MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1837 MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1838 MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1839 MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1840 MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1841 MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | sed "s,$(CROSS_TOOL_PREFIX),,")' |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1842 else |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1843 MKOCTFILE_AR="$AR" |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1844 MKOCTFILE_CC="$CC" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1845 MKOCTFILE_CXX="$CXX" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1846 MKOCTFILE_DL_LD="$DL_LD" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1847 MKOCTFILE_F77="$F77" |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1848 MKOCTFILE_LD_CXX="$LD_CXX" |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1849 MKOCTFILE_RANLIB="$RANLIB" |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1850 fi |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1851 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1852 AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR]) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1853 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1854 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1855 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1856 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77]) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1857 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX]) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1858 AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB]) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1859 AC_SUBST(CROSS_TOOL_PREFIX) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1860 AC_SUBST(MKOCTFILE_AR) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1861 AC_SUBST(MKOCTFILE_CC) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1862 AC_SUBST(MKOCTFILE_CXX) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1863 AC_SUBST(MKOCTFILE_DL_LD) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1864 AC_SUBST(MKOCTFILE_F77) |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1865 AC_SUBST(MKOCTFILE_LD_CXX) |
15945
a653526ea4a5
use mkoctfile, not octave_config_info to get default pkg compiler tools
John W. Eaton <jwe@octave.org>
parents:
15938
diff
changeset
|
1866 AC_SUBST(MKOCTFILE_RANLIB) |
15932
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1867 |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1868 ### Check for existence of various libraries |
747dd82082c8
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
John W. Eaton <jwe@octave.org>
parents:
15902
diff
changeset
|
1869 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1870 ## OS-specific test for dirent, opendir. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1871 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1872 mingw*) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1873 if test $have_msvc = yes; then |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1874 AC_CHECK_LIB([dirent], [opendir]) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1875 LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1876 else |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1877 LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" |
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1878 fi |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
1879 LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 1880 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
1881 msdosmsvc) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1882 AC_CHECK_LIB([dirent], [opendir]) |
10123
8590f3c51868
Fix a few MSVC-related problems and partially re-enable MSVC compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
10092
diff
changeset
|
1883 LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" |
956 | 1884 ;; |
1885 esac | |
1886 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1887 ## Find a termlib to use. |
15302
a8cfbc1911e4
build: Set TERM_LIBS before checking for READLINE.
Rik <rik@octave.org>
parents:
15298
diff
changeset
|
1888 OCTAVE_CHECK_LIB_TERMLIB |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
1889 |
869 | 1890 ### Checks for header files. |
1891 | |
832 | 1892 AC_HEADER_DIRENT |
1377 | 1893 AC_HEADER_SYS_WAIT |
2097 | 1894 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1895 ## C headers |
4051 | 1896 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1897 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1898 AC_CHECK_HEADERS([curses.h direct.h dlfcn.h floatingpoint.h grp.h]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1899 AC_CHECK_HEADERS([ieeefp.h inttypes.h locale.h memory.h ncurses.h]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1900 AC_CHECK_HEADERS([poll.h pthread.h pwd.h sunmath.h sys/ioctl.h]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1901 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h ]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1902 AC_CHECK_HEADERS([sys/select.h sys/utsname.h termcap.h]) |
3887 | 1903 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1904 ## C++ headers |
4051 | 1905 |
1906 AC_LANG_PUSH(C++) | |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1907 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1908 AC_CHECK_HEADERS([sstream]) |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1909 OCTAVE_UNORDERED_MAP_HEADERS |
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1910 |
4051 | 1911 AC_LANG_POP(C++) |
1912 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1913 ## Find a termio header to include. |
1901 | 1914 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1915 AC_CHECK_HEADERS([termios.h], have_termios_h=yes, have_termios_h=no) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1916 AC_CHECK_HEADERS([termio.h], have_termio_h=yes, have_termio_h=no) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1917 AC_CHECK_HEADERS([sgtty.h], have_sgtty_h=yes, have_sgtty_h=no) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1918 AC_CHECK_HEADERS([fnmatch.h], have_fnmatch_h=yes, have_fnmatch_h=no) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1919 AC_CHECK_HEADERS([conio.h], have_conio_h=yes, have_conio_h=no) |
3249 | 1920 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1921 if test $have_termios_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1922 && test $have_termio_h != yes \ |
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1923 && test $have_sgtty_h != yes; then |
4064 | 1924 AC_MSG_WARN([I couldn't find termios.h, termio.h, or sgtty.h!]) |
832 | 1925 fi |
869 | 1926 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1927 ## For MSVC compilers, avoid #define of min/max from windows.h header |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
1928 if test $have_msvc = yes; then |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1929 AC_DEFINE(NOMINMAX, 1, [Define to 1 if you want to avoid min/max macro definition in Windows headers.]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1930 fi |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1931 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1932 ### Determine types and size of types. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1933 |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1934 AC_TYPE_INT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1935 AC_TYPE_MODE_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1936 AC_TYPE_OFF_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1937 AC_TYPE_PID_T |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1938 AC_TYPE_SIZE_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1939 AC_TYPE_SSIZE_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1940 AC_TYPE_UID_T |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1941 AC_TYPE_UINT64_T |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1942 AC_CHECK_TYPES([dev_t, ino_t]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1943 AC_CHECK_TYPES([long long int, unsigned long long int]) |
15172
c7d466a02065
configure.ac: Add checks for a few missing types.
Rik <rik@octave.org>
parents:
15170
diff
changeset
|
1944 AC_CHECK_TYPES([ptrdiff_t]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1945 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1946 ## How big are ints and how are they oriented? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1947 ## These could probably be eliminated in favor of run-time checks. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1948 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1949 AC_CHECK_SIZEOF([short]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1950 AC_CHECK_SIZEOF([int]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1951 AC_CHECK_SIZEOF([long]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1952 AC_CHECK_SIZEOF([long long]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1953 ## Check for long double type (for 64-bit integers) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1954 AC_CHECK_SIZEOF([long double]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1955 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1956 ### Check structures and existence of necessary members |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1957 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1958 AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
1959 struct stat.st_rdev]) |
15134
edae65062740
build: Move unordered_map header tests to acinclude.m4 and add caching of results.
Rik <rik@octave.org>
parents:
15130
diff
changeset
|
1960 AC_CHECK_MEMBERS([struct group.gr_passwd]) |
3887 | 1961 |
1186 | 1962 AC_STRUCT_TIMEZONE |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8940
diff
changeset
|
1963 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1964 ### Check compiler characteristics. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1965 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1966 ## Does compiler have support for new friend template declarations? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1967 OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1968 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1969 ## Does reinterpret_cast fail for function pointers? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1970 OCTAVE_CXX_BROKEN_REINTERPRET_CAST |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1971 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1972 ## Check if C++ compiler allows placement delete. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1973 OCTAVE_CXX_PLACEMENT_DELETE |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1974 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1975 ## Check if C++ compiler can auto allocate variable sized arrays. |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
1976 OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1977 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1978 ## Check that C compiler and libraries support IEEE754 data format. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1979 OCTAVE_IEEE754_DATA_FORMAT |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1980 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1981 ## Is C++ runtime library ISO compliant? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1982 OCTAVE_CXX_ISO_COMPLIANT_LIBRARY |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1983 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1984 ## Are bit_and, bit_or, and bit_xor defined as templated operators? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1985 OCTAVE_CXX_BITWISE_OP_TEMPLATES |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1986 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1987 ## Can complex class set components independently? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1988 OCTAVE_CXX_COMPLEX_SETTERS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1989 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1990 ## Are there functions to access real/imag parts of numbers via references? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1991 OCTAVE_CXX_COMPLEX_REFERENCE_ACCESSORS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1992 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1993 ## Check if fast integer arithmetics based on bit tricks is available. |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1994 OCTAVE_FAST_INT_OPS |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1995 |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1996 ## Does the C compiler handle alloca() and const correctly? |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1997 AC_FUNC_ALLOCA |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
1998 |
15130
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
1999 ## Does the C compiler support Automake subdir-objects option? |
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
2000 AM_PROG_CC_C_O |
f635710b3090
configure.ac: Add AM_PROG_CC_C_O check for Automake subdir-objects support in C compiler.
Rik <rik@octave.org>
parents:
15127
diff
changeset
|
2001 |
15142
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2002 ### gnulib initialization: part 2 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2003 ### After all include and path modifications have taken place |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2004 ### and at the same priority level as function checks. |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2005 |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2006 gl_INIT |
f4684192158e
configure.ac: Split gnulib initialization into 2 parts to match recommended usage.
Rik <rik@octave.org>
parents:
15141
diff
changeset
|
2007 |
1788 | 2008 ### Checks for functions and variables. |
869 | 2009 |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2010 dnl These checks define/undefine HAVE_FUNCNAME in config.h. |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2011 dnl Code tests HAVE_FUNCNAME and either uses function or provides workaround. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2012 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2013 AC_CHECK_FUNCS([canonicalize_file_name dup2]) |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2014 AC_CHECK_FUNCS([endgrent endpwent execvp expm1 expm1f fork]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2015 AC_CHECK_FUNCS([getegid geteuid getgid getgrent getgrgid getgrnam]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2016 AC_CHECK_FUNCS([getpgrp getpid getppid getpwent getpwuid getuid]) |
15850
ffd1a99733bd
build: Check for isascii() before using it.
Rik <rik@octave.org>
parents:
15846
diff
changeset
|
2017 AC_CHECK_FUNCS([isascii kill]) |
ffd1a99733bd
build: Check for isascii() before using it.
Rik <rik@octave.org>
parents:
15846
diff
changeset
|
2018 AC_CHECK_FUNCS([lgamma lgammaf lgamma_r lgammaf_r]) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2019 AC_CHECK_FUNCS([log1p log1pf pipe]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2020 AC_CHECK_FUNCS([realpath resolvepath roundl]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2021 AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2022 AC_CHECK_FUNCS([tempnam tgammaf toascii]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2023 AC_CHECK_FUNCS([umask uname waitpid]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2024 AC_CHECK_FUNCS([_kbhit]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2025 |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2026 dnl There are no workarounds in the code for missing these functions. |
15454
9b9f6dba39e0
build: Use putenv module from gnulib.
Rik <rik@octave.org>
parents:
15453
diff
changeset
|
2027 AC_CHECK_FUNCS([modf pow sqrt sqrtf], [], |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2028 [AC_MSG_ERROR([Missing function required to build Octave])]) |
1300 | 2029 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2030 ## exp2, round, tgamma function checks |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2031 AC_LANG_PUSH(C++) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2032 AC_CHECK_DECLS([exp2, round, tgamma], [], [], [[#include <cmath>]]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2033 AC_CHECK_FUNCS([exp2 round tgamma]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2034 AH_VERBATIM([Z_FUNCS_AND_DECLS], [ |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2035 #if defined (__cplusplus) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2036 extern "C" { |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2037 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2038 #if HAVE_EXP2 && ! HAVE_DECL_EXP2 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2039 double exp2 (double); |
9171
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2040 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2041 #if HAVE_ROUND && ! HAVE_DECL_ROUND |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2042 double round (double); |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2043 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2044 #if HAVE_TGAMMA && ! HAVE_DECL_TGAMMA |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2045 double tgamma (double); |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2046 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2047 #if defined (__cplusplus) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2048 } |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2049 #endif |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2050 ]) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2051 AC_LANG_POP(C++) |
7500cfff4728
configure.in: provide decls for exp2, round, and tgamma if they are missing
Peter O'Gorman <pogma@thewrittenword.com>
parents:
9091
diff
changeset
|
2052 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2053 ## Look in <cmath> for the IEEE functions isnan, isinf, isfinite that we need. |
4163 | 2054 |
15141
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2055 OCTAVE_CHECK_FUNC_CMATH(isnan) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2056 OCTAVE_CHECK_FUNC_CMATH(isinf) |
4388f6518440
build: Overhaul acinclude.m4 macros.
Rik <rik@octave.org>
parents:
15134
diff
changeset
|
2057 OCTAVE_CHECK_FUNC_CMATH(isfinite) |
4110 | 2058 |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2059 ## Check for Inf and NaN functions |
956 | 2060 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2061 case $canonical_host_type in |
1384 | 2062 m68k-hp-hpux*) |
15874
11d5a7276b6d
configure.ac: Remove some no longer accurate comments.
Rik <rik@octave.org>
parents:
15873
diff
changeset
|
2063 ## I am told that Inf and NaN don't work on m68k HP sytems. |
956 | 2064 ;; |
2065 *) | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2066 AC_CHECK_FUNCS([finite isnan isinf signbit]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2067 AC_CHECK_FUNCS([_finite _isnan]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2068 AC_CHECK_DECLS([signbit], , , [#include <math.h>]) |
6103 | 2069 ;; |
2070 esac | |
2071 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2072 ## Check for nonstandard, but common math functions, that we need. |
1076 | 2073 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2074 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2075 AC_CHECK_FUNCS([acosh acoshf asinh asinhf atanh atanhf cbrt cbrtf]) |
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2076 AC_CHECK_FUNCS([erf erff erfc erfcf exp2f hypotf _hypotf log2 log2f]) |
1076 | 2077 |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2078 ## Check for math defines such as M_LN2 in math.h |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2079 AC_CACHE_CHECK([for MATH DEFINES in math.h], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2080 [octave_cv_header_math_defines], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2081 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2082 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2083 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2084 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2085 octave_cv_header_math_defines=yes, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2086 octave_cv_header_math_defines=no) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2087 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2088 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2089 if test $octave_cv_header_math_defines = no; then |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2090 ## Check again and try defining _USE_MATH_DEFINES |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2091 AC_CACHE_CHECK([whether _USE_MATH_DEFINES needs to be defined], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2092 [octave_cv_header__use_math_defines], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2093 [save_CPPFLAGS="$CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2094 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2095 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2096 #include <math.h> |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2097 ]], [[ |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2098 double x = M_LN2;]])], |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2099 octave_cv_header__use_math_defines=yes, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2100 octave_cv_header__use_math_defines=no) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2101 CPPFLAGS="$save_CPPFLAGS" |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2102 ]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2103 if test $octave_cv_header__use_math_defines = yes; then |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2104 octave_cv_header_math_defines=yes |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2105 AC_DEFINE(_USE_MATH_DEFINES, 1, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2106 [Define to 1 if _USE_MATH_DEFINES is required to get math constants like M_LN2.]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2107 CPPFLAGS="$CPPFLAGS -D_USE_MATH_DEFINES" |
1978 | 2108 fi |
15852
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2109 fi |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2110 |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2111 if test $octave_cv_header_math_defines = yes; then |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2112 AC_DEFINE(HAVE_MATH_DEFINES, 1, |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2113 [Define to 1 if defines such as M_PI are available in math.h]) |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2114 else |
cd115ec92248
build: Check that system has math defines such as M_PI.
Rik <rik@octave.org>
parents:
15850
diff
changeset
|
2115 AC_MSG_ERROR([MATH DEFINES in math.h such as M_PI are required to build Octave]) |
4163 | 2116 fi |
2117 | |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2118 ## Windows-specific tests for extra #defines |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2119 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2120 msdosmsvc | mingw*) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2121 AC_MSG_CHECKING([for required _WIN32_WINNT]) |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2122 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2123 #include <windows.h> |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2124 #if _WIN32_WINNT < 0x0403 |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2125 #error "Wrong version" |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2126 #endif |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2127 ]], [])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2128 [AC_MSG_RESULT([none])], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2129 [AC_DEFINE(_WIN32_WINNT, 0x0403, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2130 [Define to 0x0403 to access InitializeCriticalSectionAndSpinCount.]) |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2131 AC_MSG_RESULT([0x0403])]) |
956 | 2132 ;; |
2133 esac | |
2134 | |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2135 ## Windows-specific use of functions |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2136 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2137 msdosmsvc | mingw*) |
15452
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2138 AC_CHECK_FUNCS([setvbuf], [], |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2139 [AC_MSG_ERROR([Missing function required to build Octave])]) |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2140 ;; |
4d960b078272
build: Remove unnecessary AC_CHECK_FUNCS calls.
Rik <rik@octave.org>
parents:
15451
diff
changeset
|
2141 esac |
3130 | 2142 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2143 ## Cygwin kluge for getrusage. |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2144 AC_CHECK_FUNCS([getrusage]) |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2145 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2146 cygwin*) |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2147 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2148 [Define to 1 if your struct rusage only has time information.]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2149 ;; |
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2150 esac |
869 | 2151 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2152 ## Check for CGDisplayBitsPerPixel function on Mac OSX systems with Carbon |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2153 if test $have_framework_carbon = yes; then |
15145
142e377e7e28
configure.ac: Don't run OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL unless Carbon Framework is present.
Rik <rik@octave.org>
parents:
15143
diff
changeset
|
2154 OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL |
142e377e7e28
configure.ac: Don't run OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL unless Carbon Framework is present.
Rik <rik@octave.org>
parents:
15143
diff
changeset
|
2155 fi |
3887 | 2156 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2157 AC_CHECK_FUNCS([getpwnam], [], [AC_CHECK_LIB([sun], [getpwnam])]) |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2158 |
1388 | 2159 AC_FUNC_CLOSEDIR_VOID |
1225 | 2160 |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2161 ## Check return type of matherr() |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2162 AC_CACHE_CHECK([for struct exception in math.h], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2163 [octave_cv_func_matherr_type], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2164 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2165 #include <math.h> |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2166 ]], [[ |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2167 struct exception *x; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2168 x->type; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2169 x->name; |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2170 ]])], |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2171 octave_cv_func_matherr_type=yes, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2172 octave_cv_func_matherr_type=no) |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2173 ]) |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2174 if test $octave_cv_func_matherr_type = yes; then |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2175 AC_DEFINE(EXCEPTION_IN_MATH, 1, |
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2176 [Define to 1 if math.h declares struct exception for matherr().]) |
2488 | 2177 fi |
15143
e412d18d4fa5
configure.ac: Allow caching of EXCEPTION_IN_MATH test.
Rik <rik@octave.org>
parents:
15142
diff
changeset
|
2178 |
15125
067699edef86
configure.ac: Re-organize to follow Autoconf layout guidelines
Rik <rik@octave.org>
parents:
15123
diff
changeset
|
2179 ## Signal stuff. |
869 | 2180 |
5844 | 2181 AC_CHECK_DECLS([sys_siglist], [], [], |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2182 [[#include <signal.h> |
5844 | 2183 /* NetBSD declares sys_siglist in unistd.h. */ |
2184 #if HAVE_UNISTD_H | |
2185 # include <unistd.h> | |
2186 #endif | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2187 ]]) |
2633 | 2188 |
16012
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2189 ### Need to disable building documentation if either gnuplot or |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2190 ### makeinfo are missing. Skip this warning if building docs was |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2191 ### disabled with a configure option. |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2192 |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2193 if test -n "$DOCDIR"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2194 if test -n "$warn_gnuplot"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2195 DOCDIR= |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2196 warn_docs_gnuplot="building documentation disabled because gnuplot was not found; make dist will fail" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2197 OCTAVE_CONFIGURE_WARNING([warn_docs_gnuplot]) |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2198 fi |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2199 if test -n "$warn_makeinfo"; then |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2200 DOCDIR= |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2201 warn_docs_makeinfo="building documentation disabled because makeinfo was not found; make dist will fail" |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2202 OCTAVE_CONFIGURE_WARNING([warn_docs_makeinfo]) |
ca37c6023a79
don't abort configure if makeinfo is missing
John W. Eaton <jwe@octave.org>
parents:
15971
diff
changeset
|
2203 fi |
14579
4dc85c4f151b
Disable building documentation if gnuplot not found
Mike Miller <mtmiller@ieee.org>
parents:
14561
diff
changeset
|
2204 fi |
4dc85c4f151b
Disable building documentation if gnuplot not found
Mike Miller <mtmiller@ieee.org>
parents:
14561
diff
changeset
|
2205 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test -n "$DOCDIR"]) |
2032 | 2206 |
4645 | 2207 ### Maybe add -Wall, -W, and -Wshadow to compiler flags now that we're |
4587 | 2208 ### done feature testing. |
869 | 2209 |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2210 GCC_EXTRA_FLAGS="-Wall -W -Wshadow -Wformat -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wcast-align -Wcast-qual" |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2211 |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2212 GXX_EXTRA_FLAGS="-Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual" |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2213 |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2214 try_extra_warning_flags=true |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2215 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2216 AC_ARG_ENABLE([extra-warning-flags], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2217 [AS_HELP_STRING([--disable-extra-warning-flags], |
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2218 [don't add -Wall, -W, -Wshadow, and -Wold-style-cast options to CFLAGS and CXXFLAGS])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2219 [if test "$enableval" = no; then |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2220 try_extra_warning_flags=false |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2221 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2222 []) |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2223 |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2224 if $try_extra_warning_flags; then |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2225 for flag in $GCC_EXTRA_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2226 OCTAVE_CC_FLAG([$flag], [ |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2227 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2228 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2229 done |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2230 for flag in $GXX_EXTRA_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2231 OCTAVE_CXX_FLAG([$flag], [ |
11514
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2232 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2233 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
a1386fab2a02
configure.ac: eliminate some code duplication when checking for extra compiler flags
John W. Eaton <jwe@octave.org>
parents:
11513
diff
changeset
|
2234 done |
405 | 2235 fi |
869 | 2236 |
11513
a2289858dcb2
more warning flags for GCC if configured with --enable-extra-warning-flags (on by default)
John W. Eaton <jwe@octave.org>
parents:
11511
diff
changeset
|
2237 GCC_STRICT_FLAGS="-Wconversion" |
2813 | 2238 |
11513
a2289858dcb2
more warning flags for GCC if configured with --enable-extra-warning-flags (on by default)
John W. Eaton <jwe@octave.org>
parents:
11511
diff
changeset
|
2239 GXX_STRICT_FLAGS="-Wconversion -Weffc++" |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2240 |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2241 try_strict_warning_flags=false |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2242 |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2243 AC_ARG_ENABLE([strict-warning-flags], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2244 [AS_HELP_STRING([--enable-strict-warning-flags], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2245 [add extra strict warning options to CFLAGS and CXXFLAGS])], |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2246 [if test "$enableval" = yes; then |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2247 try_strict_warning_flags=true |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2248 fi], |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2249 []) |
2813 | 2250 |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2251 if $try_strict_warning_flags; then |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2252 for flag in $GCC_STRICT_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2253 OCTAVE_CC_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2254 WARN_CFLAGS="$WARN_CFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2255 AC_MSG_RESULT([adding $flag to WARN_CFLAGS])]) |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2256 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2257 for flag in $GXX_STRICT_FLAGS; do |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2258 OCTAVE_CXX_FLAG([$flag], [ |
8938
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2259 WARN_CXXFLAGS="$WARN_CXXFLAGS $flag"; |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2260 AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])]) |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2261 done |
35e18344fae8
configure.in: options for compiler warning flags
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2262 fi |
2813 | 2263 |
4626 | 2264 AC_SUBST(WARN_CFLAGS) |
2265 AC_SUBST(WARN_CXXFLAGS) | |
2266 | |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2267 ### Check for Java. |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2268 |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2269 build_java=true |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2270 AC_ARG_ENABLE([java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2271 [AS_HELP_STRING([--disable-java], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2272 [disable Java interface])], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2273 [if test "$enableval" = no; then |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2274 build_java=false |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2275 fi], |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2276 []) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2277 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2278 AC_ARG_WITH([java-homedir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2279 [AS_HELP_STRING([--with-java-homedir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2280 [Java JDK directory in DIR])], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2281 [JAVA_HOMEDIR="$withval"]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2282 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2283 AC_ARG_WITH([java-includedir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2284 [AS_HELP_STRING([--with-java-includedir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2285 [look for java include file <jni.h> in DIR])], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2286 [JAVA_CPPFLAGS="$withval"], [JAVA_CPPFLAGS=""]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2287 |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2288 AC_ARG_WITH([java-libdir], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2289 [AS_HELP_STRING([--with-java-libdir=DIR], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2290 [look for java library libjvm in DIR])], |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2291 [JAVA_LDPATH="$withval"], [JAVA_LDPATH=""]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2292 |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2293 ## Grab JAVA_HOME from environment variable if it exists |
15761
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2294 AC_ARG_VAR([JAVA_HOME], [path to Java JDK installation]) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2295 ## But --with-java-homedir option overrides environment variable |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2296 if test -n "$JAVA_HOMEDIR"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2297 JAVA_HOME=$JAVA_HOMEDIR |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2298 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2299 JAVA= |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2300 JAVAC= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2301 JAR= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2302 JAVA_LIBS= |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2303 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2304 ## Fake loop so that "break" can be used to skip code blocks. |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2305 while test $build_java = true |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2306 do |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2307 ## Unset build_java. Variable is set only if all configuration tests pass. |
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2308 build_java=false |
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2309 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2310 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME. |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2311 if test -z "$JAVA_HOME"; then |
15761
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2312 AC_MSG_WARN([JAVA_HOME environment variable not initialized.]) |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2313 AC_MSG_WARN([Auto-detection will proceed but is unreliable.]) |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2314 fi |
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2315 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2316 ## Search for a viable Java executable. |
15761
9f3656ada658
configure.ac: Add warning message if JAVA_HOME variable is not set.
Rik <rik@octave.org>
parents:
15756
diff
changeset
|
2317 if test -z "$JAVA_HOME"; then |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2318 JAVA_PATH="$PATH" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2319 else |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2320 JAVA_PATH="${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/jre/bin$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2321 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2322 AC_PATH_PROG(JAVA, java, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2323 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2324 if test -z "$JAVA"; then |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2325 AC_MSG_WARN([No Java executable found. Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2326 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2327 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2328 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2329 if test -z "$JAVA_HOME"; then |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2330 ## Find JAVA_HOME for JRE by running java and querying properties. |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2331 JAVA_TMP_HOME=`"$JAVA" -classpath ${srcdir}/build-aux OctJavaQry JAVA_HOME` |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2332 ## Strip directory back to top-level installation dir (JAVA_HOME for JDK). |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2333 JAVA_HOME=`echo $JAVA_TMP_HOME | sed -e 's|[[/\\]]bin[[/\\]]\?$||' | sed -e 's|[[/\\]]jre[[/\\]]\?$||'` |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2334 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2335 |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2336 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2337 mingw* | msdosmsvc) |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2338 ## Under Win32 platform, we want JAVA_HOME to be in MSYS format, that is |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2339 ## without colon and backslashes, as it is also used as path separator. |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2340 ## Use quoted paths as Java may be installed in a path with whitespaces |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2341 ## (e.g. C:\Program Files\Java\...). |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2342 if test -n "$JAVA_HOME"; then |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2343 JAVA_HOME=`cd "$JAVA_HOME" && pwd` |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2344 ## Maybe this will be useful in the future, as native Java won't |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2345 ## understand MSYS paths. |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2346 JAVA_HOME_NATIVE=`cd "$JAVA_HOME" && pwd -W` |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2347 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2348 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2349 *) |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2350 JAVA_HOME_NATIVE="$JAVA_HOME" |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2351 ;; |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2352 esac |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2353 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2354 ## Amend search path for JAVAC and JAR. |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2355 if test -z "$JAVA_HOME"; then |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2356 JAVA_PATH="$PATH" |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2357 else |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2358 JAVA_PATH="${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2359 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2360 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2361 AC_PATH_PROG(JAVAC, javac, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2362 AC_PATH_PROG(JAR, jar, [], [$JAVA_PATH]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2363 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2364 if test -z "$JAVAC" || test -z "$JAR"; then |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2365 AC_MSG_WARN([No javac compiler or jar executable found. Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2366 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2367 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2368 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2369 ## Check Java version is recent enough. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2370 AC_MSG_CHECKING([for Java version]) |
15839
9a210f7fe62e
Fix incorrect shell double-quoting syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15836
diff
changeset
|
2371 java_version=[`"$JAVA" -version 2>&1 | sed -n -e 's/^java version[^0-9"]*"\([^"]*\)"/\1/p'`] |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2372 AC_MSG_RESULT([$java_version]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2373 java_major=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2374 java_minor=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2375 if test $java_major -ge 1 && test $java_minor -ge 5; then |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2376 : # Version is ok. Do nothing. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2377 else |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2378 AC_MSG_WARN([Java version is too old (< 1.5). Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2379 break |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2380 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2381 |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2382 ## At this point Win32/MSVC systems have enough configuration data. We |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2383 ## assume that all appropriate variables (e.g. INCLUDE and LIB) already have |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2384 ## the required paths to compile and link against JDK. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2385 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2386 msdosmsvc) |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2387 build_java=true |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2388 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2389 AC_DEFINE(HAVE_JAVA, 1, |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2390 [Define to 1 if Java is available and is at least version 1.5]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2391 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2392 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2393 mingw*) |
15854
98f6abe01b5a
configure.ac: Remove unnecessary double quotes in test expression.
Rik <rik@octave.org>
parents:
15852
diff
changeset
|
2394 if test $have_msvc = yes; then |
15836
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2395 build_java=true |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2396 JAVA_LIBS=-ladvapi32 |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2397 AC_DEFINE(HAVE_JAVA, 1, |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2398 [Define to 1 if Java is available and is at least version 1.5]) |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2399 break |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2400 fi |
48a75e6884ec
Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15834
diff
changeset
|
2401 ;; |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2402 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2403 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2404 ## Determine which library file name to search for. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2405 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2406 darwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2407 jvmlib=libjvm.dylib |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2408 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2409 mingw* | cygwin*) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2410 jvmlib=jvm.dll |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2411 ;; |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2412 *) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2413 jvmlib=libjvm.so |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2414 ;; |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2415 esac |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2416 |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2417 AC_MSG_CHECKING([for $jvmlib]) |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2418 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2419 if test -z "$JAVA_LDPATH"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2420 ## Run Java to try and determine library path to libjvm.so. |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2421 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_LDPATH` |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2422 JAVA_TMP_LDPATH=`echo $JAVA_TMP_LDPATH | sed -e "s/${PATH_SEPARATOR}/ /g"` |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2423 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2424 if test -f "$dir/$jvmlib"; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2425 JAVA_LDPATH=$dir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2426 break |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2427 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2428 done |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2429 fi |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2430 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2431 if test -z "$JAVA_LDPATH"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2432 ## Nothing found. Try Java again using bootpath argument. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2433 JAVA_TMP_LDPATH=`$JAVA -classpath ${srcdir}/build-aux OctJavaQry JAVA_BOOTPATH` |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2434 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_TMP_LDPATH}/client ${JAVA_TMP_LDPATH}/server" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2435 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2436 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2437 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2438 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2439 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2440 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2441 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2442 |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2443 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2444 ## Java failed to find it's own library path. Guess wildly. |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2445 JAVA_TMP_LDPATH=`ls -d $JAVA_HOME/jre/lib/*/client` |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2446 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} `ls -d $JAVA_HOME/jre/lib/*/server`" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2447 ## Add some paths that might work on Macs. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2448 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/../Libraries ${JAVA_HOME}/Libraries" |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2449 ## Add some paths that might work on MinGW |
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2450 JAVA_TMP_LDPATH="${JAVA_TMP_LDPATH} ${JAVA_HOME}/bin/client ${JAVA_HOME}/bin/server" |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2451 for dir in $JAVA_TMP_LDPATH; do |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2452 if test -f "$dir/$jvmlib"; then |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2453 JAVA_LDPATH=$dir |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2454 break |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2455 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2456 done |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2457 fi |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2458 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2459 ## Verify value passed in option --with-java-libdir |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2460 if test -n "$JAVA_LDPATH"; then |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2461 if test -f "${JAVA_LDPATH}/$jvmlib"; then |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2462 : # libjvm found |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2463 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2464 JAVA_LDPATH="" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2465 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2466 fi |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2467 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2468 if test -z "$JAVA_LDPATH"; then |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2469 AC_MSG_RESULT([not found]) |
15777
b8bcb2c7f3e8
configure.ac: Search for jvm.dll on MingW/Cygwin platforms for Java.
Rik <rik@octave.org>
parents:
15769
diff
changeset
|
2470 AC_MSG_WARN([Library $jvmlib not found. Octave will not be able to call Java methods.]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2471 break |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2472 else |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2473 AC_MSG_RESULT([$JAVA_LDPATH]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2474 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2475 |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2476 AC_MSG_CHECKING([for include file <jni.h>]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2477 |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2478 ## Java and JVM found. Set up flags. |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2479 case $host_os in |
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2480 darwin*) |
15918
18d1bd2596bf
Sneak the MacOS X "-framework JavaVM" into mkoctfile via LDFLAGS
Ben Abbott <bpabbott@mac.com>
parents:
15905
diff
changeset
|
2481 ## Sneak the -framework flag into mkoctfile via LDFLAGS |
15919
80612fee1110
Fix typo from 18d1bd2596bf (LFLAGS -> LDFLAGS)
Ben Abbott <bpabbott@mac.com>
parents:
15918
diff
changeset
|
2482 LDFLAGS="$LDFLAGS -framework JavaVM" |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2483 ## According to: http://developer.apple.com/unix/crossplatform.html |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2484 ## one must explicitly set the include path. |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2485 ## Unfortunately, the include path keeps moving around. |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2486 if test -n "$JAVA_CPPFLAGS"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2487 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2488 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2489 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I/System/Library/Frameworks/JavaVM.framework/Home/include -I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2490 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2491 JAVA_LIBS="-framework JavaVM" |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2492 ;; |
15863
b316429bfa89
build: Use $host_os variable to clarify configure.ac
Rik <rik@octave.org>
parents:
15857
diff
changeset
|
2493 mingw* | cygwin*) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2494 if test -n "$JAVA_CPPFLAGS"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2495 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/win32" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2496 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2497 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2498 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2499 JAVA_LIBS=-ladvapi32 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2500 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2501 *) |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2502 if test -n "$JAVA_CPPFLAGS"; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2503 JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2504 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2505 JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux" |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2506 fi |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2507 ;; |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2508 esac |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2509 |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
2510 ## Verify jni.h include file exists. |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2511 JNI_PATH=`echo $JAVA_CPPFLAGS | sed -e 's/-I//g'` |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2512 have_jni=false |
15846
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2513 for dir in $JNI_PATH; do |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2514 if test -f "${dir}/jni.h"; then have_jni=true; break; fi |
605488d19cb3
configure.ac: Avoid non-portable sh technique of double-quoted, backtick expressions.
Rik <rik@octave.org>
parents:
15839
diff
changeset
|
2515 done |
15769
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2516 if test $have_jni = true; then |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2517 AC_MSG_RESULT([$dir]) |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2518 else |
eade542fedaa
configure.ac: Add with-java-xxx options to specify homedir, libdir, includedir
Rik <rik@octave.org>
parents:
15766
diff
changeset
|
2519 AC_MSG_RESULT([not found]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2520 AC_MSG_WARN([Include file <jni.h> not found. Octave will not be able to call Java methods.]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2521 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2522 fi |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2523 |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2524 ## Passed all configuration tests. A workable Java installation was found. |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2525 build_java=true |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2526 AC_DEFINE(HAVE_JAVA, 1, |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2527 [Define to 1 if Java is available and is at least version 1.5]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2528 break |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2529 done |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2530 |
15780
f25101b1e37f
configure.ac: Use build_java as internal script variable rather than HAVE_JAVA.
Rik <rik@octave.org>
parents:
15779
diff
changeset
|
2531 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = true]) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2532 AC_SUBST(JAVA) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2533 AC_SUBST(JAVAC) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2534 AC_SUBST(JAR) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2535 AC_SUBST(JAVA_CPPFLAGS) |
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2536 AC_SUBST(JAVA_LIBS) |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2537 AC_DEFINE_UNQUOTED([JAVA_HOME], ["$JAVA_HOME"], [Java home (top-level installation dir)]) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2538 AC_DEFINE_UNQUOTED([JAVA_LDPATH], ["$JAVA_LDPATH"], [Java library path (libjvm)]) |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2539 |
15110
4f6e058e4161
Integrate GUI building with regular octave build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15093
diff
changeset
|
2540 ### GUI/Qt related tests. |
4f6e058e4161
Integrate GUI building with regular octave build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15093
diff
changeset
|
2541 |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2542 QT_CPPFLAGS= |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2543 QT_LDFLAGS= |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2544 QT_LIBS= |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2545 win32_terminal=no |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2546 build_gui=yes |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2547 GUIDIR=libgui |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2548 AC_ARG_ENABLE([gui], |
15238
c4779a180134
avoid confusing --disable-foo (default is yes) configure help messages
John W. Eaton <jwe@octave.org>
parents:
15237
diff
changeset
|
2549 [AS_HELP_STRING([--disable-gui], [don't build the GUI])], |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2550 [if test "$enableval" = no; then build_gui=no; fi], []) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2551 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2552 if test $build_gui = yes; then |
15296
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2553 ## Check for Qt libraries |
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2554 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork], |
f19d0bce85da
build: Add check for Qt libraries to configure.ac.
Rik <rik@octave.org>
parents:
15295
diff
changeset
|
2555 [], |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2556 [AC_MSG_WARN([Qt libraries not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2557 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2558 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2559 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2560 ## Retrieve Qt compilation and linker flags |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2561 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork`" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2562 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork`" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2563 QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork`" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2564 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2565 ## Check for Qt4 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2566 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2567 AC_MSG_WARN([Qt >= 4.0.0 not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2568 build_gui=no |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2569 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2570 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2571 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2572 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2573 AC_CHECK_PROGS(MOC, [moc-qt5 moc-qt4 moc]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2574 AC_CHECK_PROGS(UIC, [uic-qt5 uic-qt4 uic]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2575 AC_CHECK_PROGS(RCC, [rcc]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2576 if test -n "$MOC" && test -n "$UIC" && test -n "$RCC"; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2577 AC_DEFINE(HAVE_QT, 1, |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2578 [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, and rcc))]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2579 else |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2580 AC_MSG_WARN([Qt utility programs moc, uic, and rcc not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2581 build_gui=no |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2582 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2583 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2584 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2585 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2586 OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT |
15298
704ab1b4c369
build: Properly choose qmake if Qt3 and Qt4 are installed (Bug #37101)
Rik <rik@octave.org>
parents:
15297
diff
changeset
|
2587 fi |
15292
637e3b7d6a56
configure.ac: Add check for Qscintilla library before building GUI.
Rik <rik@octave.org>
parents:
15291
diff
changeset
|
2588 |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2589 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2590 ## Check for Qscintilla library which is used in the GUI editor. |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2591 AC_CACHE_CHECK([whether Qscintilla library is installed], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2592 [octave_cv_lib_qscintilla], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2593 [save_CPPFLAGS="$CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2594 save_LDFLAGS="$LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2595 save_LIBS="$LIBS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2596 CPPFLAGS="$QT_CPPFLAGS $CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2597 LDFLAGS="$QT_LDFLAGS $LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2598 LIBS="$QT_LIBS -lqscintilla2" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2599 AC_LANG_PUSH(C++) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2600 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2601 #include <Qsci/qscilexersql.h> |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2602 ]], [[ |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2603 QsciLexerSQL sqlLexer(0); |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2604 ]])], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2605 octave_cv_lib_qscintilla=yes, |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2606 octave_cv_lib_qscintilla=no) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2607 CPPFLAGS="$save_CPPFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2608 LDFLAGS="$save_LDFLAGS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2609 LIBS="$save_LIBS" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2610 AC_LANG_POP([C++]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2611 ]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2612 if test $octave_cv_lib_qscintilla = no; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2613 AC_MSG_WARN([Qscintilla library not found -- disabling built-in GUI editor]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2614 else |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2615 ## Let's assume Qscintilla library is at the same location as |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2616 ## other regular Qt libraries. |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2617 QT_LIBS="$QT_LIBS -lqscintilla2" |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2618 OCTAVE_CHECK_FUNC_FINDFIRST_MODERN |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2619 AC_DEFINE(HAVE_QSCINTILLA, 1, |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2620 [Define to 1 if the QScintilla library and header files are available]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2621 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2622 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2623 AC_CHECK_FUNCS([setlocale], [], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2624 [AC_MSG_WARN([setlocale not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2625 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2626 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2627 if test $build_gui = yes; then |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2628 case $host_os in |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2629 mingw* | msdosmsvc*) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2630 AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2631 [AC_MSG_WARN([setvbuf not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2632 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2633 ;; |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2634 *) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2635 AC_CHECK_HEADERS([pty.h libutil.h util.h]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2636 AC_SEARCH_LIBS([openpty], [util], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2637 [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2638 AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [], |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2639 [AC_MSG_ERROR([At least one of chmod, chown, ftruncate, mmap, and munmap not found -- disabling GUI]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2640 build_gui=no]) |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2641 ;; |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2642 esac |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2643 fi |
15117
3735a0e783cb
more tweaks for the gui build
John W. Eaton <jwe@octave.org>
parents:
15116
diff
changeset
|
2644 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2645 fi |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2646 |
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2647 if test $build_gui = no; then |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2648 ## GUI disabled. Eliminate building GUIDIR directory |
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2649 GUIDIR= |
15117
3735a0e783cb
more tweaks for the gui build
John W. Eaton <jwe@octave.org>
parents:
15116
diff
changeset
|
2650 fi |
15873
7d300b85ee25
allow build to proceed if either Qt or QScintilla is missing
John W. Eaton <jwe@octave.org>
parents:
15863
diff
changeset
|
2651 AM_CONDITIONAL([AMCOND_BUILD_GUI], [test $build_gui = yes]) |
15156
141b0b108292
allow building without gui to work
John W. Eaton <jwe@octave.org>
parents:
15150
diff
changeset
|
2652 AM_CONDITIONAL([WIN32_TERMINAL], [test $win32_terminal = yes]) |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2653 AC_SUBST(QT_CPPFLAGS) |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2654 AC_SUBST(QT_LDFLAGS) |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2655 AC_SUBST(QT_LIBS) |
15297
2f0b74cf8b4d
configure.ac: Conditionally build GUI using same construct as conditionally building DOCs.
Rik <rik@octave.org>
parents:
15296
diff
changeset
|
2656 AC_SUBST(GUIDIR) |
15116
3d7a7ae53bbf
Further integration of GUI in the build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15115
diff
changeset
|
2657 |
1146 | 2658 ### Run configure in subdirectories. |
2659 | |
1304 | 2660 export CC |
2661 export CXX | |
2662 export F77 | |
2663 | |
3923 | 2664 ### Some things to add to the bottom of config.h. |
2665 | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2666 dnl ------------------------------------------------------------ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2667 |
3923 | 2668 AH_BOTTOM([ |
10411 | 2669 #if !defined (GNULIB_NAMESPACE) |
2670 #define GNULIB_NAMESPACE gnulib | |
2671 #endif | |
2672 | |
3923 | 2673 #if defined (__GNUC__) |
5389 | 2674 #define GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__)) |
15127
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2675 #define HAVE_ATTR_DEPRECATED |
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2676 |
3923 | 2677 #define GCC_ATTR_NORETURN __attribute__ ((__noreturn__)) |
15127
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2678 #define HAVE_ATTR_NORETURN |
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2679 |
3923 | 2680 #define GCC_ATTR_UNUSED __attribute__ ((__unused__)) |
15127
87411930d6c4
avoid "function declared 'noreturn' has a return statement" warning.
John W. Eaton <jwe@octave.org>
parents:
15126
diff
changeset
|
2681 #define HAVE_ATTR_UNUSED |
3923 | 2682 #else |
5389 | 2683 #define GCC_ATTR_DEPRECATED |
3923 | 2684 #define GCC_ATTR_NORETURN |
2685 #define GCC_ATTR_UNUSED | |
2686 #endif | |
2687 | |
2688 #define X_CAST(T, E) (T) (E) | |
2689 | |
5854 | 2690 #if defined (CXX_BROKEN_REINTERPRET_CAST) |
2691 #define FCN_PTR_CAST(T, E) (T) (E) | |
2692 #else | |
2693 #define FCN_PTR_CAST(T, E) reinterpret_cast<T> (E) | |
2694 #endif | |
2695 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2696 #if ! defined (HAVE_DEV_T) |
4064 | 2697 typedef short dev_t; |
3923 | 2698 #endif |
2699 | |
15317
d7514add71e2
configure.ac: Use m4 quoting more consistently throughout file.
Rik <rik@octave.org>
parents:
15308
diff
changeset
|
2700 #if ! defined (HAVE_INO_T) |
4064 | 2701 typedef unsigned long ino_t; |
3923 | 2702 #endif |
2703 | |
6122 | 2704 #if defined (_MSC_VER) |
2705 #define __WIN32__ | |
6276 | 2706 #define WIN32 |
6122 | 2707 /* missing parameters in macros */ |
2708 #pragma warning (disable: 4003) | |
2709 /* missing implementations in template instantiation */ | |
2710 #pragma warning (disable: 4996) | |
2711 /* deprecated function names (FIXME?) */ | |
2712 #pragma warning (disable: 4661) | |
2713 #endif | |
2714 | |
4377 | 2715 #if defined (__WIN32__) && ! defined (__CYGWIN__) |
4101 | 2716 #define OCTAVE_HAVE_WINDOWS_FILESYSTEM 1 |
6049 | 2717 #elif defined (__CYGWIN__) |
4377 | 2718 #define OCTAVE_HAVE_WINDOWS_FILESYSTEM 1 |
2719 #define OCTAVE_HAVE_POSIX_FILESYSTEM 1 | |
6049 | 2720 #else |
2721 #define OCTAVE_HAVE_POSIX_FILESYSTEM 1 | |
4101 | 2722 #endif |
2723 | |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2724 /* Define to 1 if we expect to have <windows.h>, Sleep, etc. */ |
4102 | 2725 #if defined (__WIN32__) && ! defined (__CYGWIN__) |
4101 | 2726 #define OCTAVE_USE_WINDOWS_API 1 |
2727 #endif | |
4153 | 2728 |
8577
ab61b47d3435
configure.in (AH_BOTTOM): Also check __MACH__ when defining OCTAVE_USE_OS_X_API
John W. Eaton <jwe@octave.org>
parents:
8573
diff
changeset
|
2729 #if defined (__APPLE__) && defined (__MACH__) |
8573
da61d0f7ce0b
configure.in (AH_BOTTOM): define OCTAVE_USE_OS_X_API if __APPLE__ is defined
John W. Eaton <jwe@octave.org>
parents:
8562
diff
changeset
|
2730 #define OCTAVE_USE_OS_X_API 1 |
da61d0f7ce0b
configure.in (AH_BOTTOM): define OCTAVE_USE_OS_X_API if __APPLE__ is defined
John W. Eaton <jwe@octave.org>
parents:
8562
diff
changeset
|
2731 #endif |
da61d0f7ce0b
configure.in (AH_BOTTOM): define OCTAVE_USE_OS_X_API if __APPLE__ is defined
John W. Eaton <jwe@octave.org>
parents:
8562
diff
changeset
|
2732 |
4180 | 2733 /* sigsetjmp is a macro, not a function. */ |
2734 #if defined (sigsetjmp) && defined (HAVE_SIGLONGJMP) | |
2735 #define OCTAVE_HAVE_SIG_JUMP | |
2736 #endif | |
4249 | 2737 |
4552 | 2738 #if defined (_UNICOS) |
2739 #define F77_USES_CRAY_CALLING_CONVENTION | |
2740 #endif | |
2741 | |
2742 #if 0 | |
2743 #define F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION | |
2744 #endif | |
5275 | 2745 |
5297 | 2746 #ifdef USE_64_BIT_IDX_T |
2747 #define SIZEOF_OCTAVE_IDX_TYPE 8 | |
2748 #else | |
2749 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT | |
2750 #endif | |
2751 | |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2752 /* To be able to use long doubles for 64-bit mixed arithmetics, we need |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2753 them at least 80 bits wide and we need roundl declared in math.h. |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2754 FIXME: Maybe substitute this by a more precise check in the future? */ |
8185
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2755 #if (SIZEOF_LONG_DOUBLE >= 10) && defined (HAVE_ROUNDL) |
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2756 #define OCTAVE_INT_USE_LONG_DOUBLE |
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2757 #endif |
69c5cce38c29
implement 64-bit arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents:
8169
diff
changeset
|
2758 |
7067 | 2759 #define OCTAVE_EMPTY_CPP_ARG |
2760 | |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2761 /* Octave is currently unable to use FFTW unless both float |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2762 and double versions are available. */ |
9523
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2763 #if defined (HAVE_FFTW3) && defined (HAVE_FFTW3F) |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2764 #define HAVE_FFTW |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2765 #endif |
0ce82753dd72
more configure changes for libraries
John W. Eaton <jwe@octave.org>
parents:
9519
diff
changeset
|
2766 |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2767 /* Backward compatibility. */ |
9610
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2768 #if defined (HAVE_Z) |
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2769 #define HAVE_ZLIB |
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2770 #endif |
bb36a5730ecc
configure.in (AH_BOTTOM): If HAVE_Z is defined, define HAVE_ZLIB
John W. Eaton <jwe@octave.org>
parents:
9603
diff
changeset
|
2771 |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2772 /* oct-dlldefs.h */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2773 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2774 #if defined (_MSC_VER) |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2775 #define OCTAVE_EXPORT __declspec(dllexport) |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2776 #define OCTAVE_IMPORT __declspec(dllimport) |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2777 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2778 /* All other compilers, at least for now. */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2779 #define OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2780 #define OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2781 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2782 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2783 /* API macro for libcruft */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2784 #ifdef CRUFT_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2785 #define CRUFT_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2786 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2787 #define CRUFT_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2788 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2789 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2790 /* API macro for liboctave */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2791 #ifdef OCTAVE_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2792 #define OCTAVE_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2793 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2794 #define OCTAVE_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2795 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2796 |
15195 | 2797 /* API macro for libinterp */ |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2798 #ifdef OCTINTERP_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2799 #define OCTINTERP_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2800 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2801 #define OCTINTERP_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2802 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2803 |
15195 | 2804 /* API macro for libinterp/graphics */ |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2805 #ifdef OCTGRAPHICS_DLL |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2806 #define OCTGRAPHICS_API OCTAVE_EXPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2807 #else |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2808 #define OCTGRAPHICS_API OCTAVE_IMPORT |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2809 #endif |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2810 |
15257
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2811 /* API macro for libgui */ |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2812 #ifdef OCTGUI_DLL |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2813 #define OCTGUI_API OCTAVE_EXPORT |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2814 #else |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2815 #define OCTGUI_API OCTAVE_IMPORT |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2816 #endif |
7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15238
diff
changeset
|
2817 |
9648
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2818 /* oct-types.h */ |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2819 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2820 typedef OCTAVE_IDX_TYPE octave_idx_type; |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2821 |
11844593875a
eliminate oct-dlldefs.h and oct-types.h
John W. Eaton <jwe@octave.org>
parents:
9645
diff
changeset
|
2822 #include <stdint.h> |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
2823 |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2824 /* Tag indicating Octave config.h has been included */ |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
2825 #define OCTAVE_CONFIG_INCLUDED 1 |
3923 | 2826 ]) |
2827 | |
15165
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2828 dnl end of AH_BOTTOM |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2829 dnl ------------------------------------------------------------ |
84d7a1ed5f29
configure.ac: Re-indent for clarity. Try to shorten long lines < 80 characters.
Rik <rik@octave.org>
parents:
15156
diff
changeset
|
2830 |
15779
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2831 ### Make all AC_DEFINES available to testif feature of test.m function. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2832 ### This must reside at the bottom of configure.ac after all AC_DEFINES |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2833 ### have been made. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2834 ### Use UGLY_DEFS to hold all the -D options. These are ultimately placed |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2835 ### in the DEFS field of the struct returned by octave_config_info, which |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2836 ### is used by test.m. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2837 |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2838 AC_OUTPUT_MAKE_DEFS |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2839 |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2840 ## We have to insert extra levels of backslash quoting here so that |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2841 ## the right thing ends up in oct-conf.h. |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2842 UGLY_DEFS=`echo $DEFS | $SED 's,\\",\\\\\\\\\\\\\\\\\\",g'` |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2843 AC_MSG_NOTICE([defining UGLY_DEFS to be $UGLY_DEFS]) |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2844 AC_SUBST(UGLY_DEFS) |
4456ad3d8a56
configure.ac: Ensure that all AC_DEFINEs are captured by UGLY_DEFS variable.
Rik <rik@octave.org>
parents:
15777
diff
changeset
|
2845 |
869 | 2846 ### Do the substitutions in all the Makefiles. |
2847 | |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2848 AC_SUBST(ac_config_files) |
9645 | 2849 AC_SUBST(ac_config_headers) |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2850 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2851 AC_CONFIG_FILES([ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2852 Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2853 doc/Makefile |
12336
af2b18354a8e
Add new Octave O logo to Mercurial and build process.
Rik <octave@nomad.inbox5.com>
parents:
12218
diff
changeset
|
2854 doc/icons/Makefile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2855 doc/interpreter/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2856 doc/liboctave/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2857 doc/refcard/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2858 examples/Makefile |
9946 | 2859 libgnu/Makefile |
15196
017f0b2e6933
rename gui directory to libgu
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
2860 libgui/Makefile |
15195 | 2861 libinterp/Makefile |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2862 liboctave/Makefile |
15271
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
2863 liboctave/cruft/Makefile |
648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
15257
diff
changeset
|
2864 liboctave/cruft/mkf77def |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2865 scripts/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2866 src/Makefile |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2867 test/Makefile]) |
8850
538184c540a9
Add make target "configfiles" to automatically regenerate configuration files
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8849
diff
changeset
|
2868 |
3887 | 2869 AC_OUTPUT |
1225 | 2870 |
2871 ### Print a summary so that important information isn't missed. | |
2872 | |
5844 | 2873 AC_MSG_NOTICE([ |
1225 | 2874 |
2875 Octave is now configured for $canonical_host_type | |
2876 | |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2877 Source directory: $srcdir |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2878 Installation prefix: $prefix |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2879 C compiler: $CC $XTRA_CFLAGS $WARN_CFLAGS $CFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2880 C++ compiler: $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2881 Fortran compiler: $F77 $FFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2882 Fortran libraries: $FLIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2883 Lex libraries: $LEXLIB |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2884 LIBS: $LIBS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
2885 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2886 AMD CPPFLAGS: $AMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2887 AMD LDFLAGS: $AMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2888 AMD libraries: $AMD_LIBS |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2889 ARPACK CPPFLAGS: $ARPACK_CPPFLAGS |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2890 ARPACK LDFLAGS: $ARPACK_LDFLAGS |
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
2891 ARPACK libraries: $ARPACK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2892 BLAS libraries: $BLAS_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2893 CAMD CPPFLAGS: $CAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2894 CAMD LDFLAGS: $CAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2895 CAMD libraries: $CAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2896 CARBON libraries: $CARBON_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2897 CCOLAMD CPPFLAGS: $CCOLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2898 CCOLAMD LDFLAGS: $CCOLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2899 CCOLAMD libraries: $CCOLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2900 CHOLMOD CPPFLAGS: $CHOLMOD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2901 CHOLMOD LDFLAGS: $CHOLMOD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2902 CHOLMOD libraries: $CHOLMOD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2903 COLAMD CPPFLAGS: $COLAMD_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2904 COLAMD LDFLAGS: $COLAMD_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2905 COLAMD libraries: $COLAMD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2906 CURL CPPFLAGS: $CURL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2907 CURL LDFLAGS: $CURL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2908 CURL libraries: $CURL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2909 CXSPARSE CPPFLAGS: $CXSPARSE_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2910 CXSPARSE LDFLAGS: $CXSPARSE_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2911 CXSPARSE libraries: $CXSPARSE_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2912 DL libraries: $DL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2913 FFTW3 CPPFLAGS: $FFTW3_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2914 FFTW3 LDFLAGS: $FFTW3_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2915 FFTW3 libraries: $FFTW3_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2916 FFTW3F CPPFLAGS: $FFTW3F_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2917 FFTW3F LDFLAGS: $FFTW3F_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2918 FFTW3F libraries: $FFTW3F_LIBS |
9846
1d90fc211872
configure.ac: report freetype, fontconfig, and fltk cflags and libs info
John W. Eaton <jwe@octave.org>
parents:
9845
diff
changeset
|
2919 fontconfig CFLAGS: $FONTCONFIG_CFLAGS |
15012
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2920 fontconfig libraries: $FONTCONFIG_LIBS |
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2921 FreeType2 CFLAGS: $FT2_CFLAGS |
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2922 FreeType2 libraries: $FT2_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2923 GLPK CPPFLAGS: $GLPK_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2924 GLPK LDFLAGS: $GLPK_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2925 GLPK libraries: $GLPK_LIBS |
9846
1d90fc211872
configure.ac: report freetype, fontconfig, and fltk cflags and libs info
John W. Eaton <jwe@octave.org>
parents:
9845
diff
changeset
|
2926 graphics CFLAGS: $GRAPHICS_CFLAGS |
15012
a25937adede9
configure.ac: consistency on output (using the same word for the same thing)
Carnë Draug <carandraug+dev@gmail.com>
parents:
15001
diff
changeset
|
2927 graphics libraries: $GRAPHICS_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2928 HDF5 CPPFLAGS: $HDF5_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2929 HDF5 LDFLAGS: $HDF5_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2930 HDF5 libraries: $HDF5_LIBS |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2931 Java home: $JAVA_HOME |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
15761
diff
changeset
|
2932 Java JVM path: $JAVA_LDPATH |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
15600
diff
changeset
|
2933 Java CPPFLAGS: $JAVA_CPPFLAGS |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
15600
diff
changeset
|
2934 Java libraries: $JAVA_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2935 LAPACK libraries: $LAPACK_LIBS |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2936 LLVM CPPFLAGS: $LLVM_CPPFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2937 LLVM LDFLAGS: $LLVM_LDFLAGS |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
2938 LLVM libraries: $LLVM_LIBS |
11040
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
2939 Magick++ CPPFLAGS: $MAGICK_CPPFLAGS |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
2940 Magick++ LDFLAGS: $MAGICK_LDFLAGS |
9ac165a67747
Modified configure.ac to allow specification of ImageMagick or GraphicsMagick. GraphicsMagick is still the default option.
John Swensen <jpswensen@gmail.com>
parents:
10986
diff
changeset
|
2941 Magick++ libraries: $MAGICK_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2942 OPENGL libraries: $OPENGL_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2943 PTHREAD flags: $PTHREAD_CFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2944 PTHREAD libraries: $PTHREAD_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2945 QHULL CPPFLAGS: $QHULL_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2946 QHULL LDFLAGS: $QHULL_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2947 QHULL libraries: $QHULL_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2948 QRUPDATE CPPFLAGS: $QRUPDATE_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2949 QRUPDATE LDFLAGS: $QRUPDATE_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2950 QRUPDATE libraries: $QRUPDATE_LIBS |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2951 Qt CPPFLAGS: $QT_CPPFLAGS |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2952 Qt LDFLAGS: $QT_LDFLAGS |
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15538
diff
changeset
|
2953 Qt libraries: $QT_LIBS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2954 READLINE libraries: $READLINE_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2955 REGEX libraries: $REGEX_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2956 TERM libraries: $TERM_LIBS |
15424
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2957 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS |
cabe2fa4566c
build: Add and organize octave_config_info variables.
Rik <rik@octave.org>
parents:
15412
diff
changeset
|
2958 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2959 UMFPACK libraries: $UMFPACK_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2960 X11 include flags: $X11_INCFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2961 X11 libraries: $X11_LIBS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2962 Z CPPFLAGS: $Z_CPPFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2963 Z LDFLAGS: $Z_LDFLAGS |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2964 Z libraries: $Z_LIBS |
9519
ee99f9f37505
improve configure checks for qhull and curl libs
John W. Eaton <jwe@octave.org>
parents:
9515
diff
changeset
|
2965 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2966 Default pager: $DEFAULT_PAGER |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
9787
diff
changeset
|
2967 gnuplot: $GNUPLOT |
1664 | 2968 |
15305
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2969 Build Octave GUI: $build_gui |
df7ab06ff541
build: Overhaul LLVM determination in configure.ac
Rik <rik@octave.org>
parents:
15302
diff
changeset
|
2970 JIT compiler for loops: $build_jit |
15736
6faa01ff2967
build: Add --disable-java option to configure (bug #37838).
Rik <rik@octave.org>
parents:
15728
diff
changeset
|
2971 Build Java interface: $build_java |
4110 | 2972 Do internal array bounds checking: $BOUNDS_CHECKING |
13838
a35d381e22b0
make octave_allocator optional and disable by default
John W. Eaton <jwe@octave.org>
parents:
13745
diff
changeset
|
2973 Use octave_allocator: $USE_OCTAVE_ALLOCATOR |
4110 | 2974 Build static libraries: $STATIC_LIBS |
2975 Build shared libraries: $SHARED_LIBS | |
4128 | 2976 Dynamic Linking: $ENABLE_DYNAMIC_LINKING $DL_API_MSG |
4110 | 2977 Include support for GNU readline: $USE_READLINE |
5275 | 2978 64-bit array dims and indexing: $USE_64_BIT_IDX_T |
1225 | 2979 ]) |
3105 | 2980 |
2981 warn_msg_printed=false | |
2982 | |
14605
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
2983 OCTAVE_CONFIGURE_WARNING_SUMMARY |
28e53daab1f8
Cleanup on autoconf warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14579
diff
changeset
|
2984 |
4469 | 2985 if $ENABLE_DYNAMIC_LINKING; then |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
2986 if test $SHARED_LIBS = false; then |
4469 | 2987 AC_MSG_WARN([You used --enable-dl but not --enable-shared.]) |
2988 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
2989 warn_msg_printed=true | |
2990 fi | |
2991 fi | |
2992 | |
5857 | 2993 if $USE_64_BIT_IDX_T; then |
6161 | 2994 AC_MSG_WARN([]) |
5857 | 2995 AC_MSG_WARN([You used the EXPERIMENTAL --enable-64 option.]) |
2996 AC_MSG_WARN([Are you sure that is what you want to do?]) | |
2997 AC_MSG_WARN([]) | |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
2998 AC_MSG_WARN([Your Fortran compiler must have an option to generate]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
2999 AC_MSG_WARN([code with 8 byte signed INTEGER values. This option]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3000 AC_MSG_WARN([should be specified in the F77_INTEGER_8_FLAG variable]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3001 AC_MSG_WARN([Make. This should work automatically for gfortran. If]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3002 AC_MSG_WARN([you use another compiler, you will need to set this]) |
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3003 AC_MSG_WARN([variable on the configure command line. You must also]) |
14144
834df9f10963
remove ARPACK files from sources and restore configure checks for external ARPACK library
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
3004 AC_MSG_WARN([compile the ARPACK, BLAS, LAPACK, QRUPDATE, and SuiteSparse]) |
10331
6a50aa2cdf00
never compile ranlib with 8-byte integers
John W. Eaton <jwe@octave.org>
parents:
10266
diff
changeset
|
3005 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.]) |
6161 | 3006 AC_MSG_WARN([]) |
5857 | 3007 warn_msg_printed=true |
3105 | 3008 fi |
3009 | |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3010 if $USE_OPENMP; then |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3011 AC_MSG_WARN([]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3012 AC_MSG_WARN([You used the EXPERIMENTAL --enable-openmp option.]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3013 AC_MSG_WARN([Are you sure that is what you want to do?]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3014 AC_MSG_WARN([]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3015 AC_MSG_WARN([This option enables experimental SMP multithreding]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3016 AC_MSG_WARN([code that has had very little testing. There is no]) |
10471
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3017 AC_MSG_WARN([certainity that the results returned by Octave with]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3018 AC_MSG_WARN([this option enabled will be correct.]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3019 AC_MSG_WARN([]) |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3020 warn_msg_printed=true |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3021 fi |
bcabc1c4f20c
Add detection of OpenMP support to configure. Disabled by default
David Bateman <dbateman@free.fr>
parents:
10456
diff
changeset
|
3022 |
15390
ad2c3902b826
configure.ac: Implement some portable sh programming recommendations from Autoconf.
Rik <rik@octave.org>
parents:
15369
diff
changeset
|
3023 if test $native_graphics = false; then |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3024 AC_MSG_WARN([]) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3025 AC_MSG_WARN([I didn't find the necessary libraries to compile native]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3026 AC_MSG_WARN([graphics. It isn't necessary to have native graphics,]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3027 AC_MSG_WARN([but you will need to have gnuplot installed or you won't]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3028 AC_MSG_WARN([be able to use any of Octave's plotting commands]) |
7834
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3029 AC_MSG_WARN([]) |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3030 warn_msg_printed=true |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3031 fi |
caab78e7e377
added checks for fltk & freetype in configure script
Shai Ayal <shaiay@sourceforge.net>
parents:
7825
diff
changeset
|
3032 |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3033 if test -n "$warn_gnuplot"; then |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3034 if $native_graphics; then |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3035 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3036 AC_MSG_WARN([I didn't find gnuplot. Plotting commands will use the]) |
11576
8ac9687dbe9f
rename backend to graphics_toolkit
John W. Eaton <jwe@octave.org>
parents:
11542
diff
changeset
|
3037 AC_MSG_WARN([native graphics toolkit.]) |
10011
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3038 else |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3039 AC_MSG_WARN([I didn't find gnuplot. It isn't necessary to have gnuplot]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3040 AC_MSG_WARN([installed, but you won't be able to use any of Octave's]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3041 AC_MSG_WARN([plotting commands without it.]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3042 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3043 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3044 AC_MSG_WARN([If gnuplot is installed, but isn't in your path, you can]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3045 AC_MSG_WARN([tell Octave where to find it by using the gnuplot_binary]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3046 AC_MSG_WARN([function. For example,]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3047 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3048 AC_MSG_WARN([gnuplot_binary ("/full/path/and/name/of/gnuplot/binary")]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3049 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3050 AC_MSG_WARN([at the Octave prompt.]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3051 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3052 AC_MSG_WARN([Setting default value to $GNUPLOT]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3053 AC_MSG_WARN([]) |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3054 |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3055 warn_msg_printed=true |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3056 fi |
411325ce32d7
Better warnings when gnuplot is not installed but native graphics are available
Rik <rdrider0-list@yahoo.com>
parents:
10004
diff
changeset
|
3057 |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3058 if $USE_ATOMIC_REFCOUNT; then |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3059 AC_MSG_WARN([]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3060 AC_MSG_WARN([Using atomic reference counting.]) |
15063
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3061 AC_MSG_WARN([This feature allows access to Octave data safely from]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3062 AC_MSG_WARN([another thread, for instance from a GUI. However this]) |
36cbcc37fdb8
Refactor configure.ac to make it more understandable.
Rik <rik@octave.org>
parents:
15059
diff
changeset
|
3063 AC_MSG_WARN([results in a small performance penalty in the Octave]) |
13985
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3064 AC_MSG_WARN([interpreter.]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3065 AC_MSG_WARN([]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3066 if $USE_OCTAVE_ALLOCATOR; then |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3067 AC_MSG_WARN([Thread-safe behavior is not guaranteed unless you also]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3068 AC_MSG_WARN([disable the use of the octave_allocator class.]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3069 AC_MSG_WARN([]) |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3070 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3071 warn_msg_printed=true |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3072 fi |
43cc49c7abd1
Use thread-safe atomic reference counting (GCC and MSVC).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
13838
diff
changeset
|
3073 |
6191 | 3074 if $warn_msg_printed; then |
10003
2ea3110e15ed
Use M4 quoting for arguments to autoconf macros containing variables
Rik <rdrider0-list@yahoo.com>
parents:
9989
diff
changeset
|
3075 AC_MSG_NOTICE([]) |
14657
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3076 AC_MSG_NOTICE([NOTE: Libraries or auxiliary programs may be skipped if they are]) |
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3077 AC_MSG_NOTICE([NOTE: not found OR if they are missing required features on your]) |
8a84849ad986
build: Restore printing some summary ./configure warnings at the end
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14630
diff
changeset
|
3078 AC_MSG_NOTICE([NOTE: system. ]) |
6161 | 3079 fi |
3080 | |
3105 | 3081 ### End of configure. |