Here's a new bundle including a --without-libzfs flag, and a fix for my build issue.
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: flop...@gentoo.org-20120205010752-empg4oxbegj3fepe # target_branch: http://bzr.savannah.gnu.org/r/grub/trunk/grub/ # testament_sha1: 3de5f3713591cd87700717bed9a9371d99f3e053 # timestamp: 2012-02-04 20:08:34 -0500 # base_revision_id: phco...@gmail.com-20120204204729-kvhzfohes2vqg8h9 # # Begin patch === modified file 'configure.ac' --- configure.ac 2012-02-04 20:47:29 +0000 +++ configure.ac 2012-02-05 01:05:27 +0000 @@ -974,16 +974,21 @@ [Define to 1 if you have the LZMA library.])],) AC_SUBST([LIBLZMA]) -AC_CHECK_LIB([zfs], [libzfs_init], - [LIBZFS="-lzfs" - AC_DEFINE([HAVE_LIBZFS], [1], - [Define to 1 if you have the ZFS library.])],) +AC_ARG_WITH([libzfs], + [AS_HELP_STRING([--without-libzfs], [Do not use libzfs.])]) + +if test x"$with_libzfs" != xno; then + AC_CHECK_LIB([zfs], [libzfs_init], + [LIBZFS="-lzfs" + AC_DEFINE([HAVE_LIBZFS], [1], + [Define to 1 if you have the ZFS library.])],) + + AC_CHECK_LIB([nvpair], [nvlist_print], + [LIBNVPAIR="-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="-lnvpair" - AC_DEFINE([HAVE_LIBNVPAIR], [1], - [Define to 1 if you have the NVPAIR library.])],) AC_SUBST([LIBNVPAIR]) LIBS=""
=== modified file 'util/getroot.c' --- util/getroot.c 2012-02-03 21:36:51 +0000 +++ util/getroot.c 2012-02-05 01:07:52 +0000 @@ -2380,7 +2380,7 @@ } #endif -#ifdef HAVE_LIBZFS +#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR) static libzfs_handle_t *__libzfs_handle; static void # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZtMHVMABbj/gAAcAQB9Z/// f+/dmr////BgCbz6e7nVKeDVb2tpxTtSLpoKAAANRTNTTEAyNA0NAxAANMgADQGQSUCniGU2qn4k 9U9T1ANAAAAAAAAJSmjBBoI9VH6NU/RMakeoGj1AyDR6jJoAASJJT9CZMgmTUxMTIaAGQaAMhiNk mIcZMmjENNDATQxNGmTEDIwmjTTCDJgqSQmjQJpiaATaJNGmmiaek0A2oAGg2pZo18+4FDOWOedB 0bRznZDqI5jdUYNzesjZDOMx37qDenVvStMrt19BYIvasYBu9NNVmOLq1RUFcSlKNaiZgW05mlJL 0bmV/x38sD+MyZqsVUqlKnDqhr3Rq1iZS2EVkSyUqnNRllkk3SppwUsUmFjsDIXpbAv1q1D8PRNH UdoR/jEVnNzaZ6dsNm+AVOEgBhwLFG3OqQ840iTtTTp3cuoOQOtNWoO9v23WMKmFoCGQQPPBCBme GFVxsGsbXohTXLD4aOYOBADB8pZgFEKUnOPWiioT2fRD9M80+o9h4Q80ehc7vXCuftNJyRqZTzm2 /169O32bNLRC04Qvt7ZIdYo8WjNXXEREREQW5nhgrSL2gk4Y84RAZFiQ/X0nvkl0SMfrdd0iMJ8y 3ffg+UtfImejoWskrsCDVE5JKfncrxDyXILjJRVTCVjRakqEGrPds1Uw0YFj5T8ocCYKSZ/I4Z4Z 4Un3dw3be00wuLzfiSOFclZ1/HfOuxlDCbDNWcRkT8goCrOClLtC8JqRcV5jDl3wlg4rSC8TPp2b 1/UMT2LsGXy497kwZUrspfLl9cL9jXknh0xEuJGck1lSThuRp2LZqRWZGq/i1aJeggqSJ361I1kt r0HJ0eKwXMxQTBw7dRC3GJYxnjOxeQEcYNxzgNnggkmJsJzLERo/CIXMhntDlEbTM9jZXlUFxg9C 4Ua00UsHiwmrOT5u3SZEUYF5rl/hPV7rq4Uu2U2Em8WMAVoyihMGCT6y5FzbWgNFfg95NDnDxFZZ F9XSMW8EFbRDxgwxgW2VK0wkd7Yx33z4RbdwivO6UlN5AwsG0wpdiOweLIig4WzJyGUuuMisqmBH ihnBBdAcSmRLMYDWvdFMzFonGLwCL+ARbiY52J2OhUWiHZsCl+3hAlYgMk9XTpvygVyaolSTXbg0 QVKMG6dS2a/cyzc4dcNUymeY7EU3c+SMtRqbqtjdvTMEZKtIrLI64jCdjx4siDwSCLXURLpHrK0w EdBBNRyhmquEzB4iGKcFBEdCLsB8KDS4kwbK+h0wpzY00imvRd89sKRSFFwTD4QcKnqcV4guGzLo uMzbnwswhwhjkuWrFGatd8vvnhErDcYg5AwNRr6GLrDtderEYtKMZcaJsrgaLOWTrFXFbykMDaYl qNxYXliYQsZisBoiY4FHzvznAo/c+z6/qPUa3CVaWlvdDbbcmaFypvcD1JIPIg03F59jrDuPYfAN /qMVaGMYhts6ZC+NQyQpkioLTVVgNC6iCnsCxHcispMYcv9wt6jAXAdZUYw7pnHSqmN3GVFcDZmm U+U6TYzTomxTTLtpZV7GX+E815vMdZhWUg0GkgkaRwNdRyBzHCcJnvoW/SbQujWO02kuAoqsXAvK DiUIXJKUQBIx+s9ZxcZSCmMOInPnVz9TfV0CugYaZHevrnLgzYoHG6imyoUPV7pw1IJcI++GmfHR sOwxOzratcPxR8dJGLVDF9Hx7MVtKYWESC8DGUVFJGMcTlgKu7BLw5vTAvS1DQ5YKR9SF88ZSdud TodHHjzs/B6l2/rcnlfe3aMGUxYOWtsXcDf0brHdDfDYceqfhKnHRlTjss5czewJqwZZ2p0C+ldA I7QwM8KASc4Utc24m4oE20DsSmgFuyQGHHqDA2Id2bRkUkzhiKQJAVhjbshyZss2uazdjnEMiUnR bSTfPRQu+a2XAe+w2GreG8Ki4TwKWnWaIlND00eOl3XsOLCu92zFq1rvR7F3HWabtct8A3hx79rp +00OY9LINa1qifCVHo2v0/IPA9adj/vePCSHrJYmdN/l2lofL2cjvNRxPMzqNc6NYXkvMI8vBw67 s+pWeHXywpbmw4HK4le4zt1j2oqoorQJe+VC3ZSSgQZiJAgXAZc0fkWPacIr3PpVqillWillWKWV bMY+ozY1GBV0ksX9sg3eCf3Li+r4PlJDVqq5GlPFGEMjRDajw6jtLW8g/b9+90wzMr7Ped9nmj5i 9Hjg7SU3lYx+aR1+6RXae03EoxMT5ZOl841o9pm74fAvJcDOCCSg6+qv2bg0AwGAFKeWtLwCMfwn hDmeC/Wm7yT0R3Q9CkcYlHuLkV6gyixUjIuDRge+ipQ3Wx7TKsv61a2/j1HMzdKNckOcLodBWPmj 8ZIYw8YXnebxxh2GcwMB1JlTHALdJaZoviVRZJS2Bb4MMxdUkSqJRN/Vttu5zx1SQ8XfDp6sTQi6 +JpD7p7y5GmSGAzSQxuiV+iSFQ8IfSvJq1zortc3L4J2nRDl6p3FiiXjsjzrSXJfDa618kOd5dfJ DVDjDrhqOUKR9OCNaO3VdbYm6oWvicE12qHViRtPM3jNJDQ6em6GfsqX3l8MCqK5lDJRiLypMdZz LzXr51KqVVVqLswWMT0qVUqlVDFL6PtmMTZvR0Xbeo6NrwNq++bcxhrox9BR2wsWnQakXnCGWe8p oLtJq1jNNUkNMSiVW6ZrE1wyNDwRgb2dHEzWZbEUzvs7UeF2z4I+E3txPcYBYwOaO9HpOSPuuc50 Ka0qLMidaHVDkfbCkeiPKSGLKdPZHcel7xt5U9tX1am0yhij/4u5IpwoSE2mDqmA
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
