* ltconfig.in: set need_version=no on OSF (reported by

  Marcus Sundberg <mackan@stacken.kth.se>)
* ltmain.in: allow absolute non-existant -L paths,
  always use output_objdir instead of objdir for temporary files
  and create the directory before generating symbol lists,
  delete generated temporary symbol lists,
  don't add .la twice in the pseudo-library header
* ltmain.in (help uninstall): added a missing backslash
  after echo (reported by Ossama Othman)

diff --git a/ChangeLog b/ChangeLog
index eb137e03f6ca13d956d8d10ffbcda4ec65cd48cb..65c3a5c35e5a5dbba9811d3c5952e37e80e7dac5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-04-27 Thomas Tanner  <tanner@gmx.de>
+
+       * ltconfig.in: set need_version=no on OSF (reported by
+         Marcus Sundberg <mackan@stacken.kth.se>)
+       * ltmain.in: allow absolute non-existant -L paths,
+         always use output_objdir instead of objdir for temporary files
+         and create the directory before generating symbol lists,
+         delete generated temporary symbol lists,
+         don't add .la twice in the pseudo-library header
+       * ltmain.in (help uninstall): added a missing backslash
+         after echo (reported by Ossama Othman)
+         
 1999-04-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * ltmain.in (old_archive_cmds): Iterate on oldobjs to find out

diff --git a/ltconfig.in b/ltconfig.in
index 6d19906db57aa939ae0b93b2324e303a3efda1ae..6194af33b400e19e93e8cc9247d51be6fe115752 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -103,7 +103,7 @@ if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
       # This shell has a builtin print -r that does the trick.
       echo='print -r'
     elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-         test "X$CONFIG_SHELL" != X/bin/ksh; then
+        test "X$CONFIG_SHELL" != X/bin/ksh; then
       # If we have ksh, try running ltconfig again with it.
       ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
       export ORIGINAL_CONFIG_SHELL
@@ -1872,6 +1872,7 @@ os2*)
 
 osf3* | osf4*)
   version_type=osf
+  need_version=no
   soname_spec='${libname}${release}.so'
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
   shlibpath_var=LD_LIBRARY_PATH

diff --git a/ltmain.in b/ltmain.in
index 8a57a7684378ae1904a932c095118525e1b44bb7..dd48b8817a10c77a7f2cff80b7861b97514978b2 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1015,11 +1015,6 @@ compiler."
 
       -L*)
        dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-       if test -d "$dir"; then :
-       else
-         $echo "$modename: directory \`$dir' does not exist, dropping it" 1>&2
-         continue
-       fi
        # We need an absolute path.
        case "$dir" in
        [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2087,7 +2082,7 @@ EOF
        if test -z "$export_symbols"; then
          if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
            $show "generating symbol list for \`$libname.la'"
-           export_symbols="$objdir/$libname.exp"
+           export_symbols="$output_objdir/$libname.exp"
            $run $rm $export_symbols
            eval cmds=\"$export_symbols_cmds\"
            IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
@@ -2347,6 +2342,16 @@ EOF
        output_objdir="$output_objdir/$objdir"
       fi
 
+      # Create the binary in the object directory, then wrap it.
+      if test ! -d $output_objdir; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+       status=$?
+       if test $status -ne 0 && test ! -d $output_objdir; then
+         exit $status
+       fi
+      fi
+
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
        # Transform all the library objects into standard objects.
        compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
@@ -2367,24 +2372,15 @@ EOF
        "") ;;
        *.c)
          # Discover the nlist of each of the dlfiles.
-         nlist="$objdir/${output}.nm"
+         nlist="$output_objdir/${output}.nm"
 
-         if test -d $objdir; then
-           $show "$rm $nlist ${nlist}S ${nlist}T"
-           $run $rm "$nlist" "${nlist}S" "${nlist}T"
-         else
-           $show "$mkdir $objdir"
-           $run $mkdir $objdir
-           status=$?
-           if test $status -ne 0 && test ! -d $objdir; then
-             exit $status
-           fi
-         fi
+         $show "$rm $nlist ${nlist}S ${nlist}T"
+         $run $rm "$nlist" "${nlist}S" "${nlist}T"
 
          # Parse the name list into a source file.
-         $show "creating $objdir/$dlsyms"
+         $show "creating $output_objdir/$dlsyms"
 
-         test -z "$run" && $echo > "$objdir/$dlsyms" "\
+         test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
 /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
 /* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
 
@@ -2422,12 +2418,12 @@ extern \"C\" {
 
            # Prepare the list of exported symbols
            if test -z "$export_symbols"; then
-             export_symbols="$objdir/$output.exp"
+             export_symbols="$output_objdir/$output.exp"
              $run $rm $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" > "$objdir/$output.exp"'
-             $run eval 'grep -f "$objdir/$output.exp" < "$nlist" > "$nlist"T'
+             $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
          fi
@@ -2517,12 +2513,16 @@ static const void *lt_preloaded_setup() {
          esac
 
          # Now compile the dynamic symbol file.
-         $show "(cd $objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-         $run eval '(cd $objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+         $show "(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+         $run eval '(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+         # Clean up the generated files.
+         $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+         $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
 
          # Transform the symbol file into the correct name.
-         compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
-         finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
+         compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${output}S.${objext}%"`
+         finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${output}S.${objext}%"`
          ;;
        *)
          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -2547,6 +2547,13 @@ static const void *lt_preloaded_setup() {
        # We have no uninstalled library dependencies, so finalize right now.
        $show "$link_command"
        $run eval "$link_command"
+       
+       # Delete the generated files.
+       if test -n "$dlsyms"; then
+         $show "$rm $output_objdir/${output}S.${objext}"
+         $run $rm "$output_objdir/${output}S.${objext}"
+       fi
+
        exit $?
       fi
 
@@ -2621,16 +2628,6 @@ static const void *lt_preloaded_setup() {
       # Replace the output file specification.
       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
       
-      # Create the binary in the object directory, then wrap it.
-      if test ! -d $output_objdir; then
-       $show "$mkdir $output_objdir"
-       $run $mkdir $output_objdir
-       status=$?
-       if test $status -ne 0 && test ! -d $objdir; then
-         exit $status
-       fi
-      fi
-
       # Delete the old output files.
       $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
@@ -2957,7 +2954,7 @@ fi\
          fi
          $rm $output
          $echo > $output "\
-# $outputname.la - a libtool library file
+# $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
 #
 # Please DO NOT delete this file!
@@ -3863,7 +3860,7 @@ is created, otherwise an executable program is created."
   ;;
 
 uninstall)
-  $echo
+  $echo \
 "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 
 Remove libraries from an installation directory.