*** configure.ac Fri May 21 07:02:02 2010 --- configure.ac.new Mon Jan 17 23:32:28 2011 *************** case "${host_os}" in *** 2249,2283 **** r_ld_library_defaults= ;; esac - for arg in ${LDFLAGS} ${FLIBS} ${BLAS_LIBS} ${LAPACK_LIBS} ${X_LIBS} \ - ${TCLTK_LIBS}; do - case "${arg}" in - -L*) - lib=`echo ${arg} | sed "s/^-L//"` - r_want_lib=true - ## don't add anything for Darwin - case "${host_os}" in darwin*) r_want_lib=false ;; esac - ## Do not add non-existent directories. - test -d "${lib}" || r_want_lib=false - if test x"${r_want_lib}" = xtrue; then - ## Canonicalize (/usr/lib/gcc-lib/i486-linux/3.3.4/../../..). - lib=`cd "${lib}" && ${GETWD}` - ## Do not add something twice, or default paths. - r_save_IFS="${IFS}"; IFS="${PATH_SEPARATOR}" - for dir in ${R_LD_LIBRARY_PATH}${IFS}${r_ld_library_defaults}; do - if test x"${dir}" = x"${lib}"; then - r_want_lib=false - break - fi - done - IFS="${r_save_IFS}" - if test x"${r_want_lib}" = xtrue; then - R_SH_VAR_ADD(R_LD_LIBRARY_PATH, [${lib}], [${PATH_SEPARATOR}]) - fi - fi - ;; - esac - done ## Handle JAVA_LD_LIBRARY_PATH specially so that users can conveniently set just ## R_JAVA_LD_LIBRARY_PATH in their environment. if test -n "${JAVA_LD_LIBRARY_PATH}"; then --- 2249,2254 ----