$NetBSD: patch-aa,v 1.15 2005/05/02 16:57:19 drochner Exp $

--- configure.ac.orig	2005-04-18 23:30:54.000000000 +0200
+++ configure.ac
@@ -306,7 +306,7 @@ AC_ARG_WITH([pcre],
 ## 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 -lR"
+  LIBR="-Wl,-R${prefix}/lib/R/lib -L\$(R_HOME)/lib -lR"
 else
   LIBR=
 fi
@@ -536,9 +536,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
@@ -681,13 +681,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]))
@@ -986,6 +979,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"