1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
$NetBSD: patch-aa,v 1.16 2006/06/13 12:28:09 markd Exp $
--- configure.ac.orig 2006-05-18 21:13:59.000000000 +1200
+++ configure.ac
@@ -361,7 +361,7 @@ AC_ARG_WITH([valgrind-instrumentation],
## needs to come after GNOME
AM_CONDITIONAL(WANT_R_SHLIB, [test "x${want_R_shlib}" = xyes])
if test "${want_R_shlib}" = yes; then
- LIBR="-L\$(R_HOME)/lib\$(R_ARCH) -lR"
+ LIBR="-Wl,-R${prefix}/lib/R/lib\$(R_ARCH) -L\$(R_HOME)/lib\$(R_ARCH) -lR"
else
LIBR=
fi
@@ -628,9 +628,9 @@ if test "${use_readline}" = yes; then
if test "${use_readline}" = no; then
## only need ncurses if libreadline is not statically linked against it
unset ac_cv_lib_readline_rl_callback_read_char
- AC_CHECK_LIB(ncurses, main, [],
- AC_CHECK_LIB(termcap, main, [],
- AC_CHECK_LIB(termlib, main)))
+ AC_CHECK_LIB(termcap, main, [],
+ AC_CHECK_LIB(termlib, main, [],
+ AC_CHECK_LIB(ncurses, main)))
AC_CHECK_LIB(readline, rl_callback_read_char)
use_readline="${ac_cv_lib_readline_rl_callback_read_char}"
fi
@@ -779,13 +779,6 @@ case "${host_cpu}" in
R_PROG_CC_FLAG([-ieee_with_inexact],
R_SH_VAR_ADD(R_XTRA_CFLAGS, [-ieee_with_inexact]))
fi
- if test "${G77}" = yes; then
- R_PROG_F77_FLAG([-mieee],
- R_SH_VAR_ADD(R_XTRA_FFLAGS, [-mieee]))
- else
- R_PROG_F77_FLAG([-fpe3],
- R_SH_VAR_ADD(R_XTRA_FFLAGS, [-fpe3]))
- fi
if test "${GXX}" = yes; then
R_PROG_CXX_FLAG([-mieee],
R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee]))
@@ -1244,6 +1237,7 @@ case "${host_os}" in
fpicflags=
;;
netbsd*)
+ fpicflags="-fPIC"
if ${CPP} - -dM < /dev/null | grep __ELF__ >/dev/null ; then
main_ldflags="-export-dynamic"
shlib_ldflags="-shared"
|
