73 lines
3.7 KiB
Plaintext
73 lines
3.7 KiB
Plaintext
$OpenBSD: patch-configure,v 1.5 2004/10/23 22:50:46 alek Exp $
|
|
--- configure.orig Mon Mar 31 10:06:33 2003
|
|
+++ configure Fri Apr 4 10:34:29 2003
|
|
@@ -1819,7 +1819,7 @@ fi
|
|
XML_I18N_MERGE_DESKTOP_RULE='%.desktop: %.desktop.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -d -p '
|
|
XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -d -p '
|
|
XML_I18N_MERGE_KEYS_RULE='%.keys: %.keys.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -k $(XML_I18N_KEYS_KIND) '
|
|
- XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -o -p'
|
|
+ XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; sed s/_value/value/ $< > $*.oaf'
|
|
XML_I18N_MERGE_PONG_RULE='%.pong: %.pong.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -x -p '
|
|
XML_I18N_MERGE_SERVER_RULE='%.server: %.server.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -o -u'
|
|
XML_I18N_MERGE_SHEET_RULE='%.sheet: %.sheet.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< $@ -x -u'
|
|
@@ -4096,8 +4096,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
|
|
@@ -4106,8 +4106,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
|
|
@@ -4619,6 +4619,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].*)
|
|
@@ -6977,7 +6979,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
ac_save_LIBS="$LIBS"
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 6983 "configure"
|
|
#include "confdefs.h"
|
|
@@ -7017,7 +7019,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
ac_save_LIBS="$LIBS"
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 7023 "configure"
|
|
#include "confdefs.h"
|
|
@@ -7058,6 +7060,10 @@ else
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
|
|
+ fi
|
|
+
|
|
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|
+ LIBS="$LIBS -lintl -liconv";
|
|
fi
|
|
|
|
if test "$gt_cv_func_gettext_libc" = "yes" \
|