To: vim-dev@vim.org
Subject: Patch 5.6.078
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
------------

Patch 5.6.078
Problem:    Locale doesn't always work on FreeBSD. (David O'Brien)
Solution:   Link with the "xpg4" library when available.
Files:	    src/configure.in, src/configure


*** ../vim-5.6.77/src/configure.in	Sat Jan 15 13:15:24 2000
--- src/configure.in	Sat Jun  3 20:43:12 2000
***************
*** 1313,1318 ****
--- 1313,1321 ----
    LDFLAGS=$ldflags_save
  fi
  
+ dnl Link with xpg4, it is said to make Korean locale working
+ AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
+ 
  dnl Check how we can run ctags
  dnl -t for typedefs (many ctags have this)
  dnl -s for static functions (Elvis ctags only?)
*** ../vim-5.6.77/src/configure	Sat Jan 15 13:16:29 2000
--- src/configure	Sat Jun  3 20:43:16 2000
***************
*** 5078,5085 ****
    LDFLAGS=$ldflags_save
  fi
  
  echo $ac_n "checking how to create tags""... $ac_c" 1>&6
! echo "configure:5083: checking how to create tags" >&5
  test -f tags && mv tags tags.save
  (eval etags	  /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
  (eval etags -c	  /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c"
--- 5078,5126 ----
    LDFLAGS=$ldflags_save
  fi
  
+ echo $ac_n "checking for _xpg4_setrunelocale in -lxpg4""... $ac_c" 1>&6
+ echo "configure:5083: checking for _xpg4_setrunelocale in -lxpg4" >&5
+ ac_lib_var=`echo xpg4'_'_xpg4_setrunelocale | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lxpg4  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 5091 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char _xpg4_setrunelocale();
+ 
+ int main() {
+ _xpg4_setrunelocale()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:5102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   LIBS="$LIBS -lxpg4"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
  echo $ac_n "checking how to create tags""... $ac_c" 1>&6
! echo "configure:5124: checking how to create tags" >&5
  test -f tags && mv tags tags.save
  (eval etags	  /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
  (eval etags -c	  /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c"
***************
*** 5092,5098 ****
  echo "$ac_t""$TAGPRG" 1>&6 
  
  echo $ac_n "checking how to run man with a section nr""... $ac_c" 1>&6
! echo "configure:5096: checking how to run man with a section nr" >&5
  MANDEF="man"
  (eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
  echo "$ac_t""$MANDEF" 1>&6
--- 5133,5139 ----
  echo "$ac_t""$TAGPRG" 1>&6 
  
  echo $ac_n "checking how to run man with a section nr""... $ac_c" 1>&6
! echo "configure:5137: checking how to run man with a section nr" >&5
  MANDEF="man"
  (eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
  echo "$ac_t""$MANDEF" 1>&6
*** ../vim-5.6.77/src/version.c	Sat Jun  3 11:44:20 2000
--- src/version.c	Sat Jun  3 20:44:03 2000
***************
*** 420,421 ****
--- 420,423 ----
  {   /* Add new patch number below this line */
+ /**/
+     78,
  /**/

-- 
System administrators are just like women: You can't live with them and you
can't live without them.

/-/-- Bram Moolenaar --- Bram@moolenaar.net --- http://www.moolenaar.net --\-\
\-\-- Vim: http://www.vim.org ---- ICCF Holland: http://www.vim.org/iccf --/-/