From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rtlit-0000rv-QK for mharc-grub-devel@gnu.org; Sat, 04 Feb 2012 14:56:35 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtlir-0000qA-76 for grub-devel@gnu.org; Sat, 04 Feb 2012 14:56:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rtlip-00015O-UL for grub-devel@gnu.org; Sat, 04 Feb 2012 14:56:33 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:50585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtlip-00015C-My for grub-devel@gnu.org; Sat, 04 Feb 2012 14:56:31 -0500 Received: from [192.168.0.4] (d14-69-47-19.try.wideopenwest.com [69.14.19.47]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id 166FE1B4002 for ; Sat, 4 Feb 2012 19:56:29 +0000 (UTC) Message-ID: <4F2D8D69.8040101@gentoo.org> Date: Sat, 04 Feb 2012 14:56:25 -0500 From: Mike Gilbert User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20120105 Thunderbird/9.0 MIME-Version: 1.0 To: grub-devel@gnu.org Subject: [MERGE] Add a --disable-zfs configure flag. X-Enigmail-Version: 1.3.4 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enig784B615B747B83E5A22D136E" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 140.211.166.183 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2012 19:56:34 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig784B615B747B83E5A22D136E Content-Type: multipart/mixed; boundary="------------090806040806090507080607" This is a multi-part message in MIME format. --------------090806040806090507080607 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I happen to have the ZFS libraries installed on my machine, but I don't want my boot loader to use them. It seems to be broken for me at the moment in any case. I'm new to bazaar and this is my first submission to this mailing list, so please let me know if I've done something incorrectly. --------------090806040806090507080607 Content-Type: text/x-patch; name="grub-3849.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="grub-3849.patch" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: floppym@gentoo.org-20120204194808-vy5uw5huaqqsui7l # target_branch: http://bzr.savannah.gnu.org/r/grub/trunk/grub/ # testament_sha1: 174b6ca637f4fda2819cb82c07bb55424dee8f5a # timestamp: 2012-02-04 14:48:49 -0500 # base_revision_id: phcoder@gmail.com-20120204130023-z03vb7w0onbf9ste #=20 # Begin patch =3D=3D=3D modified file 'configure.ac' --- configure.ac 2012-01-22 15:43:14 +0000 +++ configure.ac 2012-02-04 19:48:08 +0000 @@ -968,16 +968,21 @@ [Define to 1 if you have the LZMA library.])],) AC_SUBST([LIBLZMA]) =20 -AC_CHECK_LIB([zfs], [libzfs_init], - [LIBZFS=3D"-lzfs" - AC_DEFINE([HAVE_LIBZFS], [1], - [Define to 1 if you have the ZFS library.])],) +AC_ARG_ENABLE([zfs], + [AS_HELP_STRING([--disable-zfs], [Disable ZFS support.])])= + +if test x"$enable_zfs" !=3D xno; then + AC_CHECK_LIB([zfs], [libzfs_init], + [LIBZFS=3D"-lzfs" + AC_DEFINE([HAVE_LIBZFS], [1], + [Define to 1 if you have the ZFS library.])],)= + + AC_CHECK_LIB([nvpair], [nvlist_print], + [LIBNVPAIR=3D"-lnvpair" + AC_DEFINE([HAVE_LIBNVPAIR], [1], + [Define to 1 if you have the NVPAIR library.])= ],) +fi AC_SUBST([LIBZFS]) - -AC_CHECK_LIB([nvpair], [nvlist_print], - [LIBNVPAIR=3D"-lnvpair" - AC_DEFINE([HAVE_LIBNVPAIR], [1], - [Define to 1 if you have the NVPAIR library.])],= ) AC_SUBST([LIBNVPAIR]) =20 LIBS=3D"" # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdTBFGYAAab/gAAcAQB0Z= /// f+/dGr/v//BQBB7stwO3Zu2NdLbhKIp6mTTRogybITT1M0hpkGmgxNDIbSNAlII0yaNTZJ6po= 9JP SMmjTQAGhkAAPUGSDRRminkgDanpAaBoAANAGgyHNMjIZMENGEwRpo0YgaZMjAAEEkiNCYjJk= npl MRHlNlGjRoADQ9Qep6j0k1eg+m+77F8l2VVDE+/OX6JZrJAgwZ446YsGc9z5EhMIE8e5ngqBE= Eqx RkfG8LVtc14EEhIYwM8jHkaPfL+EJR0aOLcqN+WEBiUixuKz8RJbj1cctLfTQaqEXl4ngqxR7= LjG IiN2XqxOG0TlMpgjxlcvzvVhHJdIG2qVEclkMJNbJPfZxKTd3GMkcQkhIfwCppAccLhmLiAoi= DAd RKut6ZqI3d65GMC74RnbmK6NNA+KgRkY3ba5CZR5SRWqL/2FYZbumIlmZDlN9CusXAEcILQLl= i02 lMknrJODEuqRIWF6KTUrmfsG2HC7ZV5K9a0wM1IxrluUmFiBt3v1k9BL8iEKcQUb51TK2vfO3= XTU YD39oTkExuauyJcZQzZYOXlIGuyLXuJmshFj770vyos0E3HAky3ASUWYCSgYl1rVahdzsR8mE= Ivf AsmrAyICM0QXewFVMWROLbAtJpg5pjOOpo2Nq1cKxq0cDKKuHwecsuWuvply4bdSNi4VsaenE= iTB PViM5+J/Yvs6eBXMyY/Lw9kow9DiVUHGXEZ+A6TkYl3hNJXOcRGcH9C0F4xKIIiTVpUZlFzNS= ZKP SSTNoLEdDWwNFSVCobmFmcY0nGDE26U+piYsVaBzPEiGx28kSWnL0U2A1mtg2vkMg4Mhmoe72= YaU NdNIbKa387rIdgONT/A6T+C7pEREqsPDTYs3cYmqxqgOypbEPUvxvvLDOfKJxAxjfBUw2Bjp0= exX VXsz45G4wklLU7GNTxQn1hyH1LWfOpcJbxCNGot6H21MglmwULUysgfBXqsktqkX42PQL7zLq= M1M OhtvFxV/byxLBOVt1bg11dGrCDUzA9PiVw8q0Sc5tt5yla4yInNF4f526cbcbhqYSRj7kmtF1= MyO SQ/9FIbDAJjAM5I1vULNarYzyiq1prPH800JcZ0k4b6h6WI4t8IMLoR6tM7KhE8EjnClOfoub= oVN uQcwOBsAkCRwWx7GYYaFxvyZbNGPElqKX9gcEusL5u6tQ0oOcI3leAyphVwLCEemVWISEQoa5= JTa IpYXhksciYPQtrwlSgTpOD1JTq86iJU3FnNmwLnMnkHBKZR6WmKJLGZSonFtE1tyTYg0qgI0J= rKQ pMaKGmtrWhyIl9BcCaBMJHXhObJngIpwKHK6UcExJLwpHjWxb1N3ClKSNycExaXTheNIIjwUE= TKe B4BRVQFZBxOG4WE1nashSngy5halgKsjStkFC6JIiOH0grjLEnO1bsP+LuSKcKEhqYIozA=3D= =3D --------------090806040806090507080607-- --------------enig784B615B747B83E5A22D136E Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iF4EAREIAAYFAk8tjWkACgkQC77qH+pIQ6SiwQD/SKVGfnJdP1TwobF3Az+Bkx6g ng1lXU8ng8DXu6z5HJ0BAMMlrym9U+yHcD/ZgIqfg5YO/NZeCMppgBcg7SGA8hok =9gdu -----END PGP SIGNATURE----- --------------enig784B615B747B83E5A22D136E--