/[pcre]/code/trunk/ltmain.sh

Diff of /code/trunk/ltmain.sh

Parent Directory | Revision Log | View Patch Patch

-revision 62 by nigel,
Sat Feb 24 21:39:42 2007 UTC
+revision 63 by nigel,
Sat Feb 24 21:40:03 2007 UTC
 Line 48 
 EOF
    exit 0
  fi
+ # Modification by PH (18-Feb-2003) to ensure that ${SED} is always set
+ # (it is not set on my system).
+ case "X${SED}" in
+   X) SED=sed ;;
+ esac
  # The name of this program.
- progname=`$echo "$0" | sed 's%^.*/%%'`
+ progname=`$echo "$0" | ${SED} 's%^.*/%%'`
  modename="$progname"
  # Constants.
  PROGRAM=ltmain.sh
  PACKAGE=libtool
- VERSION=1.4
+ VERSION=1.4.3
- TIMESTAMP=" (1.920 2001/04/24 23:26:18)"
+ TIMESTAMP=" (1.922.2.110 2002/10/23 01:39:54)"
  default_mode=
  help="Try \`$progname --help' for more information."
-Line 67 
 rm="rm -f"
+Line 74 
 rm="rm -f"
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
- Xsed='sed -e 1s/^X//'
+ Xsed="${SED}"' -e 1s/^X//'
  sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
- SP2NL='tr \040 \012'
+ # test EBCDIC or ASCII
- NL2SP='tr \015\012 \040\040'
+ case `echo A|od -x` in
+  *[Cc]1*) # EBCDIC based system
+   SP2NL="tr '\100' '\n'"
+   NL2SP="tr '\r\n' '\100\100'"
+   ;;
+  *) # Assume ASCII based system
+   SP2NL="tr '\040' '\012'"
+   NL2SP="tr '\015\012' '\040\040'"
+   ;;
+ esac
  # NLS nuisances.
  # Only set LANG and LC_ALL to C if already set.
-Line 84 
 if test "${LANG+set}" = set; then
+Line 100 
 if test "${LANG+set}" = set; then
    save_LANG="$LANG"; LANG=C; export LANG
  fi
+ # Make sure IFS has a sensible default
+ : ${IFS="       "}
  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
    echo "$modename: not configured to build any kind of library" 1>&2
    echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-Line 141 
 do
+Line 160 
 do
      ;;
    --config)
-     sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+     ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
      exit 0
      ;;
-Line 174 
 do
+Line 193 
 do
    --mode) prevopt="--mode" prev=mode ;;
    --mode=*) mode="$optarg" ;;
+   --preserve-dup-deps) duplicate_deps="yes" ;;
    --quiet | --silent)
      show=:
      ;;
-Line 202 
 if test -n "$prevopt"; then
+Line 223 
 if test -n "$prevopt"; then
    exit 1
  fi
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+ exec_cmd=
  if test -z "$show_help"; then
    # Infer the operation mode.
    if test -z "$mode"; then
      case $nonopt in
-     *cc | *++ | gcc* | *-gcc*)
+     *cc | *++ | gcc* | *-gcc* | xlc*)
        mode=link
        for arg
        do
-Line 329 
 if test -z "$show_help"; then
+Line 355 
 if test -z "$show_help"; then
        -Wc,*)
          args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
          lastarg=
-         IFS="${IFS=     }"; save_ifs="$IFS"; IFS=','
+         save_ifs="$IFS"; IFS=','
          for arg in $args; do
            IFS="$save_ifs"
-Line 459 
 if test -z "$show_help"; then
+Line 485 
 if test -z "$show_help"; then
        pic_mode=default
        ;;
      esac
-     if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
+     if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
        # non-PIC code in shared libraries is not supported
        pic_mode=default
      fi
-Line 615 
 compiler."
+Line 641 
 compiler."
          # Now arrange that obj and lo_libobj become the same file
          $show "(cd $xdir && $LN_S $baseobj $libobj)"
          if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
+           # Unlock the critical section if it was locked
+           if test "$need_locks" != no; then
+             $run $rm "$lockfile"
+           fi
            exit 0
          else
            error=$?
-Line 980 
 compiler."
+Line 1010 
 compiler."
        # so, if we see these flags be careful not to treat them like -L
        -L[A-Z][A-Z]*:*)
          case $with_gcc/$host in
