101 lines
4.3 KiB
Diff
101 lines
4.3 KiB
Diff
--- net-snmp-5.4/configure.libdir 2006-11-27 14:27:52.000000000 +0100
|
|
+++ net-snmp-5.4/configure 2006-11-27 14:31:34.000000000 +0100
|
|
@@ -5161,7 +5161,7 @@
|
|
# Let's accept both of them until this is cleared up.
|
|
lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
|
|
lt_cv_file_magic_cmd=/usr/bin/file
|
|
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
|
+ lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so.*`
|
|
;;
|
|
esac
|
|
else
|
|
@@ -5178,15 +5178,15 @@
|
|
case $host_cpu in
|
|
ia64*)
|
|
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
|
|
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
|
|
+ lt_cv_file_magic_test_file=$LIBDIR/hpux32/libc.so
|
|
;;
|
|
hppa*64*)
|
|
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
|
|
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
|
|
+ lt_cv_file_magic_test_file=$LIBDIR/pa20_64/libc.sl
|
|
;;
|
|
*)
|
|
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
|
|
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
|
|
+ lt_cv_file_magic_test_file=$LIBDIR/libc.sl
|
|
;;
|
|
esac
|
|
;;
|
|
@@ -5222,7 +5222,7 @@
|
|
newos6*)
|
|
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
|
|
lt_cv_file_magic_cmd=/usr/bin/file
|
|
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
|
+ lt_cv_file_magic_test_file=$LIBDIR/libnls.so
|
|
;;
|
|
|
|
nto-qnx*)
|
|
@@ -5249,7 +5249,7 @@
|
|
case $host_vendor in
|
|
motorola)
|
|
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
|
|
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
|
|
+ lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so*`
|
|
;;
|
|
ncr)
|
|
lt_cv_deplibs_check_method=pass_all
|
|
@@ -8761,13 +8761,13 @@
|
|
fi
|
|
rm -f conftest.err conftest.$ac_objext \
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
+if test -z "$aix_libpath"; then aix_libpath="$LIBDIR:/lib"; fi
|
|
|
|
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
|
|
else
|
|
if test "$host_cpu" = ia64; then
|
|
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
+ hardcode_libdir_flag_spec='${wl}-R $libdir:$LIBDIR:/lib'
|
|
allow_undefined_flag="-z nodefs"
|
|
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
|
|
else
|
|
@@ -8822,7 +8822,7 @@
|
|
fi
|
|
rm -f conftest.err conftest.$ac_objext \
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
+if test -z "$aix_libpath"; then aix_libpath="$LIBDIR:/lib"; fi
|
|
|
|
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
# Warning - without using the other run time loading flags,
|
|
@@ -8936,7 +8936,7 @@
|
|
# does not break anything, and helps significantly (at the cost of a little
|
|
# extra space).
|
|
freebsd2.2*)
|
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
|
|
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags $LIBDIR/c++rt0.o'
|
|
hardcode_libdir_flag_spec='-R$libdir'
|
|
hardcode_direct=yes
|
|
hardcode_shlibpath_var=no
|
|
@@ -9350,7 +9350,7 @@
|
|
shlibpath_overrides_runpath=unknown
|
|
version_type=none
|
|
dynamic_linker="$host_os ld.so"
|
|
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
+sys_lib_dlsearch_path_spec="/lib $LIBDIR"
|
|
if test "$GCC" = yes; then
|
|
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
|
@@ -9363,7 +9363,7 @@
|
|
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
fi
|
|
else
|
|
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
+ sys_lib_search_path_spec="/lib $LIBDIR /usr/local/lib"
|
|
fi
|
|
need_lib_prefix=unknown
|
|
hardcode_into_libs=no
|