93 lines
2.8 KiB
Plaintext
93 lines
2.8 KiB
Plaintext
$OpenBSD: patch-aclocal_m4,v 1.5 2004/10/06 23:42:20 naddy Exp $
|
|
--- aclocal.m4.orig Fri Aug 16 00:24:43 2002
|
|
+++ aclocal.m4 Tue Aug 24 01:02:03 2004
|
|
@@ -1516,8 +1516,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
|
|
old_postuninstall_cmds=
|
|
|
|
if test -n "$RANLIB"; then
|
|
+ case $host_os in
|
|
+ openbsd*)
|
|
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ *)
|
|
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ esac
|
|
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
fi
|
|
|
|
# Allow CC to be a program name with arguments.
|
|
@@ -1920,7 +1927,9 @@ cygwin* | mingw* | pw32* )
|
|
with_gnu_ld=no
|
|
fi
|
|
;;
|
|
-
|
|
+openbsd*)
|
|
+ with_gnu_ld=no
|
|
+ ;;
|
|
esac
|
|
|
|
ld_shlibs=yes
|
|
@@ -2324,8 +2333,8 @@ else
|
|
;;
|
|
|
|
openbsd*)
|
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
- hardcode_libdir_flag_spec='-R$libdir'
|
|
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
|
|
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
|
hardcode_direct=yes
|
|
hardcode_shlibpath_var=no
|
|
;;
|
|
@@ -2801,10 +2810,9 @@ newsos6)
|
|
|
|
openbsd*)
|
|
version_type=sunos
|
|
- if test "$with_gnu_ld" = yes; then
|
|
- need_lib_prefix=no
|
|
- need_version=no
|
|
- fi
|
|
+ need_lib_prefix=no
|
|
+ need_version=no
|
|
+ shlibpath_overrides_runpath=yes
|
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
@@ -3936,6 +3944,16 @@ newos6*)
|
|
lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
|
;;
|
|
|
|
+openbsd*)
|
|
+ lt_cv_file_magic_cmd=/usr/bin/file
|
|
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
|
+ else
|
|
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
|
+ fi
|
|
+ ;;
|
|
+
|
|
osf3* | osf4* | osf5*)
|
|
# this will be overridden with pass_all, but let us keep it just in case
|
|
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
|
|
@@ -4704,6 +4722,7 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
|
|
gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
|
|
|
|
if test "$gt_cv_func_gettext_libc" != "yes"; then
|
|
+ LIBS="-liconv $LIBS"
|
|
AC_CHECK_LIB(intl, bindtextdomain,
|
|
[AC_CACHE_CHECK([for gettext in libintl],
|
|
gt_cv_func_gettext_libintl,
|
|
@@ -4711,6 +4730,10 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
|
|
gt_cv_func_gettext_libintl=yes,
|
|
gt_cv_func_gettext_libintl=no)],
|
|
gt_cv_func_gettext_libintl=no)])
|
|
+ fi
|
|
+
|
|
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|
+ LIBS="$LIBS -lintl";
|
|
fi
|
|
|
|
if test "$gt_cv_func_gettext_libc" = "yes" \
|