From 0aaddfceeea3e89df196ab1846da54d09713a512 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Thu, 15 Dec 2016 21:17:31 +0100
Subject: [PATCH] fix configure

---
 Makefile.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d040f4c..85e0b38 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,6 +32,7 @@ BISECT_REPORT	= @BISECT_REPORT@
 BYTESWAP_H	= @BYTESWAP_H@

 OCAMLLIB	= @OCAMLLIB@
+BISECTLIB	= $(shell if test -z $${BISECTLIB}; then echo $(OCAMLLIB); else echo $${BISECTLIB}; fi)
 top_srcdir	= @top_srcdir@

 pkg_cil		= @OCAML_PKG_cil@
@@ -47,9 +48,9 @@ OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
 OCAMLOPTLIBS	= -linkpkg

 ifneq ($(enable_coverage),no)
-OCAMLCFLAGS     += -I +bisect -pp 'camlp4o $(OCAMLLIB)/bisect/instrument.cma'
+OCAMLCFLAGS     += -I +bisect -pp 'camlp4o $(BISECTLIB)/bisect/instrument.cma'
 OCAMLCLIBS	+= -I +bisect bisect.cma
-OCAMLOPTFLAGS   += -I +bisect -pp 'camlp4o $(OCAMLLIB)/bisect/instrument.cma'
+OCAMLOPTFLAGS   += -I +bisect -pp 'camlp4o $(BISECTLIB)/bisect/instrument.cma'
 OCAMLOPTLIBS	+= -I +bisect bisect.cmxa
 endif

@@ -110,7 +111,7 @@ bitstring_persistent.cmi: bitstring_persistent.mli
	  -I +camlp4 -pp camlp4of -c $<

 pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
-	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
+	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
	  -pp camlp4of -c $< -o $@

 bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
@@ -133,7 +134,7 @@ byteswap.h: byteswap.in.h
 ifeq ($(enable_coverage),no)
 PP	= -pp 'camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo'
 else
-PP	= -pp 'camlp4o $(OCAMLLIB)/bisect/bisect.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo'
+PP	= -pp 'camlp4o $(BISECTLIB)/bisect/bisect.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo'
 endif

 check: test
--
2.11.0
table>
<div class='path'>path: <a href='/guix/log/?id=c061eb587cbb8590a5cd4793b56a01560af747a8'>root</a>/<a href='/guix/log/gnu?id=c061eb587cbb8590a5cd4793b56a01560af747a8'>gnu</a>/<a href='/guix/log/gnu/bootloader?id=c061eb587cbb8590a5cd4793b56a01560af747a8'>bootloader</a>/<a href='/guix/log/gnu/bootloader/grub.scm?id=c061eb587cbb8590a5cd4793b56a01560af747a8'>grub.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/bootloader/grub.scm?id=c061eb587cbb8590a5cd4793b56a01560af747a8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-06-01 15:21:28 +0200'>2018-06-01</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=33d8a871042e73d6b236793d02e5a8287a47ebe4'>bootloader: grub: Use 'with-extensions'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-01 15:21:28 +0200'>2018-06-01</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=31a5d694a3b9200bfde253eafbaca118b773fb96'>bootloader: grub: Simplify 'svg-&gt;png'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-05-28 13:24:11 +0200'>2018-05-28</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=a5acc17a3c10a3779b5b8b1a2565ef130be77e51'>file-systems: Remove 'title' field and add &lt;file-system-label&gt;.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-02-18 12:28:56 +0100'>2018-02-18</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=46fc9a7e0d50251a720e6cf0d51bb28e8bf7266b'>gnu: Pass "--target=i386-pc" when installing GRUB for legacy BIOS.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2017-09-11 22:24:46 +0200'>2017-09-11</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=9b336338cdc0e46a3bf7a2913c2f61cd2410c4d6'>system: Introduce a disjoint UUID type.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-08-20 11:16:42 +0200'>2017-08-20</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=2941b347b664a3d3114de0ac95e28db78db66144'>gnu: grub-efi-bootloader: Specialize grub-install invocation.</a><span class='msg-avail'>...</span></td><td>Andy Wingo</td></tr>
<tr><td><span title='2017-08-03 18:13:03 +0200'>2017-08-03</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=cf189709bcbc96e0e24c132f2a55a5347531ab44'>vm: Use grub-hybrid's grub-mkrescue.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2017-07-28 21:56:18 +0200'>2017-07-28</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=1975c754f487eb4933724ca3b116442d21ef8dd9'>bootloader: Use &lt;menu-entry&gt; for the bootloader side.</a><span class='msg-avail'>...</span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2017-07-02 22:52:30 +0200'>2017-07-02</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=1b0f266e40aead09be95a984bd9c6cec3dff397e'>gnu: Switch guile-cairo and dependents to Guile 2.2 again.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-06-08 16:29:29 +0200'>2017-06-08</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=8b22107e5d0bdeb300fb33b5a40aed2057a66b94'>bootloader: Use menu-entry to define custom bootloader entries.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2017-05-16 14:41:01 +0200'>2017-05-16</span></td><td><a href='/guix/commit/gnu/bootloader/grub.scm?id=b09a8da4a2e50845a297e041762f3ff9e649c047'>bootloader: Add extlinux support.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>