To: vim-dev@vim.org
Subject: Patch 6.1.444 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.444 (extra)
Problem:    Win32: Enabling a build with gettext support is not consistant.
Solution:   Use "GETTEXT" for Borland and msvc makefiles. (Dan Sharp)
Files:	    src/Make_bc5.mak, src/Make_mvc.mak


*** ../vim61.443/src/Make_bc5.mak	Sat Mar 15 17:55:18 2003
--- src/Make_bc5.mak	Tue Apr  1 21:24:20 2003
***************
*** 51,56 ****
--- 51,57 ----
  #		of Ruby will cause a compile error on these systems.
  #   DYNAMIC_RUBY no or yes: use yes to load the Ruby DLL dynamically (no)
  # MBYTE		no or yes: set to yes for multi-byte support (yes)
+ # GETTEXT	no or yes: set to yes for multi-language support (yes)
  # ICONV		no or yes: set to yes for dynamic iconv support (yes)
  # OLE		no or yes: set to yes to make OLE gvim (no)
  # OSTYPE	DOS16 or WIN32 (WIN32)
***************
*** 86,91 ****
--- 87,97 ----
  MBYTE = yes
  !endif
  #
+ ### GETTEXT: yes for multilanguage support, no to disable it.
+ !if ("$(GETTEXT)"=="")
+ GETTEXT = yes
+ !endif
+ #
  ### ICONV: yes to enable dynamic-iconv support, no to disable it
  !if ("$(ICONV)"=="")
  ICONV = yes
***************
*** 313,323 ****
  !endif
  #
  !if ("$(MBYTE)"=="yes")
! MBDEFINES = $(MBDEFINES) -DFEAT_MBYTE -DDYNAMIC_GETTEXT -DDYNAMIC_IME
  !endif
  !if ("$(ICONV)"=="yes")
  MBDEFINES = $(MBDEFINES) -DDYNAMIC_ICONV
  !endif
  
  !if ("$(GUI)"=="yes")
  DEFINES = $(DEFINES) -DFEAT_GUI_W32 -DFEAT_CLIPBOARD
--- 319,332 ----
  !endif
  #
  !if ("$(MBYTE)"=="yes")
! MBDEFINES = $(MBDEFINES) -DFEAT_MBYTE -DDYNAMIC_IME
  !endif
  !if ("$(ICONV)"=="yes")
  MBDEFINES = $(MBDEFINES) -DDYNAMIC_ICONV
  !endif
+ !if ("$(GETTEXT)"=="yes")
+ MBDEFINES = $(MBDEFINES) -DDYNAMIC_GETTEXT
+ !endif
  
  !if ("$(GUI)"=="yes")
  DEFINES = $(DEFINES) -DFEAT_GUI_W32 -DFEAT_CLIPBOARD
***************
*** 532,537 ****
--- 541,549 ----
  !endif
  !if ("$(MBYTE)"=="yes")
  MSG = $(MSG) MBYTE
+ !endif
+ !if ("$(GETTEXT)"=="yes")
+ MSG = $(MSG) GETTEXT
  !endif
  !if ("$(ICONV)"=="yes")
  MSG = $(MSG) ICONV
*** ../vim61.443/src/Make_mvc.mak	Mon Mar 31 20:07:27 2003
--- src/Make_mvc.mak	Tue Apr  1 21:24:24 2003
***************
*** 47,53 ****
  #	Iconv library support (always dynamically loaded):
  #	  ICONV=[yes or no]  (default is yes)
  #	Intl library support (always dynamically loaded):
! #	  INTL=[yes or no]  (default is yes)
  #	See http://sourceforge.net/projects/gettext/
  #       PostScript printing: POSTSCRIPT=yes
  #       Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, or HUGE]
--- 47,53 ----
  #	Iconv library support (always dynamically loaded):
  #	  ICONV=[yes or no]  (default is yes)
  #	Intl library support (always dynamically loaded):
! #	  GETTEXT=[yes or no]  (default is yes)
  #	See http://sourceforge.net/projects/gettext/
  #       PostScript printing: POSTSCRIPT=yes
  #       Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, or HUGE]
***************
*** 355,364 ****
  !endif
  
  # libintl.dll library
! !ifndef INTL
! INTL = yes
  !endif
! !if "$(INTL)" == "yes"
  CFLAGS = $(CFLAGS) -DDYNAMIC_GETTEXT
  !endif
  
--- 355,364 ----
  !endif
  
  # libintl.dll library
! !ifndef GETTEXT
! GETTEXT = yes
  !endif
! !if "$(GETTEXT)" == "yes"
  CFLAGS = $(CFLAGS) -DDYNAMIC_GETTEXT
  !endif
  
*** ../vim61.443/src/version.c	Sun Apr  6 14:54:37 2003
--- src/version.c	Sun Apr  6 14:59:42 2003
***************
*** 613,614 ****
--- 613,616 ----
  {   /* Add new patch number below this line */
+ /**/
+     444,
  /**/

-- 
ARTHUR:   Ni!
BEDEVERE: Nu!
ARTHUR:   No.  Ni!  More like this. "Ni"!
BEDEVERE: Ni, ni, ni!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///