[packages/vim.git] / 6.2.471

To: vim-dev@vim.org
Subject: Patch 6.2.471
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.2.471
Problem:    "-L/usr/lib" is used in the link command, even though it's
	    supposed to be filtered out. "-lw" and "-ldl" are not
	    automatically added when needed for "-lXmu". (Antonio Colombo)
Solution:   Check for a space after the argument instead of before.  Also
	    remove "-R/usr/lib" if it's there.  Check for "-lw" and "-ldl"
	    before trying "-lXmu".
Files:	    src/auto/configure, src/configure.in, src/link.sh


*** ../vim-6.2.470/src/auto/configure	Fri Mar 26 14:25:07 2004
--- src/auto/configure	Wed Apr 14 21:44:01 2004
***************
*** 3473,3494 ****
    fi
  
      X_CFLAGS="`echo $X_CFLAGS\  | sed 's%-I/usr/include %%'`"
!     X_LIBS="`echo $X_LIBS\  | sed 's% -L/usr/lib%%'`"
  
  
        echo $ac_n "checking if X11 header files can be found""... $ac_c" 1>&6
! echo "configure:3253: checking if X11 header files can be found" >&5
    cflags_save=$CFLAGS
    CFLAGS="$CFLAGS $X_CFLAGS"
    cat > conftest.$ac_ext <<EOF
! #line 3257 "configure"
  #include "confdefs.h"
  #include <X11/Xlib.h>
  int main() {
  
  ; return 0; }
  EOF
