--- psiconv/configure.orig	Fri Nov 15 15:20:21 2002
+++ psiconv/configure	Fri Nov 15 15:22:36 2002
@@ -6092,8 +6092,8 @@
       hardcode_shlibpath_var=no
 
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-R$libdir'
 	export_dynamic_flag_spec='${wl}-E'
       else
        case $host_os in
@@ -6102,8 +6102,8 @@
 	   hardcode_libdir_flag_spec='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec='${wl}-R$libdir'
 	   ;;
        esac
       fi
@@ -12024,8 +12024,8 @@
 	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
 	   ;;
 	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   hardcode_libdir_flag_spec_GCJ='${wl}-R$libdir'
 	   ;;
        esac
       fi
