Branch: Tag:

2009-09-26

2009-09-26 12:27:52 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Improved libdir abi handling.

Rev: src/Makefile.in:1.480
Rev: src/configure.in:1.1085

1: - AC_REVISION("$Id: configure.in,v 1.1084 2009/09/24 17:21:37 grubba Exp $") + AC_REVISION("$Id: configure.in,v 1.1085 2009/09/26 12:27:51 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
2451:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.1084 2009/09/24 17:21:37 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.1085 2009/09/26 12:27:51 grubba Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2489:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.1084 2009/09/24 17:21:37 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.1085 2009/09/26 12:27:51 grubba Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2498:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.1084 2009/09/24 17:21:37 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.1085 2009/09/26 12:27:51 grubba Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
2762:   CPPFLAGS="${CPPFLAGS} ${CONF_CPPFLAGS_EXTRA}"      # We want to know if we ought to append any abi indicator to the libdir. - AC_MSG_CHECKING(if an abi indicator would be appropriate) + AC_MSG_CHECKING(if an abi indicator would be appropriate for libdir)   AC_CACHE_VAL(pike_cv_lib_abi, [    pike_cv_lib_abi=""    for dd in "$with_root/lib" "$with_root/usr/lib" "$prefix/lib"; do
2776:    done   ])   AC_MSG_RESULT($pike_cv_lib_abi) - PIKE_LIB_ABI="$pike_cv_lib_abi" - AC_SUBST(PIKE_LIB_ABI) +     -  + AC_MSG_CHECKING(what libdir should be set to) + if test "x$pike_cv_lib_abi" = "x"; then :; + elif test -d `eval echo "$libdir$pike_cv_lib_abi/."` -o \ +  "x$libdir" = 'x${exec_prefix}/lib'; then +  libdir="$libdir$pike_cv_lib_abi" + fi + AC_MSG_RESULT($libdir) +    #############################################################################      ## At this point we have at last initialized the compiler!