-         no/*-*-irix*)
+         no/*-*-irix* | no/*-*-nonstopux*)
            compile_command="$compile_command $arg"
            finalize_command="$finalize_command $arg"
            ;;
-Line 1031 
 compiler."
+Line 1061 
 compiler."
              # These systems don't actually have a C library (as such)
              test "X$arg" = "X-lc" && continue
              ;;
+           *-*-openbsd* | *-*-freebsd*)
+             # Do not include libc due to us having libc/libc_r.
+             test "X$arg" = "X-lc" && continue
+             ;;
+           esac
+          elif test "X$arg" = "X-lc_r"; then
+           case $host in
+          *-*-openbsd* | *-*-freebsd*)
+             # Do not include libc_r directly, use -pthread flag.
+             continue
+             ;;
            esac
          fi
          deplibs="$deplibs $arg"
-Line 1122 
 compiler."
+Line 1163 
 compiler."
        -Wc,*)
          args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
          arg=
-         IFS="${IFS=     }"; save_ifs="$IFS"; IFS=','
+         save_ifs="$IFS"; IFS=','
          for flag in $args; do
            IFS="$save_ifs"
            case $flag in
-Line 1140 
 compiler."
+Line 1181 
 compiler."
        -Wl,*)
          args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
          arg=
-         IFS="${IFS=     }"; save_ifs="$IFS"; IFS=','
+         save_ifs="$IFS"; IFS=','
          for flag in $args; do
            IFS="$save_ifs"
            case $flag in
-Line 1307 
 compiler."
+Line 1348 
 compiler."
      # Find all interdependent deplibs by searching for libraries
      # that are linked more than once (e.g. -la -lb -la)
      for deplib in $deplibs; do
-       case "$libs " in
+       if test "X$duplicate_deps" = "Xyes" ; then
-       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+         case "$libs " in
-       esac
+         *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+         esac
+       fi
        libs="$libs $deplib"
      done
      deplibs=
-Line 1438 
 compiler."
+Line 1481 
 compiler."
            lib)
              if test "$deplibs_check_method" != pass_all; then
                echo
-               echo "*** Warning: This library needs some functionality provided by $deplib."
+               echo "*** Warning: Trying to link with static lib archive $deplib."
                echo "*** I have the capability to make that library automatically link in when"
                echo "*** you link to this library.  But I can only do this if you have a"
-               echo "*** shared version of the library, which you do not appear to have."
+               echo "*** shared version of the library, which you do not appear to have"
+               echo "*** because the file extensions .$libext of this argument makes me believe"
+               echo "*** that it is just a static archive that I should not used here."
              else
                echo
                echo "*** Warning: Linking the shared library $output against the"
-Line 1485 
 compiler."
+Line 1530 
 compiler."
          fi
          # Check to see that this really is a libtool archive.
-         if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+         if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
          else
            $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
            exit 1
-Line 1532 
 compiler."
+Line 1577 
 compiler."
              tmp_libs=
              for deplib in $dependency_libs; do
                deplibs="$deplib $deplibs"
-               case "$tmp_libs " in
+               if test "X$duplicate_deps" = "Xyes" ; then
-               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+                 case "$tmp_libs " in
-               esac
+                 *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+                 esac
+               fi
                tmp_libs="$tmp_libs $deplib"
              done
            elif test $linkmode != prog && test $linkmode != lib; then
-Line 1657 
 compiler."
+Line 1704 
 compiler."
                # or/and link against static libraries
                newdependency_libs="$deplib $newdependency_libs"
              fi
-             case "$tmp_libs " in
+             if test "X$duplicate_deps" = "Xyes" ; then
-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+               case "$tmp_libs " in
-             esac
+               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+               esac
+             fi
              tmp_libs="$tmp_libs $deplib"
            done # for deplib
            continue
-Line 1743 
 compiler."
+Line 1792 
 compiler."
              # Make a new name for the extract_expsyms_cmds to use
              soroot="$soname"
-             soname=`echo $soroot | sed -e 's/^.*\///'`
+             soname=`echo $soroot | ${SED} -e 's/^.*\///'`
-             newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
+             newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
              # If the library has no export list, then create one now
              if test -f "$output_objdir/$soname-def"; then :
              else
                $show "extracting exported symbol list from \`$soname'"
-               IFS="${IFS=       }"; save_ifs="$IFS"; IFS='~'
+               save_ifs="$IFS"; IFS='~'
                eval cmds=\"$extract_expsyms_cmds\"
                for cmd in $cmds; do
                  IFS="$save_ifs"
-Line 1763 
 compiler."
+Line 1812 
 compiler."
              # Create $newlib
              if test -f "$output_objdir/$newlib"; then :; else
                $show "generating import library for \`$soname'"
-               IFS="${IFS=       }"; save_ifs="$IFS"; IFS='~'
+               save_ifs="$IFS"; IFS='~'
                eval cmds=\"$old_archive_from_expsyms_cmds\"
                for cmd in $cmds; do
                  IFS="$save_ifs"
-Line 1903 
 compiler."
+Line 1952 
 compiler."
              # Just print a warning and add the library to dependency_libs so
              # that the program can be linked against the static library.
              echo
-             echo "*** Warning: This library needs some functionality provided by $lib."
+             echo "*** Warning: This system can not link to static lib archive $lib."
              echo "*** I have the capability to make that library automatically link in when"
              echo "*** you link to this library.  But I can only do this if you have a"
              echo "*** shared version of the library, which you do not appear to have."
              if test "$module" = yes; then
-               echo "*** Therefore, libtool will create a static module, that should work "
+               echo "*** But as you try to build a module library, libtool will still create "
-               echo "*** as long as the dlopening application is linked with the -dlopen flag."
+               echo "*** a static module, that should work as long as the dlopening application"
+               echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
                if test -z "$global_symbol_pipe"; then
                  echo
                  echo "*** However, this would only work if libtool was able to extract symbol"
                  echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
                  echo "*** not find such a program.  So, this module is probably useless."
                  echo "*** \`nm' from GNU binutils and a full rebuild may help."
                fi
                if test "$build_old_libs" = no; then
                  build_libtool_libs=module
                  build_old_libs=yes
                else
                  build_libtool_libs=no
                fi
              fi
            else
-Line 1958 
 compiler."
+Line 2008 
 compiler."
            tmp_libs=
            for deplib in $dependency_libs; do
              newdependency_libs="$deplib $newdependency_libs"
-             case "$tmp_libs " in
+             if test "X$duplicate_deps" = "Xyes" ; then
-             *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+               case "$tmp_libs " in
-             esac
+               *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+               esac
+             fi
              tmp_libs="$tmp_libs $deplib"
            done
-Line 1986 
 compiler."
+Line 2038 
 compiler."
                  if grep "^installed=no" $deplib > /dev/null; then
                    path="-L$absdir/$objdir"
                  else
-                   eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                   eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                    if test -z "$libdir"; then
                      $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                      exit 1
-Line 2175 
 compiler."
+Line 2227 
 compiler."
        else
          # Parse the version information argument.
-         IFS="${IFS=     }"; save_ifs="$IFS"; IFS=':'
+         save_ifs="$IFS"; IFS=':'
          set dummy $vinfo 0 0 0
          IFS="$save_ifs"
-Line 2250 
 compiler."
+Line 2302 
 compiler."
            versuffix=".$current";
            ;;
-         irix)
+         irix | nonstopux)
            major=`expr $current - $age + 1`
-           verstring="sgi$major.$revision"
+           case $version_type in
+             nonstopux) verstring_prefix=nonstopux ;;
+             *)         verstring_prefix=sgi ;;
+           esac
+           verstring="$verstring_prefix$major.$revision"
            # Add in all the interfaces that we are compatible with.
            loop=$revision
            while test $loop != 0; do
              iface=`expr $revision - $loop`
              loop=`expr $loop - 1`
-             verstring="sgi$major.$iface:$verstring"
+             verstring="$verstring_prefix$major.$iface:$verstring"
            done
            # Before this point, $major must not contain `.'.
-Line 2273 
 compiler."
+Line 2330 
 compiler."
            ;;
          osf)
-           major=`expr $current - $age`
+           major=.`expr $current - $age`
            versuffix=".$current.$age.$revision"
            verstring="$current.$age.$revision"
-Line 2312 
 compiler."
+Line 2369 
 compiler."
          if test -z "$vinfo" && test -n "$release"; then
            major=
            verstring="0.0"
+           case $version_type in
+           darwin)
+             # we can't check for "0.0" in archive_cmds due to quoting
+             # problems, so we reset it completely
+             verstring=""
+             ;;
+           *)
+             verstring="0.0"
+             ;;
+           esac
            if test "$need_version" = no; then
              versuffix=
            else
-Line 2355 
 compiler."
+Line 2422 
 compiler."
        # Eliminate all temporary directories.
        for path in $notinst_path; do
-         lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
+         lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-         deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
+         deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-         dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
+         dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
        done
        if test -n "$xrpath"; then
-Line 2408 
 compiler."
+Line 2475 
 compiler."
            *-*-netbsd*)
              # Don't link with libc until the a.out ld.so is fixed.
              ;;
+           *-*-openbsd* | *-*-freebsd*)
+             # Do not include libc due to us having libc/libc_r.
+             ;;
            *)
              # Add libc to deplibs on all other systems if necessary.
              if test $build_libtool_need_lc = "yes"; then
-Line 2435 
 compiler."
+Line 2505 
 compiler."
          pass_all)
            # Don't check for shared/static.  Everything works.
            # This might be a little naive.  We might want to check
            # whether the library exists or not.  But this is on
            # osf3 & osf4 and I'm not really sure... Just
            # implementing what was already the behaviour.
            newdeplibs=$deplibs
-Line 2466 
 EOF
+Line 2536 
 EOF
                  else
                    droppeddeps=yes
                    echo
-                   echo "*** Warning: This library needs some functionality provided by $i."
+                   echo "*** Warning: dynamic linker does not accept needed library $i."
                    echo "*** I have the capability to make that library automatically link in when"
                    echo "*** you link to this library.  But I can only do this if you have a"
-                   echo "*** shared version of the library, which you do not appear to have."
+                   echo "*** shared version of the library, which I believe you do not have"
+                   echo "*** because a test_compile did reveal that the linker did not use it for"
+                   echo "*** its dynamic dependency list that programs get resolved with at runtime."
                  fi
                else
                  newdeplibs="$newdeplibs $i"
                fi
              done
            else
-             # Error occured in the first compile.  Let's try to salvage the situation:
+             # Error occured in the first compile.  Let's try to salvage
-             # Compile a seperate program for each library.
+             # the situation: Compile a separate program for each library.
              for i in $deplibs; do
                name="`expr $i : '-l\(.*\)'`"
               # If $name is empty we are operating on a -L argument.
-Line 2496 
 EOF
+Line 2568 
 EOF
                    else
                      droppeddeps=yes
                      echo
-                     echo "*** Warning: This library needs some functionality provided by $i."
+                     echo "*** Warning: dynamic linker does not accept needed library $i."
                      echo "*** I have the capability to make that library automatically link in when"
                      echo "*** you link to this library.  But I can only do this if you have a"
-                     echo "*** shared version of the library, which you do not appear to have."
+                     echo "*** shared version of the library, which you do not appear to have"
+                     echo "*** because a test_compile did reveal that the linker did not use this one"
+                     echo "*** as a dynamic dependency that programs can get resolved with at runtime."
                    fi
                  else
                    droppeddeps=yes
-Line 2538 
 EOF
+Line 2612 
 EOF
                        # but so what?
                        potlib="$potent_lib"
                        while test -h "$potlib" 2>/dev/null; do
-                         potliblink=`ls -ld $potlib | sed 's/.* -> //'`
+                         potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
                          case $potliblink in
                          [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
                          *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
                          esac
                        done
                        if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-                          | sed 10q \
+                          | ${SED} 10q \
                           | egrep "$file_magic_regex" > /dev/null; then
                          newdeplibs="$newdeplibs $a_deplib"
                          a_deplib=""
-Line 2556 
 EOF
+Line 2630 
 EOF
                if test -n "$a_deplib" ; then
                  droppeddeps=yes
                  echo
-                 echo "*** Warning: This library needs some functionality provided by $a_deplib."
+                 echo "*** Warning: linker path does not have real file for library $a_deplib."
                  echo "*** I have the capability to make that library automatically link in when"
                  echo "*** you link to this library.  But I can only do this if you have a"
-                 echo "*** shared version of the library, which you do not appear to have."
+                 echo "*** shared version of the library, which you do not appear to have"
+                 echo "*** because I did check the linker path looking for a file starting"
+                 if test -z "$potlib" ; then
+                   echo "*** with $libname but no candidates were found. (...for file magic test)"
+                 else
+                   echo "*** with $libname and none of the candidates passed a file format test"
+                   echo "*** using a file magic. Last file checked: $potlib"
+                 fi
                fi
              else
                # Add a -L argument.
-Line 2578 
 EOF
+Line 2659 
 EOF
                for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
                  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
                  for potent_lib in $potential_libs; do
+                   potlib="$potent_lib" # see symlink-check below in file_magic test
                    if eval echo \"$potent_lib\" 2>/dev/null \
-                       | sed 10q \
+                       | ${SED} 10q \
                        | egrep "$match_pattern_regex" > /dev/null; then
                      newdeplibs="$newdeplibs $a_deplib"
                      a_deplib=""
-Line 2590 
 EOF
+Line 2672 
 EOF
                if test -n "$a_deplib" ; then
                  droppeddeps=yes
                  echo
-                 echo "*** Warning: This library needs some functionality provided by $a_deplib."
+                 echo "*** Warning: linker path does not have real file for library $a_deplib."
                  echo "*** I have the capability to make that library automatically link in when"
                  echo "*** you link to this library.  But I can only do this if you have a"
-                 echo "*** shared version of the library, which you do not appear to have."
+                 echo "*** shared version of the library, which you do not appear to have"
+                 echo "*** because I did check the linker path looking for a file starting"
+                 if test -z "$potlib" ; then
+                   echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+                 else
+                   echo "*** with $libname and none of the candidates passed a file format test"
+                   echo "*** using a regex pattern. Last file checked: $potlib"
+                 fi
                fi
              else
                # Add a -L argument.
-Line 2604 
 EOF
+Line 2693 
 EOF
          none | unknown | *)
            newdeplibs=""
            if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
                 -e 's/ -[LR][^ ]*//g' -e 's/[    ]//g' |
               grep . >/dev/null; then
              echo
              if test "X$deplibs_check_method" = "Xnone"; then
