Mercurial > hg > octave-shane
changeset 6668:69197bd681f6
[project @ 2007-05-29 07:57:19 by jwe]
author | jwe |
---|---|
date | Tue, 29 May 2007 07:57:19 +0000 |
parents | a36e4bb26943 |
children | 39d76485706a |
files | ChangeLog configure.in |
diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-05-29 Steven Mestdagh <steven.mestdagh@esat.kuleuven.be> + + * configure.in: Delete spurious "break" in fftw3 check. + Use separate case for SH_LD and SH_LDFLAGS on openbsd. + 2007-05-22 John W. Eaton <jwe@octave.org> * Makeconf.in (do-script-uninstall): Also remove directory.
--- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.560 $) +AC_REVISION($Revision: 1.561 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -561,7 +561,7 @@ if test "$with_fftw" = yes; then have_fftw3_header=no with_fftw3=no - AC_CHECK_HEADER(fftw3.h, [have_fftw3_header=yes; break]) + AC_CHECK_HEADER(fftw3.h, [have_fftw3_header=yes]) if test "$have_fftw3_header" = yes; then AC_CHECK_LIB(fftw3, fftw_plan_dft_1d, [FFTW_LIBS="-lfftw3"; with_fftw3=yes]) fi @@ -1084,10 +1084,14 @@ OCTINTERP_DLL_DEFS= library_path_var=LD_LIBRARY_PATH case "$canonical_host_type" in - *-*-386bsd* | *-*-openbsd* | *-*-netbsd*) + *-*-386bsd* | *-*-netbsd*) SH_LD=ld SH_LDFLAGS=-Bshareable ;; + *-*-openbsd*) + SH_LD='$(CXX)' + SH_LDFLAGS='-shared -fPIC' + ;; *-*-freebsd*) SH_LD='$(CC)' SH_LDFLAGS="-shared -Wl,-x"