Branch: Tag:

2006-08-14

2006-08-14 16:31:05 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Several PIKE_CHECK_ABI_DIR-related fixes.

Rev: src/aclocal.m4:1.148
Rev: src/configure.in:1.1001

1: - AC_REVISION("$Id: configure.in,v 1.1000 2006/08/10 15:56:04 grubba Exp $") + AC_REVISION("$Id: configure.in,v 1.1001 2006/08/14 16:31:05 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
2295:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.1000 2006/08/10 15:56:04 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.1001 2006/08/14 16:31:05 grubba Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2333:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.1000 2006/08/10 15:56:04 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.1001 2006/08/14 16:31:05 grubba Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2342:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.1000 2006/08/10 15:56:04 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.1001 2006/08/14 16:31:05 grubba Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
2390:    for suff in $pike_cv_abi_suffixes; do    d="$dd$suff"    PIKE_CHECK_ABI_DIR($d, [ -  # NOTE: Don't add these to the run path. +     AC_MSG_CHECKING([if we need to add -L$real_dir to LDFLAGS])    case " $LDFLAGS " in    *\ -L$d\ *)
2404:    AC_MSG_RESULT([yes - added])    ;;    esac +  AC_MSG_CHECKING([if we need to add -R$real_dir to LDFLAGS]) +  case " $LDFLAGS " in +  *\ -R$d\ *) +  AC_MSG_RESULT([no - already added]) +  ;; +  *\ -R$real_dir\ *) +  AC_MSG_RESULT([no - already added]) +  ;; +  *) +  if test "x$abi_dir_dynamic" = "xyes"; then +  LDFLAGS="$LDFLAGS -R$real_dir" +  AC_MSG_RESULT([yes - added]) +  else +  AC_MSG_RESULT([no - does not contain dynamic objects]) +  fi +  ;; +  esac    ])    done    done