! if { (eval echo configure:3264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  else
--- 3474,3496 ----
    fi
  
      X_CFLAGS="`echo $X_CFLAGS\  | sed 's%-I/usr/include %%'`"
!     X_LIBS="`echo $X_LIBS\  | sed 's%-L/usr/lib %%'`"
!     X_LIBS="`echo $X_LIBS\  | sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`"
  
  
        echo $ac_n "checking if X11 header files can be found""... $ac_c" 1>&6
! echo "configure:3483: checking if X11 header files can be found" >&5
    cflags_save=$CFLAGS
    CFLAGS="$CFLAGS $X_CFLAGS"
    cat > conftest.$ac_ext <<EOF
! #line 3487 "configure"
  #include "confdefs.h"
  #include <X11/Xlib.h>
  int main() {
  
  ; return 0; }
  EOF
! if { (eval echo configure:3494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  else
***************
*** 4742,4749 ****
    echo "$ac_t""no" 1>&6
  fi
  
    echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6
! echo "configure:4482: checking for XmuCreateStippledPixmap in -lXmu" >&5
  ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4744,4831 ----
    echo "$ac_t""no" 1>&6
  fi
  
+     echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6
+ echo "configure:4749: checking for wslen in -lw" >&5
+ ac_lib_var=`echo w'_'wslen | 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="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4757 "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 wslen();
+ 
+ int main() {
+ wslen()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:4768: \"$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
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
+ echo "configure:4789: checking for dlsym in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlsym | 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="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4797 "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 dlsym();
+ 
+ int main() {
+ dlsym()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:4808: \"$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
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
    echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6
! echo "configure:4829: checking for XmuCreateStippledPixmap in -lXmu" >&5
  ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*** ../vim-6.2.470/src/configure.in	Fri Mar 26 14:25:07 2004
--- src/configure.in	Tue Apr 13 15:30:22 2004
***************
*** 916,923 ****
  
    dnl Remove "-I/usr/include " from X_CFLAGS, should not be needed.
    X_CFLAGS="`echo $X_CFLAGS\  | sed 's%-I/usr/include %%'`"
!   dnl Remove " -L/usr/lib" from X_LIBS, should not be needed.
!   X_LIBS="`echo $X_LIBS\  | sed 's% -L/usr/lib%%'`"
  
  
    dnl Check if the X11 header files are correctly installed. On some systems
--- 916,925 ----
  
    dnl Remove "-I/usr/include " from X_CFLAGS, should not be needed.
    X_CFLAGS="`echo $X_CFLAGS\  | sed 's%-I/usr/include %%'`"
!   dnl Remove "-L/usr/lib " from X_LIBS, should not be needed.
!   X_LIBS="`echo $X_LIBS\  | sed 's%-L/usr/lib %%'`"
!   dnl Same for "-R/usr/lib ".
!   X_LIBS="`echo $X_LIBS\  | sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`"
  
  
    dnl Check if the X11 header files are correctly installed. On some systems
***************
*** 1644,1649 ****
--- 1646,1656 ----
    LDFLAGS="$X_LIBS $LDFLAGS"
    AC_CHECK_LIB(Xext, XShapeQueryExtension, [GUI_X_LIBS="-lXext"],,
  		[-lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
+   dnl For Solaris we need -lw and -ldl before linking with -lXmu works.
+   AC_CHECK_LIB(w, wslen, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"],,
+ 		[$GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
+   AC_CHECK_LIB(dl, dlsym, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"],,
+ 		[$GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
    AC_CHECK_LIB(Xmu, XmuCreateStippledPixmap, [GUI_X_LIBS="-lXmu $GUI_X_LIBS"],,
  		[$GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
    if test -z "$SKIP_MOTIF"; then
*** ../vim-6.2.470/src/link.sh	Sun May 19 11:51:43 2002
--- src/link.sh	Mon Apr  5 15:09:00 2004
***************
*** 5,11 ****
  # libraries when they exist, but this doesn't mean they are needed for Vim.
  #
  #      Author: Bram Moolenaar
! # Last change: 2002 Feb 21
  #
  # Warning: This fails miserably if the linker doesn't return an error code!
  #
--- 5,11 ----
  # libraries when they exist, but this doesn't mean they are needed for Vim.
  #
  #      Author: Bram Moolenaar
! # Last change: 2004 Apr 05
  #
  # Warning: This fails miserably if the linker doesn't return an error code!
  #
***************
*** 40,46 ****
    if sh link.cmd; then
      touch auto/link.sed
      cp link.cmd linkit.sh
!     for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x pthread thread readline m perl crypt attr; do
        cont=yes
        while test -n "$cont"; do
          if grep "l$libname " linkit.sh >/dev/null; then
--- 40,46 ----
    if sh link.cmd; then
      touch auto/link.sed
      cp link.cmd linkit.sh
!     for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do
        cont=yes
        while test -n "$cont"; do
          if grep "l$libname " linkit.sh >/dev/null; then
*** ../vim-6.2.470/src/version.c	Wed Apr 14 21:41:32 2004
--- src/version.c	Wed Apr 14 21:43:55 2004
***************
*** 639,640 ****
--- 639,642 ----
  {   /* Add new patch number below this line */
+ /**/
+     471,
  /**/

-- 
MONK: ... and the Lord spake, saying, "First shalt thou take out the Holy Pin,
      then shalt thou count to three, no more, no less.  Three shalt be the
      number thou shalt count, and the number of the counting shalt be three.
      Four shalt thou not count, neither count thou two, excepting that thou
      then proceed to three.  Five is right out.  Once the number three, being
      the third number, be reached, then lobbest thou thy Holy Hand Grenade of
      Antioch towards thou foe, who being naughty in my sight, shall snuff it.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///
Commit	Line	Data
14b40f53 AG	1	To: vim-dev@vim.org
	2	Subject: Patch 6.2.471
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 6.2.471
	11	Problem: "-L/usr/lib" is used in the link command, even though it's
	12	supposed to be filtered out. "-lw" and "-ldl" are not
	13	automatically added when needed for "-lXmu". (Antonio Colombo)
	14	Solution: Check for a space after the argument instead of before. Also
	15	remove "-R/usr/lib" if it's there. Check for "-lw" and "-ldl"
	16	before trying "-lXmu".
	17	Files: src/auto/configure, src/configure.in, src/link.sh
	18
	19
	20	*** ../vim-6.2.470/src/auto/configure Fri Mar 26 14:25:07 2004
	21	--- src/auto/configure Wed Apr 14 21:44:01 2004
	22	***************
	23	* 3473,3494 **
	24	fi
	25
	26	X_CFLAGS="`echo $X_CFLAGS\ \| sed 's%-I/usr/include %%'`"
	27	! X_LIBS="`echo $X_LIBS\ \| sed 's% -L/usr/lib%%'`"
	28
	29
	30	echo $ac_n "checking if X11 header files can be found""... $ac_c" 1>&6
	31	! echo "configure:3253: checking if X11 header files can be found" >&5
	32	cflags_save=$CFLAGS
	33	CFLAGS="$CFLAGS $X_CFLAGS"
	34	cat > conftest.$ac_ext <<EOF
	35	! #line 3257 "configure"
	36	#include "confdefs.h"
	37	#include <X11/Xlib.h>
	38	int main() {
	39
	40	; return 0; }
	41	EOF
	42	! if { (eval echo configure:3264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	43	rm -rf conftest*
	44	echo "$ac_t""yes" 1>&6
	45	else
	46	--- 3474,3496 ----
	47	fi
	48
	49	X_CFLAGS="`echo $X_CFLAGS\ \| sed 's%-I/usr/include %%'`"
	50	! X_LIBS="`echo $X_LIBS\ \| sed 's%-L/usr/lib %%'`"
	51	! X_LIBS="`echo $X_LIBS\ \| sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`"
	52
	53
	54	echo $ac_n "checking if X11 header files can be found""... $ac_c" 1>&6
	55	! echo "configure:3483: checking if X11 header files can be found" >&5
	56	cflags_save=$CFLAGS
	57	CFLAGS="$CFLAGS $X_CFLAGS"
	58	cat > conftest.$ac_ext <<EOF
	59	! #line 3487 "configure"
	60	#include "confdefs.h"
	61	#include <X11/Xlib.h>
	62	int main() {
	63
	64	; return 0; }
65	EOF
66	! if { (eval echo configure:3494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
67	rm -rf conftest*
68	echo "$ac_t""yes" 1>&6
69	else
70	***************
71	* 4742,4749 **
72	echo "$ac_t""no" 1>&6
73	fi
74
75	echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6
76	! echo "configure:4482: checking for XmuCreateStippledPixmap in -lXmu" >&5
77	ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap \| sed 'y%./+-%__p_%'`
78	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
79	echo $ac_n "(cached) $ac_c" 1>&6
80	--- 4744,4831 ----
81	echo "$ac_t""no" 1>&6
82	fi
83
84	+ echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6
85	+ echo "configure:4749: checking for wslen in -lw" >&5
86	+ ac_lib_var=`echo w'_'wslen \| sed 'y%./+-%__p_%'`
87	+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
88	+ echo $ac_n "(cached) $ac_c" 1>&6
89	+ else
90	+ ac_save_LIBS="$LIBS"
91	+ LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
92	+ cat > conftest.$ac_ext <<EOF
93	+ #line 4757 "configure"
94	+ #include "confdefs.h"
95	+ /* Override any gcc2 internal prototype to avoid an error. */
96	+ /* We use char because int might match the return type of a gcc2
97	+ builtin and then its argument prototype would still apply. */
98	+ char wslen();
99	+
100	+ int main() {
101	+ wslen()
102	+ ; return 0; }
103	+ EOF
104	+ if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
105	+ rm -rf conftest*
106	+ eval "ac_cv_lib_$ac_lib_var=yes"
107	+ else
108	+ echo "configure: failed program was:" >&5
109	+ cat conftest.$ac_ext >&5
110	+ rm -rf conftest*
111	+ eval "ac_cv_lib_$ac_lib_var=no"
112	+ fi
113	+ rm -f conftest*
114	+ LIBS="$ac_save_LIBS"
115	+
116	+ fi
117	+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
118	+ echo "$ac_t""yes" 1>&6
119	+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
120	+ else
121	+ echo "$ac_t""no" 1>&6
122	+ fi
123	+
124	+ echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
125	+ echo "configure:4789: checking for dlsym in -ldl" >&5
126	+ ac_lib_var=`echo dl'_'dlsym \| sed 'y%./+-%__p_%'`
127	+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
128	+ echo $ac_n "(cached) $ac_c" 1>&6
129	+ else
130	+ ac_save_LIBS="$LIBS"
131	+ LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
132	+ cat > conftest.$ac_ext <<EOF
133	+ #line 4797 "configure"
134	+ #include "confdefs.h"
135	+ /* Override any gcc2 internal prototype to avoid an error. */
136	+ /* We use char because int might match the return type of a gcc2
137	+ builtin and then its argument prototype would still apply. */
138	+ char dlsym();
139	+
140	+ int main() {
141	+ dlsym()
142	+ ; return 0; }
143	+ EOF
144	+ if { (eval echo configure:4808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
145	+ rm -rf conftest*
146	+ eval "ac_cv_lib_$ac_lib_var=yes"
147	+ else
148	+ echo "configure: failed program was:" >&5
149	+ cat conftest.$ac_ext >&5
150	+ rm -rf conftest*
151	+ eval "ac_cv_lib_$ac_lib_var=no"
152	+ fi
153	+ rm -f conftest*
154	+ LIBS="$ac_save_LIBS"
155	+
156	+ fi
157	+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
158	+ echo "$ac_t""yes" 1>&6
159	+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
160	+ else
161	+ echo "$ac_t""no" 1>&6
162	+ fi
163	+
164	echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6
165	! echo "configure:4829: checking for XmuCreateStippledPixmap in -lXmu" >&5
166	ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap \| sed 'y%./+-%__p_%'`
167	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
168	echo $ac_n "(cached) $ac_c" 1>&6
169	*** ../vim-6.2.470/src/configure.in Fri Mar 26 14:25:07 2004
170	--- src/configure.in Tue Apr 13 15:30:22 2004
171	***************
172	* 916,923 **
173
174	dnl Remove "-I/usr/include " from X_CFLAGS, should not be needed.
175	X_CFLAGS="`echo $X_CFLAGS\ \| sed 's%-I/usr/include %%'`"
176	! dnl Remove " -L/usr/lib" from X_LIBS, should not be needed.
177	! X_LIBS="`echo $X_LIBS\ \| sed 's% -L/usr/lib%%'`"
178
179
180	dnl Check if the X11 header files are correctly installed. On some systems
181	--- 916,925 ----
182
183	dnl Remove "-I/usr/include " from X_CFLAGS, should not be needed.
184	X_CFLAGS="`echo $X_CFLAGS\ \| sed 's%-I/usr/include %%'`"
185	! dnl Remove "-L/usr/lib " from X_LIBS, should not be needed.
186	! X_LIBS="`echo $X_LIBS\ \| sed 's%-L/usr/lib %%'`"
187	! dnl Same for "-R/usr/lib ".
188	! X_LIBS="`echo $X_LIBS\ \| sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`"
189
190
191	dnl Check if the X11 header files are correctly installed. On some systems
192	***************
193	* 1644,1649 **
194	--- 1646,1656 ----
195	LDFLAGS="$X_LIBS $LDFLAGS"
196	AC_CHECK_LIB(Xext, XShapeQueryExtension, [GUI_X_LIBS="-lXext"],,
197	[-lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
198	+ dnl For Solaris we need -lw and -ldl before linking with -lXmu works.
199	+ AC_CHECK_LIB(w, wslen, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"],,
200	+ [$GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
201	+ AC_CHECK_LIB(dl, dlsym, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"],,
202	+ [$GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
203	AC_CHECK_LIB(Xmu, XmuCreateStippledPixmap, [GUI_X_LIBS="-lXmu $GUI_X_LIBS"],,
204	[$GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
205	if test -z "$SKIP_MOTIF"; then
206	*** ../vim-6.2.470/src/link.sh Sun May 19 11:51:43 2002
207	--- src/link.sh Mon Apr 5 15:09:00 2004
208	***************
209	* 5,11 **
210	# libraries when they exist, but this doesn't mean they are needed for Vim.
211	#
212	# Author: Bram Moolenaar
213	! # Last change: 2002 Feb 21
214	#
215	# Warning: This fails miserably if the linker doesn't return an error code!
216	#
217	--- 5,11 ----
218	# libraries when they exist, but this doesn't mean they are needed for Vim.
219	#
220	# Author: Bram Moolenaar
221	! # Last change: 2004 Apr 05
222	#
223	# Warning: This fails miserably if the linker doesn't return an error code!
224	#
225	***************
226	* 40,46 **
227	if sh link.cmd; then
228	touch auto/link.sed
229	cp link.cmd linkit.sh
230	! for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x pthread thread readline m perl crypt attr; do
231	cont=yes
232	while test -n "$cont"; do
233	if grep "l$libname " linkit.sh >/dev/null; then
234	--- 40,46 ----
235	if sh link.cmd; then
236	touch auto/link.sed
237	cp link.cmd linkit.sh
238	! for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do
239	cont=yes
240	while test -n "$cont"; do
241	if grep "l$libname " linkit.sh >/dev/null; then
242	*** ../vim-6.2.470/src/version.c Wed Apr 14 21:41:32 2004
243	--- src/version.c Wed Apr 14 21:43:55 2004
244	***************
245	* 639,640 **
246	--- 639,642 ----
247	{ /* Add new patch number below this line */
248	+ /**/
249	+ 471,
250	/**/
251
252	--
253	MONK: ... and the Lord spake, saying, "First shalt thou take out the Holy Pin,
254	then shalt thou count to three, no more, no less. Three shalt be the
255	number thou shalt count, and the number of the counting shalt be three.
256	Four shalt thou not count, neither count thou two, excepting that thou
257	then proceed to three. Five is right out. Once the number three, being
258	the third number, be reached, then lobbest thou thy Holy Hand Grenade of
259	Antioch towards thou foe, who being naughty in my sight, shall snuff it.
260	"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
261
262	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
263	/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
264	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
265	\\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///