-Line 2634 
 EOF
+Line 2723 
 EOF
            if test "$module" = yes; then
              echo
              echo "*** Warning: libtool could not satisfy all declared inter-library"
              echo "*** dependencies of module $libname.  Therefore, libtool will create"
              echo "*** a static module, that should work as long as the dlopening"
              echo "*** application is linked with the -dlopen flag."
              if test -z "$global_symbol_pipe"; then
-Line 2784 
 EOF
+Line 2873 
 EOF
              export_symbols="$output_objdir/$libname.exp"
              $run $rm $export_symbols
              eval cmds=\"$export_symbols_cmds\"
-             IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
+             save_ifs="$IFS"; IFS='~'
              for cmd in $cmds; do
                IFS="$save_ifs"
                $show "$cmd"
-Line 2858 
 EOF
+Line 2947 
 EOF
          if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
            eval cmds=\"$archive_expsym_cmds\"
          else
+           save_deplibs="$deplibs"
+           for conv in $convenience; do
+             tmp_deplibs=
+             for test_deplib in $deplibs; do
+               if test "$test_deplib" != "$conv"; then
+                 tmp_deplibs="$tmp_deplibs $test_deplib"
+               fi
+             done
+             deplibs="$tmp_deplibs"
+           done
            eval cmds=\"$archive_cmds\"
