82 lines
2.7 KiB
Plaintext
82 lines
2.7 KiB
Plaintext
$OpenBSD: patch-configure,v 1.5 2004/10/11 21:07:50 naddy Exp $
|
|
--- configure.orig Fri Mar 14 18:42:34 2003
|
|
+++ configure Sat Oct 9 20:28:53 2004
|
|
@@ -6150,8 +6150,8 @@ else
|
|
hardcode_direct=yes
|
|
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
|
|
@@ -6160,8 +6160,8 @@ else
|
|
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
|
|
@@ -6677,6 +6677,8 @@ openbsd*)
|
|
version_type=sunos
|
|
need_lib_prefix=no
|
|
need_version=no
|
|
+ sys_lib_search_path_spec="/usr/lib"
|
|
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
|
|
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
case "$host_os" in
|
|
openbsd2.[89] | openbsd2.[89].*)
|
|
@@ -11308,7 +11310,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -11369,7 +11371,7 @@ if test "${ac_cv_lib_intl_gettext+set}"
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -11431,6 +11433,10 @@ fi
|
|
|
|
fi
|
|
|
|
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|
+ LIBS="$LIBS -lintl -liconv";
|
|
+ fi
|
|
+
|
|
if test "$gt_cv_func_gettext_libc" = "yes" \
|
|
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|
cat >>confdefs.h <<\_ACEOF
|
|
@@ -12121,8 +12127,6 @@ fi
|
|
|
|
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
|
|
fi
|
|
- sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
|
|
- $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
|
|
|
|
if test "$PACKAGE" = "gettext"; then
|
|
GT_NO="#NO#"
|
|
@@ -12885,7 +12889,7 @@ s/^[^=]*=[ ]*$//;
|
|
}'
|
|
fi
|
|
|
|
-DEFS=-DHAVE_CONFIG_H
|
|
+DEFS="-DHAVE_CONFIG_H -I\$(top_srcdir)"
|
|
|
|
|
|
|