PATCH: libntdll.dll.so not found, take 2

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

This moves the check to the toplevel Makefile.in and also checks
LD_LIBRARY_PATH.

This will still complain if you do configure --prefix=/usr/ because
of the leading / :/

So I tried a different version using 'ldd', also attached. 

Choose whatever you like best ;)

Ciao, Marcus

License: LGPL

Changelog:
	Warn the user if 'wine' will not find its libraries after
	installation on 'make install'.

Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/Makefile.in,v
retrieving revision 1.123
diff -u -r1.123 Makefile.in
--- Makefile.in	23 May 2002 02:45:29 -0000	1.123
+++ Makefile.in	2 Jun 2002 12:15:52 -0000
@@ -72,6 +72,19 @@
 
 install:: all $(SUBDIRS:%=%/__install__)
 	-$(LDCONFIG)
+	@if test -f /etc/ld.so.conf -a 					\
+		 -z "`grep $(libdir) /etc/ld.so.conf`" -a		\
+	         -z "`echo $$LD_LIBRARY_PATH|grep $(libdir)`" ;		\
+	then								\
+		echo "*************************************************" ; \
+		echo "*************************************************" ; \
+		echo "The installed WINE libraries will not be found!" ; \
+		echo "You can either:" ; 				\
+		echo "	Add the line '$(libdir)' to /etc/ld.so.conf" ;	\
+		echo '	export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
+		echo "*************************************************" ; \
+		echo "*************************************************" ; \
+	fi
 
 uninstall:: $(SUBDIRS:%=%/__uninstall__)
 

Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/Makefile.in,v
retrieving revision 1.123
diff -u -r1.123 Makefile.in
--- Makefile.in	23 May 2002 02:45:29 -0000	1.123
+++ Makefile.in	2 Jun 2002 14:15:05 -0000
@@ -72,6 +72,18 @@
 
 install:: all $(SUBDIRS:%=%/__install__)
 	-$(LDCONFIG)
+	@if test -f /usr/bin/ldd -a 					\
+		 -n "`LANG=C ldd $(bindir)/wine|grep not.found`";	\
+	then								\
+		echo "*************************************************" ; \
+		echo "*************************************************" ; \
+		echo "The installed WINE libraries will not be found!" ; \
+		echo "You can either:" ; 				\
+		echo "	Add the line '$(libdir)' to /etc/ld.so.conf" ;	\
+		echo '	export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
+		echo "*************************************************" ; \
+		echo "*************************************************" ; \
+	fi
 
 uninstall:: $(SUBDIRS:%=%/__uninstall__)
 


[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux