diff options
Diffstat (limited to 'math/R/patches/patch-aa')
| -rw-r--r-- | math/R/patches/patch-aa | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/math/R/patches/patch-aa b/math/R/patches/patch-aa index 44190684f16..60370a823c7 100644 --- a/math/R/patches/patch-aa +++ b/math/R/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2002/12/10 11:58:11 markd Exp $ +$NetBSD: patch-aa,v 1.11 2003/12/03 12:05:18 markd Exp $ ---- configure.ac.orig Mon Oct 21 22:27:50 2002 +--- configure.ac.orig 2003-09-17 11:01:04.000000000 +1200 +++ configure.ac -@@ -148,7 +148,7 @@ +@@ -134,7 +134,7 @@ AC_ARG_ENABLE([R-shlib], [want_R_shlib=no]) AM_CONDITIONAL(WANT_R_SHLIB, [test "x${want_R_shlib}" = xyes]) if test "${want_R_shlib}" = yes; then @@ -11,34 +11,21 @@ $NetBSD: patch-aa,v 1.10 2002/12/10 11:58:11 markd Exp $ else LIBR= fi -@@ -412,9 +412,9 @@ AC_SUBST(LIBM) - ## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do - ## the following as well. - AC_CHECK_LIB(m, sin) --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(dl, dlopen) - - ## Readline. -@@ -555,13 +555,6 @@ case "${host_cpu}" in +@@ -592,13 +592,6 @@ case "${host_cpu}" in R_PROG_CC_FLAG([-ieee_with_inexact], - [R_XTRA_CFLAGS="${R_XTRA_CFLAGS} -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_XTRA_FFLAGS="${R_XTRA_FFLAGS} -mieee"]) +- R_SH_VAR_ADD(R_XTRA_FFLAGS, [-mieee])) - else - R_PROG_F77_FLAG([-fpe3], -- [R_XTRA_FFLAGS="${R_XTRA_FFLAGS} -fpe3"]) +- R_SH_VAR_ADD(R_XTRA_FFLAGS, [-fpe3])) - fi if test "${GXX}" = yes; then R_PROG_CXX_FLAG([-mieee], - [R_XTRA_CXXFLAGS="${R_XTRA_CXXFLAGS} -mieee"]) -@@ -821,6 +814,7 @@ case "${host_os}" in + R_SH_VAR_ADD(R_XTRA_CXXFLAGS, [-mieee])) +@@ -891,6 +884,7 @@ case "${host_os}" in fpicflags= ;; netbsd*) |