82 lines
2.4 KiB
Plaintext
82 lines
2.4 KiB
Plaintext
$OpenBSD: patch-configure,v 1.3 2007/03/31 12:32:35 steven Exp $
|
|
--- configure.orig Sat Jan 4 13:53:14 2003
|
|
+++ configure Sat Mar 31 14:31:53 2007
|
|
@@ -10396,7 +10396,7 @@ else
|
|
gt_save_CPPFLAGS="$CPPFLAGS"
|
|
CPPFLAGS="$CPPFLAGS $INCINTL"
|
|
gt_save_LIBS="$LIBS"
|
|
- LIBS="$LIBS $LIBINTL"
|
|
+ LIBS="$LIBS $LTLIBINTL $LTLIBICONV"
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 10402 "configure"
|
|
#include "confdefs.h"
|
|
@@ -10410,7 +10410,7 @@ extern
|
|
const char *_nl_expand_alias ();
|
|
int main() {
|
|
bindtextdomain ("", "");
|
|
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
|
|
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
|
|
; return 0; }
|
|
EOF
|
|
if { (eval echo configure:10417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
@@ -10478,10 +10478,10 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
|
|
|
|
if test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
INTLOBJS="\$(GETTOBJS)"
|
|
- BUILD_INCLUDED_LIBINTL=yes
|
|
- USE_INCLUDED_LIBINTL=yes
|
|
- LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
|
|
- LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
|
|
+ BUILD_INCLUDED_LIBINTL=no
|
|
+ USE_INCLUDED_LIBINTL=no
|
|
+ LIBINTL="-lintl $LTLIBICONV"
|
|
+ LTLIBINTL="-lintl $LTLIBICONV"
|
|
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
|
fi
|
|
|
|
@@ -10549,7 +10549,7 @@ EOF
|
|
|
|
|
|
if test "$PACKAGE" = gettext; then
|
|
- BUILD_INCLUDED_LIBINTL=yes
|
|
+ BUILD_INCLUDED_LIBINTL=no
|
|
fi
|
|
|
|
|
|
@@ -10573,7 +10573,7 @@ EOF
|
|
|
|
|
|
|
|
- INTLLIBS="$LIBINTL"
|
|
+ INTLLIBS="$LTLIBINTL"
|
|
|
|
|
|
|
|
@@ -10633,7 +10633,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
|
|
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 10639 "configure"
|
|
#include "confdefs.h"
|
|
@@ -10667,7 +10667,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
|
|
#define $ac_tr_lib 1
|
|
EOF
|
|
|
|
- LIBS="-lintl $LIBS"
|
|
+ LIBS="-lintl -liconv $LIBS"
|
|
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
@@ -12504,7 +12504,7 @@ s%@XGETTEXT@%$XGETTEXT%g
|
|
s%@MSGMERGE@%$MSGMERGE%g
|
|
s%@ALLOCA@%$ALLOCA%g
|
|
s%@GLIBC21@%$GLIBC21%g
|
|
-s%@LIBICONV@%$LIBICONV%g
|
|
+s%@LIBICONV@%$LTLIBICONV%g
|
|
s%@LTLIBICONV@%$LTLIBICONV%g
|
|
s%@INTLBISON@%$INTLBISON%g
|
|
s%@USE_NLS@%$USE_NLS%g
|