Diff for /embedaddon/quagga/compile between versions 1.1 and 1.1.1.4

version 1.1, 2012/02/21 17:26:11 version 1.1.1.4, 2013/07/21 23:54:36
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.# Wrapper for compilers which do not understand '-c -o'.
   
scriptversion=2009-10-06.20; # UTCscriptversion=2012-10-14.11; # UTC
   
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software# Copyright (C) 1999-2012 Free Software Foundation, Inc.
# Foundation, Inc. 
 # Written by Tom Tromey <tromey@cygnus.com>.  # Written by Tom Tromey <tromey@cygnus.com>.
 #  #
 # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
Line 29  scriptversion=2009-10-06.20; # UTC Line 28  scriptversion=2009-10-06.20; # UTC
 # bugs to <bug-automake@gnu.org> or send patches to  # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.  # <automake-patches@gnu.org>.
   
   nl='
   '
   
   # We need space, tab and new line, in precisely that order.  Quoting is
   # there to prevent tools from complaining about whitespace usage.
   IFS=" ""        $nl"
   
   file_conv=
   
   # func_file_conv build_file lazy
   # Convert a $build file to $host form and store it in $file
   # Currently only supports Windows hosts. If the determined conversion
   # type is listed in (the comma separated) LAZY, no conversion will
   # take place.
   func_file_conv ()
   {
     file=$1
     case $file in
       / | /[!/]*) # absolute file, and not a UNC file
         if test -z "$file_conv"; then
           # lazily determine how to convert abs files
           case `uname -s` in
             MINGW*)
               file_conv=mingw
               ;;
             CYGWIN*)
               file_conv=cygwin
               ;;
             *)
               file_conv=wine
               ;;
           esac
         fi
         case $file_conv/,$2, in
           *,$file_conv,*)
             ;;
           mingw/*)
             file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
             ;;
           cygwin/*)
             file=`cygpath -m "$file" || echo "$file"`
             ;;
           wine/*)
             file=`winepath -w "$file" || echo "$file"`
             ;;
         esac
         ;;
     esac
   }
   
   # func_cl_dashL linkdir
   # Make cl look for libraries in LINKDIR
   func_cl_dashL ()
   {
     func_file_conv "$1"
     if test -z "$lib_path"; then
       lib_path=$file
     else
       lib_path="$lib_path;$file"
     fi
     linker_opts="$linker_opts -LIBPATH:$file"
   }
   
   # func_cl_dashl library
   # Do a library search-path lookup for cl
   func_cl_dashl ()
   {
     lib=$1
     found=no
     save_IFS=$IFS
     IFS=';'
     for dir in $lib_path $LIB
     do
       IFS=$save_IFS
       if $shared && test -f "$dir/$lib.dll.lib"; then
         found=yes
         lib=$dir/$lib.dll.lib
         break
       fi
       if test -f "$dir/$lib.lib"; then
         found=yes
         lib=$dir/$lib.lib
         break
       fi
       if test -f "$dir/lib$lib.a"; then
         found=yes
         lib=$dir/lib$lib.a
         break
       fi
     done
     IFS=$save_IFS
   
     if test "$found" != yes; then
       lib=$lib.lib
     fi
   }
   
   # func_cl_wrapper cl arg...
   # Adjust compile command to suit cl
   func_cl_wrapper ()
   {
     # Assume a capable shell
     lib_path=
     shared=:
     linker_opts=
     for arg
     do
       if test -n "$eat"; then
         eat=
       else
         case $1 in
           -o)
             # configure might choose to run compile as 'compile cc -o foo foo.c'.
             eat=1
             case $2 in
               *.o | *.[oO][bB][jJ])
                 func_file_conv "$2"
                 set x "$@" -Fo"$file"
                 shift
                 ;;
               *)
                 func_file_conv "$2"
                 set x "$@" -Fe"$file"
                 shift
                 ;;
             esac
             ;;
           -I)
             eat=1
             func_file_conv "$2" mingw
             set x "$@" -I"$file"
             shift
             ;;
           -I*)
             func_file_conv "${1#-I}" mingw
             set x "$@" -I"$file"
             shift
             ;;
           -l)
             eat=1
             func_cl_dashl "$2"
             set x "$@" "$lib"
             shift
             ;;
           -l*)
             func_cl_dashl "${1#-l}"
             set x "$@" "$lib"
             shift
             ;;
           -L)
             eat=1
             func_cl_dashL "$2"
             ;;
           -L*)
             func_cl_dashL "${1#-L}"
             ;;
           -static)
             shared=false
             ;;
           -Wl,*)
             arg=${1#-Wl,}
             save_ifs="$IFS"; IFS=','
             for flag in $arg; do
               IFS="$save_ifs"
               linker_opts="$linker_opts $flag"
             done
             IFS="$save_ifs"
             ;;
           -Xlinker)
             eat=1
             linker_opts="$linker_opts $2"
             ;;
           -*)
             set x "$@" "$1"
             shift
             ;;
           *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
             func_file_conv "$1"
             set x "$@" -Tp"$file"
             shift
             ;;
           *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
             func_file_conv "$1" mingw
             set x "$@" "$file"
             shift
             ;;
           *)
             set x "$@" "$1"
             shift
             ;;
         esac
       fi
       shift
     done
     if test -n "$linker_opts"; then
       linker_opts="-link$linker_opts"
     fi
     exec "$@" $linker_opts
     exit 1
   }
   
   eat=
   
 case $1 in  case $1 in
   '')    '')
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;       exit 1;
      ;;       ;;
   -h | --h*)    -h | --h*)
     cat <<\EOF      cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]  Usage: compile [--help] [--version] PROGRAM [ARGS]
   
Wrapper for compilers which do not understand `-c -o'.Wrapper for compilers which do not understand '-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remainingRemove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.  arguments, and rename the output as expected.
   
 If you are trying to build a whole package this is not the  If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.right script to run: please start by reading the file 'INSTALL'.
   
 Report bugs to <bug-automake@gnu.org>.  Report bugs to <bug-automake@gnu.org>.
 EOF  EOF
Line 53  EOF Line 255  EOF
     echo "compile $scriptversion"      echo "compile $scriptversion"
     exit $?      exit $?
     ;;      ;;
     cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
       func_cl_wrapper "$@"      # Doesn't return...
       ;;
 esac  esac
   
 ofile=  ofile=
 cfile=  cfile=
 eat=  
   
 for arg  for arg
 do  do
Line 66  do Line 270  do
   else    else
     case $1 in      case $1 in
       -o)        -o)
        # configure might choose to run compile as `compile cc -o foo foo.c'.        # configure might choose to run compile as 'compile cc -o foo foo.c'.
        # So we strip `-o arg' only if arg is an object.        # So we strip '-o arg' only if arg is an object.
         eat=1          eat=1
         case $2 in          case $2 in
           *.o | *.obj)            *.o | *.obj)
Line 94  do Line 298  do
 done  done
   
 if test -z "$ofile" || test -z "$cfile"; then  if test -z "$ofile" || test -z "$cfile"; then
  # If no `-o' option was seen then we might have been invoked from a  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a    # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no    # normal compilation that the losing compiler can handle.  If no
  # `.c' file was seen then we are probably linking.  That is also  # '.c' file was seen then we are probably linking.  That is also
   # ok.    # ok.
   exec "$@"    exec "$@"
 fi  fi
Line 106  fi Line 310  fi
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`  cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
   
 # Create the lock directory.  # Create the lock directory.
# Note: use `[/\\:.-]' here to ensure that we don't use the same name# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected  # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.  # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d  lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d

Removed from v.1.1  
changed lines
  Added in v.1.1.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>