ece46167b5
- xfce's xinitrc file, don't try to use xscreensaver by default - fix build of xfce's Gtk theme module
82 lines
2.4 KiB
Plaintext
82 lines
2.4 KiB
Plaintext
$OpenBSD: patch-aclocal_m4,v 1.2 2002/03/30 01:27:41 brad Exp $
|
|
--- aclocal.m4.orig Sun Jan 20 14:16:51 2002
|
|
+++ aclocal.m4 Fri Mar 29 19:39:46 2002
|
|
@@ -971,7 +971,14 @@ old_postuninstall_cmds=
|
|
|
|
if test -n "$RANLIB"; then
|
|
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
+ case "$host_os" in
|
|
+ openbsd*)
|
|
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ *)
|
|
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
|
|
# Allow CC to be a program name with arguments.
|
|
@@ -1374,7 +1381,9 @@ cygwin* | mingw* | pw32* )
|
|
with_gnu_ld=no
|
|
fi
|
|
;;
|
|
-
|
|
+openbsd*)
|
|
+ with_gnu_ld=no
|
|
+ ;;
|
|
esac
|
|
|
|
ld_shlibs=yes
|
|
@@ -1778,10 +1787,21 @@ else
|
|
;;
|
|
|
|
openbsd*)
|
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
- hardcode_libdir_flag_spec='-R$libdir'
|
|
hardcode_direct=yes
|
|
hardcode_shlibpath_var=no
|
|
+ case "$host_os" in
|
|
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
|
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
+ ;;
|
|
+ *)
|
|
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ export_dynamic_flag_spec='${wl}-E'
|
|
+ fi
|
|
+ ;;
|
|
+ esac
|
|
;;
|
|
|
|
os2*)
|
|
@@ -2255,9 +2275,23 @@ newsos6)
|
|
|
|
openbsd*)
|
|
version_type=sunos
|
|
- if test "$with_gnu_ld" = yes; then
|
|
- need_lib_prefix=no
|
|
- need_version=no
|
|
+ need_lib_prefix=no
|
|
+ need_version=no
|
|
+ file_magic_cmd=/usr/bin/file
|
|
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
|
|
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
|
+ case "$host_os" in
|
|
+ openbsd2.[89] | openbsd2.[89].*)
|
|
+ shlibpath_overrides_runpath=no
|
|
+ ;;
|
|
+ *)
|
|
+ shlibpath_overrides_runpath=yes
|
|
+ ;;
|
|
+ esac
|
|
+ else
|
|
+ deplibs_check_method='file_magic OpenBSD.* shared library'
|
|
+ shlibpath_overrides_runpath=yes
|
|
fi
|
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|