+           deplibs="$save_deplibs"
          fi
-         IFS="${IFS=     }"; save_ifs="$IFS"; IFS='~'
+         save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
            $show "$cmd"
-Line 2988 
 EOF
+Line 3088 
 EOF
        output="$obj"
        eval cmds=\"$reload_cmds\"
-       IFS="${IFS=       }"; save_ifs="$IFS"; IFS='~'
+       save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
          $show "$cmd"
-Line 3024 
 EOF
+Line 3124 
 EOF
          reload_objs="$libobjs $reload_conv_objs"
          output="$libobj"
          eval cmds=\"$reload_cmds\"
-         IFS="${IFS=     }"; save_ifs="$IFS"; IFS='~'
+         save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
            $show "$cmd"
-Line 3057 
 EOF
+Line 3157 
 EOF
      prog)
        case $host in
-         *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
+         *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
        esac
        if test -n "$vinfo"; then
          $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-Line 3079 
 EOF
+Line 3179 
 EOF
          # On Rhapsody replace the C library is the System framework
          compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
          finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+         case $host in
+         *darwin*)
+           # Don't allow lazy linking, it breaks C++ global constructors
+           compile_command="$compile_command ${wl}-bind_at_load"
+           finalize_command="$finalize_command ${wl}-bind_at_load"
+           ;;
+         esac
          ;;
        esac
