pike.git/ src/ configure.in

2005-08-10

2005-08-10 13:06:34 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 6d0222a37346abbd7dbf6d5c0de9faa8f0139662 (29 lines) (+23/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

Added extra ranlib pass to the bundle installer.
Added multi install detection to the bundle installer.

Rev: src/configure.in:1.910

1: - AC_REVISION("$Id: configure.in,v 1.909 2005/07/08 12:27:01 grubba Exp $") + AC_REVISION("$Id: configure.in,v 1.910 2005/08/10 13:06:34 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
1506:   if test -d bundles/.; then    touch bundles/no_testsuites    pike_bundle_prefix="`pwd`/bundles" +  test -d bundles/installed/. || mkdir bundles/installed    test -d bundles/include/. || mkdir bundles/include    CPPFLAGS="$CPPFLAGS -I$pike_bundle_prefix/include"    test -d bundles/lib/. || mkdir bundles/lib
2438:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.909 2005/07/08 12:27:01 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.910 2005/08/10 13:06:34 grubba Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2476:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.909 2005/07/08 12:27:01 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.910 2005/08/10 13:06:34 grubba Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2485:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.909 2005/07/08 12:27:01 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.910 2005/08/10 13:06:34 grubba Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
7894:   Requested from:   $bundle_info])    bundle_info=`echo "$bundle_info" | grep -v "$bundle.bundle"` +  elif test -f "$pike_bundle_prefix/installed/$bundle"; then +  AC_MSG_WARN([Bundle $bundle already installed. + Requested from: + $bundle_info]) +  bundle_info=`echo "$bundle_info" | grep -v "$bundle.bundle"`    else    # First extract the bundle.   
8023:    echo "Installing bundle $bundle in ${pike_bundle_prefix}..."    ${MAKE-make} install || exit 1    +  # Mark bundle as installed. +  touch "${pike_bundle_prefix}/installed/$bundle" +     # Restore PATH    PATH="$OLD_PATH"   
8031:    ) || exit 1    fi    done +  echo "Fixing libraries..."    # Kludge for rntcl in case *.lib hasn't been copied on install.    if echo foo "$CC" | egrep 'rntc.|rnt.cl' >/dev/null; then -  echo "Fixing libraries..." +     for f in `(cd bundles/lib && echo lib*.a)` no; do    if test "$f" = "no"; then    break
8048:    fi    done    fi +  # Kludge for some OSes needing ranlib to be run on archives after install. +  for f in bundles/lib/lib*.a no; do +  if test "$f" = "no"; then +  break +  fi +  $RANLIB $f +  done    # Clear the caches.    echo Clearing cached variables related to the bundles.    for varname in `cat $bundle_info|sed -e 's/^[[ ]]*//'|sort|uniq` no; do