/[libtool]/libtool/ltmain.in
ViewVC logotype

Diff of /libtool/ltmain.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.334.2.74 by rwild, Fri Jul 1 02:23:01 2005 UTC revision 1.334.2.75 by rwild, Sat Jul 2 10:19:39 2005 UTC
# Line 575  if test -z "$show_help"; then Line 575  if test -z "$show_help"; then
575    
576      for arg      for arg
577      do      do
578        case "$arg_mode" in        case $arg_mode in
579        arg  )        arg  )
580          # do not "continue".  Instead, add this to base_compile          # do not "continue".  Instead, add this to base_compile
581          lastarg="$arg"          lastarg="$arg"
# Line 2593  EOF Line 2593  EOF
2593                  add_dir="-L$dir"                  add_dir="-L$dir"
2594                  # Try looking first in the location we're being installed to.                  # Try looking first in the location we're being installed to.
2595                  if test -n "$inst_prefix_dir"; then                  if test -n "$inst_prefix_dir"; then
2596                    case "$libdir" in                    case $libdir in
2597                      [\\/]*)                      [\\/]*)
2598                        add_dir="$add_dir -L$inst_prefix_dir$libdir"                        add_dir="$add_dir -L$inst_prefix_dir$libdir"
2599                        ;;                        ;;
# Line 2666  EOF Line 2666  EOF
2666                add_dir="-L$libdir"                add_dir="-L$libdir"
2667                # Try looking first in the location we're being installed to.                # Try looking first in the location we're being installed to.
2668                if test -n "$inst_prefix_dir"; then                if test -n "$inst_prefix_dir"; then
2669                  case "$libdir" in                  case $libdir in
2670                    [\\/]*)                    [\\/]*)
2671                      add_dir="$add_dir -L$inst_prefix_dir$libdir"                      add_dir="$add_dir -L$inst_prefix_dir$libdir"
2672                      ;;                      ;;
# Line 3416  EOF Line 3416  EOF
3416            if test "$?" -eq 0 ; then            if test "$?" -eq 0 ; then
3417              ldd_output=`ldd conftest`              ldd_output=`ldd conftest`
3418              for i in $deplibs; do              for i in $deplibs; do
3419                name="`expr $i : '-l\(.*\)'`"                name=`expr $i : '-l\(.*\)'`
3420                # If $name is empty we are operating on a -L argument.                # If $name is empty we are operating on a -L argument.
3421                if test "$name" != "" && test "$name" -ne "0"; then                if test "$name" != "" && test "$name" -ne "0"; then
3422                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then                  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
# Line 3453  EOF Line 3453  EOF
3453              # Error occurred in the first compile.  Let's try to salvage              # Error occurred in the first compile.  Let's try to salvage
3454              # the situation: Compile a separate program for each library.              # the situation: Compile a separate program for each library.
3455              for i in $deplibs; do              for i in $deplibs; do
3456                name="`expr $i : '-l\(.*\)'`"                name=`expr $i : '-l\(.*\)'`
3457                # If $name is empty we are operating on a -L argument.                # If $name is empty we are operating on a -L argument.
3458                if test "$name" != "" && test "$name" != "0"; then                if test "$name" != "" && test "$name" != "0"; then
3459                  $rm conftest                  $rm conftest
# Line 3505  EOF Line 3505  EOF
3505            set dummy $deplibs_check_method            set dummy $deplibs_check_method
3506            file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`            file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
3507            for a_deplib in $deplibs; do            for a_deplib in $deplibs; do
3508              name="`expr $a_deplib : '-l\(.*\)'`"              name=`expr $a_deplib : '-l\(.*\)'`
3509              # If $name is empty we are operating on a -L argument.              # If $name is empty we are operating on a -L argument.
3510              if test "$name" != "" && test  "$name" != "0"; then              if test "$name" != "" && test  "$name" != "0"; then
3511                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
# Line 3574  EOF Line 3574  EOF
3574            set dummy $deplibs_check_method            set dummy $deplibs_check_method
3575            match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`            match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
3576            for a_deplib in $deplibs; do            for a_deplib in $deplibs; do
3577              name="`expr $a_deplib : '-l\(.*\)'`"              name=`expr $a_deplib : '-l\(.*\)'`
3578              # If $name is empty we are operating on a -L argument.              # If $name is empty we are operating on a -L argument.
3579              if test -n "$name" && test "$name" != "0"; then              if test -n "$name" && test "$name" != "0"; then
3580                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

Legend:
Removed from v.1.334.2.74  
changed lines
  Added in v.1.334.2.75

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26