-Line 3245 
 extern \"C\" {
+Line 3352 
 extern \"C\" {
              if test -z "$export_symbols"; then
                export_symbols="$output_objdir/$output.exp"
                $run $rm $export_symbols
-               $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+               $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
              else
-               $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+               $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
                $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
                $run eval 'mv "$nlist"T "$nlist"'
              fi
-Line 3255 
 extern \"C\" {
+Line 3362 
 extern \"C\" {
            for arg in $dlprefiles; do
              $show "extracting global C symbols from \`$arg'"
-             name=`echo "$arg" | sed -e 's%^.*/%%'`
+             name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
              $run eval 'echo ": $name " >> "$nlist"'
              $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
            done
-Line 3270 
 extern \"C\" {
+Line 3377 
 extern \"C\" {
              fi
              # Try sorting and uniquifying the output.
-             if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
+             if grep -v "^: " < "$nlist" |
+                 if sort -k 3 </dev/null >/dev/null 2>&1; then
+                   sort -k 3
+                 else
+                   sort +2
+                 fi |
+                 uniq > "$nlist"S; then
                :
              else
                grep -v "^: " < "$nlist" > "$nlist"S
-Line 3287 
 extern \"C\" {
+Line 3400 
 extern \"C\" {
  #undef lt_preloaded_symbols
  #if defined (__STDC__) && __STDC__
- # define lt_ptr_t void *
+ # define lt_ptr void *
  #else
- # define lt_ptr_t char *
+ # define lt_ptr char *
  # define const
  #endif
  /* The mapping between symbol names and symbols. */
  const struct {
    const char *name;
-   lt_ptr_t address;
+   lt_ptr address;
  }
  lt_preloaded_symbols[] =
  {\
  "
-             sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
+             eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-                 -e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
-                   < "$nlist" >> "$output_objdir/$dlsyms"
              $echo >> "$output_objdir/$dlsyms" "\
-   {0, (lt_ptr_t) 0}
+   {0, (lt_ptr) 0}
  };
  /* This works around a problem in FreeBSD linker */
-Line 3494 
 static const void *lt_preloaded_setup()
+Line 3605 
 static const void *lt_preloaded_setup()
              relink_command="$var=\"$var_value\"; export $var; $relink_command"
            fi
          done
-         relink_command="cd `pwd`; $relink_command"
+         relink_command="(cd `pwd`; $relink_command)"
          relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
        fi
-Line 3514 
 static const void *lt_preloaded_setup()
+Line 3625 
 static const void *lt_preloaded_setup()
          # win32 will think the script is a binary if it has
          # a .exe suffix, so we strip it off here.
          case $output in
-           *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+           *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
          esac
          # test for cygwin because mv fails w/o .exe extensions
          case $host in
-Line 3538 
 static const void *lt_preloaded_setup()
+Line 3649 
 static const void *lt_preloaded_setup()
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
- Xsed='sed -e 1s/^X//'
+ Xsed="${SED}"' -e 1s/^X//'
  sed_quote_subst='$sed_quote_subst'
  # The HP-UX ksh and POSIX shell print the target directory to stdout
-Line 3576 
 else
+Line 3687 
 else
    test \"x\$thisdir\" = \"x\$file\" && thisdir=.
    # Follow symbolic links until we get to the real thisdir.
-   file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+   file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
    while test -n \"\$file\"; do
      destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-Line 3589 
 else
+Line 3700 
 else
      fi
      file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-     file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
+     file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
    done
    # Try to get the absolute directory name.
-Line 3603 
 else
+Line 3714 
 else
    progdir=\"\$thisdir/$objdir\"
    if test ! -f \"\$progdir/\$program\" || \\
-      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
+      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
         test \"X\$file\" != \"X\$progdir/\$program\"; }; then
      file=\"\$\$-\$program\"
-Line 3618 
 else
+Line 3729 
 else
      # relink executable if necessary
      if test -n \"\$relink_command\"; then
-       if (eval \$relink_command); then :
+       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
        else
