checklink patch

[François Gouget]

   This patch makes it possible to do 'make checklink' without having to
set LD_LIBRARY_PATH before hand. It's very much inspired from the LDPATH
patch.

Changelog:

   François Gouget <fgouget at codeweavers.com>

 * configure.in,
   Make.rules.in,
   Makefile.in,
   dlls/Makedll.rules.in,
   libtest/Makefile.in,
   programs/Makeprog.rules.in,
   programs/avitools/Makefile.in

   Autoset LD_LIBRARY_PATH for 'make checklink'

-- 
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /home/wine/wine/configure.in,v
retrieving revision 1.201
diff -u -r1.201 configure.in
--- configure.in	2001/05/16 20:56:05	1.201
+++ configure.in	2001/05/24 22:02:47
@@ -646,15 +644,18 @@
 
 DLLFLAGS=""
 LDPATH=""
+LDDLLPATH=""
 
 if test "$LIBEXT" = "so"; then
     DLLFLAGS="-fPIC"
     DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) \$(LIBWINE) \$(LIBUNICODE)"
     LDPATH="LD_LIBRARY_PATH=\"\$(TOPOBJDIR)/unicode:\$\$LD_LIBRARY_PATH\""
+    LDDLLPATH="LD_LIBRARY_PATH=\"\$(TOPOBJDIR):\$(TOPOBJDIR)/dlls:\$\$LD_LIBRARY_PATH\""
 elif test "$LIBEXT" = "dll"; then
     #DLLFLAGS="-fPIC" # -fPIC doesn't work(at least in cygwin-b20) - FIXME
     DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) \$(LIBWINE) \$(LIBUNICODE)"
     LDPATH="PATH=\"\$(TOPOBJDIR)/unicode:\$\$PATH\""
+    LDDLLPATH="PATH=\"\$(TOPOBJDIR):\$(TOPOBJDIR)/dlls:\$\$PATH\""
 else
     DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) \$(LIBWINE) \$(LIBUNICODE) \$(X_LIBS) \$(XLIB)"
     AC_CACHE_CHECK([whether the linker supports --[[no]]-whole-archive (Linux)],
@@ -688,6 +689,7 @@
 AC_SUBST(LDDLLFLAGS)
 AC_SUBST(LIBEXT)
 AC_SUBST(LDPATH)
+AC_SUBST(LDDLLPATH)
 
 dnl **** Check for reentrant libc ****
 dnl
Index: Make.rules.in
===================================================================
RCS file: /home/wine/wine/Make.rules.in,v
retrieving revision 1.85
diff -u -r1.85 Make.rules.in
--- Make.rules.in	2001/04/16 19:36:12	1.85
+++ Make.rules.in	2001/05/24 05:02:30
@@ -63,6 +63,7 @@
 WRC       = $(TOPOBJDIR)/tools/wrc/wrc
 WMC       = $(TOPOBJDIR)/tools/wmc/wmc
 LDPATH    = @LDPATH@
+LDDLLPATH = @LDDLLPATH@
 DLLDIR    = $(TOPOBJDIR)/dlls
 LIBWINE   = -L$(TOPOBJDIR)/library -lwine
 LIBTSX11  = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/Makefile.in,v
retrieving revision 1.99
diff -u -r1.99 Makefile.in
--- Makefile.in	2000/12/27 19:06:44	1.99
+++ Makefile.in	2001/05/24 22:02:30
@@ -120,7 +120,7 @@
 dlls: tools $(LIBRARIES)
 
 checklink::
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(LIBWINE) $(LIBS) && $(RM) checklink
+	$(LDPATH) $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(LIBWINE) $(LIBS) && $(RM) checklink
 
 install_programs: dummy
 	@cd programs && $(MAKE) install
Index: dlls/Makedll.rules.in
===================================================================
RCS file: /home/wine/wine/dlls/Makedll.rules.in,v
retrieving revision 1.15
diff -u -r1.15 Makedll.rules.in
--- dlls/Makedll.rules.in	2001/05/07 18:22:43	1.15
+++ dlls/Makedll.rules.in	2001/05/24 22:03:00
@@ -44,7 +44,7 @@
 # Rules for checking that no imports are missing
 
 checklink:: lib$(MODULE).$(LIBEXT)
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) $(ALL_LIBS) && $(RM) checklink
+	$(LDDLLPATH) $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) $(ALL_LIBS) && $(RM) checklink
 
 # Rules for debug channels
 
Index: libtest/Makefile.in
===================================================================
RCS file: /home/wine/wine/libtest/Makefile.in,v
retrieving revision 1.22
diff -u -r1.22 Makefile.in
--- libtest/Makefile.in	2000/12/06 00:05:15	1.22
+++ libtest/Makefile.in	2001/05/24 22:04:44
@@ -93,7 +93,7 @@
 	$(LN_S) $(TOPOBJDIR)/wine $@
 
 $(PROGRAMS:%=%.so/_checklink_): $(PROGRAMS:%=%.so)
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c `dirname $@` $(ALL_LIBS) && $(RM) checklink
+	$(LDPATH) $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c `dirname $@` $(ALL_LIBS) && $(RM) checklink
 
 checklink:: $(PROGRAMS:%=%.so/_checklink_)
 
Index: programs/Makeprog.rules.in
===================================================================
RCS file: /home/wine/wine/programs/Makeprog.rules.in,v
retrieving revision 1.4
diff -u -r1.4 Makeprog.rules.in
--- programs/Makeprog.rules.in	2000/12/10 23:11:41	1.4
+++ programs/Makeprog.rules.in	2001/05/24 22:04:46
@@ -29,7 +29,7 @@
 # Rules for checking that no imports are missing
 
 checklink:: $(MODULE).so
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(MODULE).so $(ALL_LIBS) && $(RM) checklink
+	$(LDDLLPATH) $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(MODULE).so $(ALL_LIBS) && $(RM) checklink
 
 # Rules for debug channels
 
Index: programs/avitools/Makefile.in
===================================================================
RCS file: /home/wine/wine/programs/avitools/Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in
--- programs/avitools/Makefile.in	2001/01/29 02:03:31	1.15
+++ programs/avitools/Makefile.in	2001/05/24 22:04:46
@@ -56,8 +56,8 @@
 	$(RM) $(bindir)/aviinfo $(bindir)/aviplay $(bindir)/icinfo
 
 checklink:: $(PROGRAMS:%=%.so)
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviinfo.so $(ALL_LIBS) && $(RM) checklink
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviplay.so $(ALL_LIBS) && $(RM) checklink
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c icinfo.so $(ALL_LIBS) && $(RM) checklink
+	$(LDDLLPATH) $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviinfo.so $(ALL_LIBS) && $(RM) checklink
+	$(LDDLLPATH) $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviplay.so $(ALL_LIBS) && $(RM) checklink
+	$(LDDLLPATH) $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c icinfo.so $(ALL_LIBS) && $(RM) checklink
 
 ### Dependencies: