100 lines
3.1 KiB
Plaintext
100 lines
3.1 KiB
Plaintext
$OpenBSD: patch-configure,v 1.7 2010/03/30 16:24:24 ajacoutot Exp $
|
|
--- configure.orig Tue Mar 30 18:14:23 2010
|
|
+++ configure Tue Mar 30 18:17:52 2010
|
|
@@ -6934,10 +6934,12 @@ newos6*)
|
|
;;
|
|
|
|
openbsd*)
|
|
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
|
|
+ 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__`"; then
|
|
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
|
else
|
|
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
|
|
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
|
fi
|
|
;;
|
|
|
|
@@ -12826,6 +12828,11 @@ $as_echo_n "checking for libgtop sysdeps directory...
|
|
libgtop_need_server=yes
|
|
libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
|
|
;;
|
|
+ openbsd*)
|
|
+ libgtop_sysdeps_dir=bsd
|
|
+ libgtop_use_machine_h=yes
|
|
+ libgtop_need_server=yes
|
|
+ ;;
|
|
freebsd*|kfreebsd*)
|
|
libgtop_sysdeps_dir=freebsd
|
|
libgtop_use_machine_h=yes
|
|
@@ -18246,7 +18253,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -18310,7 +18317,7 @@ if test "x$ac_cv_lib_intl_strftime" = x""yes; then
|
|
#define HAVE_STRFTIME 1
|
|
_ACEOF
|
|
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
fi
|
|
|
|
fi
|
|
@@ -19721,7 +19728,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -19787,7 +19794,7 @@ if test "${ac_cv_lib_intl_ngettext+set}" = set; then
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -19853,7 +19860,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
@@ -20721,11 +20728,6 @@ glib_save_datarootdir="$datarootdir"
|
|
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
|
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
|
|
datarootdir=`eval echo "${datarootdir}"`
|
|
-if test "x$CATOBJEXT" = "x.mo" ; then
|
|
- localedir=`eval echo "${libdir}/locale"`
|
|
-else
|
|
- localedir=`eval echo "${datadir}/locale"`
|
|
-fi
|
|
prefix="$glib_save_prefix"
|
|
exec_prefix="$glib_save_exec_prefix"
|
|
datarootdir="$glib_save_datarootdir"
|
|
@@ -23391,9 +23393,9 @@ cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
|
|
+#include <sys/param.h>
|
|
#include <sys/types.h>
|
|
#include <sys/mount.h>
|
|
-#include <sys/fs_types.h>
|
|
int
|
|
main ()
|
|
{
|