+         $echo \"\$relink_command_output\" >&2
          $rm \"\$progdir/\$file\"
          exit 1
        fi
-Line 3648 
 else
+Line 3760 
 else
      $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
      # Some systems cannot cope with colon-terminated $shlibpath_var
-     # The second colon is a workaround for a bug in BeOS R4 sed
+     # The second colon is a workaround for a bug in BeOS R4 ${SED}
      $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
      export $shlibpath_var
-Line 3790 
 fi\
+Line 3902 
 fi\
          eval cmds=\"$old_archive_cmds\"
        fi
-       IFS="${IFS=       }"; save_ifs="$IFS"; IFS='~'
+       save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
          $show "$cmd"
-Line 3823 
 fi\
+Line 3935 
 fi\
          fi
        done
        # Quote the link command for shipping.
-       relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+       relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
        relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
        # Only create the output if not a dry run.
-Line 3840 
 fi\
+Line 3952 
 fi\
                case $deplib in
                *.la)
                  name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-                 eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                  if test -z "$libdir"; then
                    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                    exit 1
-Line 3854 
 fi\
+Line 3966 
 fi\
              newdlfiles=
              for lib in $dlfiles; do
                name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-               eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
                if test -z "$libdir"; then
                  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
                  exit 1
-Line 3865 
 fi\
+Line 3977 
 fi\
              newdlprefiles=
              for lib in $dlprefiles; do
                name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-               eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
                if test -z "$libdir"; then
                  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
                  exit 1
-Line 4089 
 relink_command=\"$relink_command\""
+Line 4201 
 relink_command=\"$relink_command\""
        *.la)
          # Check to see that this really is a libtool archive.
-         if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+         if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
          else
            $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
            $echo "$help" 1>&2
-Line 4165 
 relink_command=\"$relink_command\""
+Line 4277 
 relink_command=\"$relink_command\""
            # Do each command in the postinstall commands.
            lib="$destdir/$realname"
            eval cmds=\"$postinstall_cmds\"
-           IFS="${IFS=   }"; save_ifs="$IFS"; IFS='~'
+           save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"
              $show "$cmd"
-Line 4238 
 relink_command=\"$relink_command\""
+Line 4350 
 relink_command=\"$relink_command\""
          fi
          # Do a test to see if this is really a libtool program.
-         if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+         case $host in
+         *cygwin*|*mingw*)
+             wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
+             ;;
+         *)
+             wrapper=$file
+             ;;
+         esac
+         if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
            notinst_deplibs=
            relink_command=
            # If there is no directory component, then add one.
            case $file in
-           */* | *\\*) . $file ;;
+           */* | *\\*) . $wrapper ;;
-           *) . ./$file ;;
+           *) . ./$wrapper ;;
            esac
            # Check the variables that should have been set.
            if test -z "$notinst_deplibs"; then
-             $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+             $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
              exit 1
            fi
-Line 4275 
 relink_command=\"$relink_command\""
+Line 4395 
 relink_command=\"$relink_command\""
            relink_command=
            # If there is no directory component, then add one.
            case $file in
-           */* | *\\*) . $file ;;
+           */* | *\\*) . $wrapper ;;
-           *) . ./$file ;;
+           *) . ./$wrapper ;;
            esac
            outputname=
-Line 4324 
 relink_command=\"$relink_command\""
+Line 4444 
 relink_command=\"$relink_command\""
              destfile=$destfile.exe
              ;;
            *:*.exe)
-             destfile=`echo $destfile | sed -e 's,.exe$,,'`
+             destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
              ;;
            esac
            ;;
-Line 4352 
 relink_command=\"$relink_command\""
+Line 4472 
 relink_command=\"$relink_command\""
        # Do each command in the postinstall commands.
        eval cmds=\"$old_postinstall_cmds\"
-       IFS="${IFS=       }"; save_ifs="$IFS"; IFS='~'
+       save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
          $show "$cmd"
-Line 4368 
 relink_command=\"$relink_command\""
+Line 4488 
 relink_command=\"$relink_command\""
      if test -n "$current_libdirs"; then
        # Maybe just do a dry run.
        test -n "$run" && current_libdirs=" -n$current_libdirs"
-       exec $SHELL $0 --finish$current_libdirs
+       exec_cmd='$SHELL $0 --finish$current_libdirs'
-       exit 1
+     else
+       exit 0
      fi
-     exit 0
      ;;
    # libtool finish mode
-Line 4391 
 relink_command=\"$relink_command\""
+Line 4510 
 relink_command=\"$relink_command\""
          if test -n "$finish_cmds"; then
            # Do each command in the finish commands.
            eval cmds=\"$finish_cmds\"
-           IFS="${IFS=   }"; save_ifs="$IFS"; IFS='~'
+           save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"
              $show "$cmd"
-Line 4473 
 relink_command=\"$relink_command\""
+Line 4592 
 relink_command=\"$relink_command\""
        case $file in
        *.la)
          # Check to see that this really is a libtool archive.
-         if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+         if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
          else
            $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
            $echo "$help" 1>&2
-Line 4544 
 relink_command=\"$relink_command\""
+Line 4663 
 relink_command=\"$relink_command\""
        -*) ;;
        *)
          # Do a test to see if this is really a libtool program.
-         if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+         if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
            # If there is no directory component, then add one.
            case $file in
            */* | *\\*) . $file ;;
-Line 4575 
 relink_command=\"$relink_command\""
+Line 4694 
 relink_command=\"$relink_command\""
          LANG="$save_LANG"; export LANG
        fi
-       # Now actually exec the command.
+       # Now prepare to actually exec the command.
-       eval "exec \$cmd$args"
+       exec_cmd="\$cmd$args"
-       $echo "$modename: cannot exec \$cmd$args"
-       exit 1
      else
        # Display what would be done.
        if test -n "$shlibpath_var"; then
-Line 4641 
 relink_command=\"$relink_command\""
+Line 4757 
 relink_command=\"$relink_command\""
        # Don't error if the file doesn't exist and rm -f was used.
        if (test -L "$file") >/dev/null 2>&1 \
          || (test -h "$file") >/dev/null 2>&1 \
          || test -f "$file"; then
          :
        elif test -d "$file"; then
          exit_status=1
          continue
        elif test "$rmforce" = yes; then
          continue
        fi
        rmfiles="$file"
-Line 4656 
 relink_command=\"$relink_command\""
+Line 4772 
 relink_command=\"$relink_command\""
        case $name in
        *.la)
          # Possibly a libtool archive, so verify it.
-         if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+         if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
            . $dir/$name
            # Delete the libtool libraries and symlinks.
-Line 4670 
 relink_command=\"$relink_command\""
+Line 4786 
 relink_command=\"$relink_command\""
              if test -n "$library_names"; then
                # Do each command in the postuninstall commands.
                eval cmds=\"$postuninstall_cmds\"
-               IFS="${IFS=       }"; save_ifs="$IFS"; IFS='~'
+               save_ifs="$IFS"; IFS='~'
                for cmd in $cmds; do
                  IFS="$save_ifs"
                  $show "$cmd"
-Line 4685 
 relink_command=\"$relink_command\""
+Line 4801 
 relink_command=\"$relink_command\""
              if test -n "$old_library"; then
                # Do each command in the old_postuninstall commands.
                eval cmds=\"$old_postuninstall_cmds\"
-               IFS="${IFS=       }"; save_ifs="$IFS"; IFS='~'
+               save_ifs="$IFS"; IFS='~'
                for cmd in $cmds; do
                  IFS="$save_ifs"
                  $show "$cmd"
-Line 4711 
 relink_command=\"$relink_command\""
+Line 4827 
 relink_command=\"$relink_command\""
        *)
          # Do a test to see if this is a libtool program.
          if test $mode = clean &&
-            (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+            (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
            relink_command=
            . $dir/$file
-Line 4744 
 relink_command=\"$relink_command\""
+Line 4860 
 relink_command=\"$relink_command\""
      ;;
    esac
-   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   if test -z "$exec_cmd"; then
-   $echo "$generic_help" 1>&2
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
-   exit 1
+     $echo "$generic_help" 1>&2
+     exit 1
+   fi
  fi # test -z "$show_help"
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+   exit 1
+ fi
  # We need to display help for each of the modes.
  case $mode in
  "") $echo \

 Legend:



Removed from v.62
 


changed lines


 
Added in v.63
 Legend:



Removed from v.62
 


changed lines


 
Added in v.63
-Removed from v.62
+Added in v.63

webmaster@exim.org	ViewVC Help
Powered by ViewVC 1.1.12