From: John McCullough Subject: [Patch] Initial check for libvncserver-config in toplevel Makefile. Date: Wed, 12 Jul 2006 21:07:04 -0700 Message-ID: <20060713040704.GA1366@csegrad.ucsd.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="ZPt4rx8FFjLCG7dd" Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List, This adds a toplevel check for libvncserver. I spotted this on http://wiki.xensource.com/xenwiki/XenTodoList and had been caught by it myself. I think a similar check for dev86 to build the hvmloader would be helpful. Regards, John McCullough --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="libvncserver-check.diff" diff -r a1c2cede77c7 Makefile --- a/Makefile Mon Jul 10 15:01:49 2006 +0100 +++ b/Makefile Wed Jul 12 20:59:56 2006 -0700 @@ -67,7 +67,7 @@ prep-kernels: for i in $(XKERNELS) ; do $(MAKE) $$i-prep || exit 1; done .PHONY: install-xen -install-xen: +install-xen: checklibvncserver $(MAKE) -C xen install .PHONY: install-tools @@ -211,6 +211,25 @@ uninstall: rm -rf $(D)/usr/share/man/man1/xen* rm -rf $(D)/usr/share/man/man8/xen* +ifndef IGNORE_LIBVNCSERVER +IGNORE_LIBVNCSERVER=0 +endif + +.PHONY: checklibnvncserver +checklibvncserver: +ifneq ($(IGNORE_LIBVNCSERVER), 1) + @sh -c '\ + if ! libvncserver-config --version > /dev/null 2>&1 ; then \ + echo "Unable to find libvncserver-config.";\ + echo -n "You must have the libvncserver development libraries to";\ + echo " enable vnc in QEMU!";\ + echo "Set IGNORE_LIBVNCSERVER=1 to ignore.";\ + exit 1; fi\ + ' +else + @: +endif + # Legacy targets for compatibility .PHONY: linux26 linux26: --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --ZPt4rx8FFjLCG7dd--