Commit graph

149 commits

Author SHA1 Message Date
William S Fulton
c6f8aadc64 Cosmetic corrections - Mac OS X 2015-08-02 20:14:20 +01:00
William S Fulton
442ed8812b Merge branch 'vadz-better-no-all'
* vadz-better-no-all:
  Don't check for all the languages in Travis language-specific builds.
  Skip check for pep8 if Python is disabled in configure.
  Make configure --without-alllang option actually useful.
  Cosmetic: fix wrong configure options indentation in --help.
2015-08-02 19:42:27 +01:00
William S Fulton
2d4416136b Tweak configure output for Java 2015-08-02 19:41:10 +01:00
William S Fulton
fa16701d5c Merge branch 'vadz-java-home'
* vadz-java-home:
  Don't duplicate Java headers path under OS X in configure.
  Use JAVA_HOME value in configure to detect Java.
  Remove executable permission from appveyor.yml.
2015-08-02 19:18:56 +01:00
Vadim Zeitlin
a9c6edb3fb Skip check for pep8 if Python is disabled in configure.
There is no need for it, nor any other Python-related variables, to be defined
if Python is not used.
2015-08-02 19:57:59 +02:00
Vadim Zeitlin
1824cabcbc Make configure --without-alllang option actually useful.
Use it to disable all languages by default, but still allow enabling
individual languages by explicitly using --with-lang options for them.

E.g. to enable tests for Java only "--without-alllang --with-java" can now be
used to skip the configure checks for all the other languages.
2015-08-02 19:57:59 +02:00
Vadim Zeitlin
11974efe2e Cosmetic: fix wrong configure options indentation in --help.
Ensure that help for all options starts in the same column (unless the options
are too long, as --with-guile-config=path, but at least avoid indenting it by
a tab stop then).
2015-08-02 19:57:33 +02:00
Vadim Zeitlin
651ad3030c Don't duplicate Java headers path under OS X in configure.
Use /System/Library/Frameworks/JavaVM.framework/Headers in a single place only
to make it easier to change it later and, hopefully, make the rather
convoluted process of Java detection under OS X slightly more clear.
2015-08-02 15:40:41 +02:00
William S Fulton
130834aac2 Merge branch 'vadz-msw-srcdir'
* vadz-msw-srcdir:
  SWIG_LIB fix for out of source MinGW builds
  Use "mixed" path to source directory under Cygwin.
2015-08-02 10:07:59 +01:00
William S Fulton
f5db2b43e6 SWIG_LIB fix for out of source MinGW builds 2015-08-02 10:05:09 +01:00
William S Fulton
026d879058 Move MinGW mixed path conversion code to the pathconvert tool
In preparation for adding MinGW support to patch #438.
2015-08-01 23:08:53 +01:00
Vadim Zeitlin
2e7331964a Use JAVA_HOME value in configure to detect Java.
This is simpler than having to use --with-java, --with-javac and
--with-javaincl options and, even more importantly, will usually just work by
default.
2015-08-01 18:50:27 +02:00
William S Fulton
cc6804724f Improve configure output when python is not installed 2015-08-01 17:43:36 +01:00
William S Fulton
4ffbe8fc2c Merge branch 'kkaempf-fix-configure-ocamlc-setting'
* kkaempf-fix-configure-ocamlc-setting:
  Ocaml configure changes
  Set OCAMLC to empty if Ocaml compiler not found
2015-07-30 23:35:12 +01:00
William S Fulton
a3f0921c57 Ocaml configure changes
Remove use of peculiar ':' default for OCAML in AC_CHECK_PROGS.
Further refinement of issue #458.
2015-07-30 23:32:54 +01:00
Mike Miller
5ab9563c2a Octave: use correct mkoctfile executable
Allow a versioned Octave executable to be configured via --with-octave
and the correct corresponding mkoctfile executable to be used.
2015-07-11 19:05:30 -04:00
William S Fulton
701f8d4bae Configuring C++11 compiler flags for testing fix 2015-07-09 00:12:28 +01:00
Klaus Kämpf
0350e6abce Set OCAMLC to empty if Ocaml compiler not found
OCAMLC is tested for 'empty string' when setting SKIP_OCAML
(configure.ac:2677), setting it to ':' will not skip ocaml.
2015-07-06 10:33:26 +02:00
William S Fulton
55686fbe56 Bump version to 3.0.7 2015-07-06 06:55:43 +01:00
Vadim Zeitlin
0de11efdd3 Use "mixed" path to source directory under Cygwin.
This allows build to work with both native and Cygwin builds of SWIG and
doesn't restrict us to building in the source directory as was the case
previously because SWIG_LIB was explicitly not set under Windows.
2015-06-24 23:59:32 +02:00
Ian Lance Taylor
c6b3088e58 [Go] Add Makefile testing support for changes in upcoming Go 1.5 release.
No effect on the SWIG program itself.
2015-06-19 14:29:38 -07:00
William S Fulton
d62aad9de9 Remove unwanted x bit in configure.ac 2015-04-04 10:23:44 +01:00
William S Fulton
62fdff1bf3 Python 2 and 3 testing on Windows 2015-04-04 02:17:57 +01:00
William S Fulton
0f1e8f75da Detect Java on 64 bit windows 2015-04-04 02:17:57 +01:00
William S Fulton
f27faa9c69 Allow for spaces in path to java include directory and executables
For typical Windows installs of Java.
Also don't use cygpath on MinGW.
2015-04-04 02:17:57 +01:00
William S Fulton
a57302527a gcc and mno-cygwin tweaks on cygwin/mingw 2015-04-04 02:17:57 +01:00
William S Fulton
af06a48430 preinst-swig script support for native windows paths
- SWIG_LIB support for testing on Windows
- Only in-source builds for now
2015-04-04 02:17:57 +01:00
William S Fulton
2347e87451 CSharp test-suite support on windows
- Add pathconvert tool to convert to a windows path for input files for
  C# compiler
- Simplify vcfilter
2015-04-04 02:17:56 +01:00
Olly Betts
226b4dec5b Probe for camlp4 in configure
See issue #364.
2015-03-25 12:44:05 +13:00
Olly Betts
2278c9b33d Remove pointless export of variables 2015-03-18 13:12:57 +13:00
Olly Betts
6d80e40699 Remove dead Ocaml configure probes
A number of the probed for values are no longer actually used anywhere.
2015-03-18 13:10:59 +13:00
Olly Betts
c7c6f2381e Eliminate AC_COMPARE_VERSION
We also have AX_COMPARE_VERSION which does essentially the same job.
2015-03-18 12:39:57 +13:00
Olly Betts
e6ed961711 Fix configure message about ocaml version check
The test is actually > 3.08.2, not >= 3.08.2 as the message previously
implied.  The change in question happened after 3.08.2, so ">" is the
correct test:

http://caml.inria.fr/pub/ml-archives/caml-list/2005/07/ad882d2c46496ad44e6ea6c31a989860.en.html
2015-03-18 12:33:20 +13:00
William S Fulton
7fa1058a8a Configure fix and warning fix for Go 2015-03-14 23:40:30 +00:00
Ian Lance Taylor
9ad497c08e [Go] Add -cgo option, required for Go version 1.5 and later. 2015-03-02 14:03:33 -08:00
Jitka Plesnikova
60f2640087 Fix build on S390(x)-architecture 2015-02-11 22:26:00 +01:00
William S Fulton
d834202695 Bump version to 3.0.6
[skip ci]
2015-02-01 00:55:35 +00:00
Simon Marchetto
adc4b788df Merge remote-tracking branch 'origin/master' into gsoc2012-scilab
Conflicts:
	.gitignore
	.travis.yml
	configure.ac
2015-01-26 10:50:20 +01:00
William S Fulton
733851bdab Remove needless Lua checking during configure 2015-01-17 23:17:57 +00:00
William S Fulton
bedff70793 Bump version to 3.0.5 2015-01-14 23:58:49 +00:00
Olly Betts
4fed2e6690 Use -rrbconfig rather than -rmkmf to load rbconfig
Both seem to work, but it's better to ask for the module we actually
want rather than rely on it being pulled in indirectly.  See #305.
2015-01-14 09:31:41 +00:00
Klaus Kämpf
112499eb39 Ruby: Replace Config::CONFIG with RbConfig::CONFIG in configure.ac
The Config namespace was deprecated for a long time and Ruby 2.2
finally removed it. Adapt configure.ac accordingly.

This fixes issue #304
2015-01-12 15:17:10 +01:00
William S Fulton
73222a1cd1 Bump version to 3.0.4 2014-12-31 01:22:16 +00:00
William S Fulton
2b04d37b94 Tidy up Javascript build system 2014-12-28 16:13:22 +00:00
William S Fulton
d79f11501d Don't delete checked in files with 'make distclean'
Occurs when ruby is not detected.
Fixes #290.
2014-12-28 15:26:27 +00:00
Robert Stone
c432073626 Issue #282 perl5 archlib vs archlibexp 2014-12-27 12:48:58 -08:00
William S Fulton
9cbdf69fdc Correctly detect Go1 during configure 2014-12-07 21:53:17 +00:00
William S Fulton
5b480847dd Improve Javascript Webkit detection
pkg-config detection was missing. Use pkg-config for the link flags.
2014-12-04 06:23:43 +00:00
David Nadlinger
86276568df D: Fix out-of-source build for examples. 2014-11-06 23:04:36 +01:00
William S Fulton
f52f4c6e10 Check for pkg-config before attempting to use it in configure
Fixes configure when pkg-config is missing and looking for Scilab and
Javascript
2014-10-31 22:46:52 +00:00