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
th'>path: <a href='/guix/log/?id=34b1f339cd8f709941593ec2ae0b55ed1e13cb6e'>root</a>/<a href='/guix/log/gnu?id=34b1f339cd8f709941593ec2ae0b55ed1e13cb6e'>gnu</a>/<a href='/guix/log/gnu/packages?id=34b1f339cd8f709941593ec2ae0b55ed1e13cb6e'>packages</a>/<a href='/guix/log/gnu/packages/moe.scm?id=34b1f339cd8f709941593ec2ae0b55ed1e13cb6e'>moe.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/packages/moe.scm?id=34b1f339cd8f709941593ec2ae0b55ed1e13cb6e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
/th></tr>
<tr><td><span title='2019-03-30 15:19:32 +0100'>2019-03-30</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=528ea990c3a815cb4b0ded913ea22cdc778839bd'>gnu: Use 'this-package' as a native input instead of 'self-native-input?'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-24 11:12:52 +0200'>2018-12-24</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=e47c69f22638dc92ee962942b8e24284c8dee832'>gnu: file: Fix CVE-2018-10360.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2018-05-01 03:35:06 +0200'>2018-05-01</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=32c18fcb3c3cb10303aa4ef07571867e8ce3fe8d'>gnu: file: Update to 5.33.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-01-04 21:21:04 -0500'>2018-01-04</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=247d23680a222bc5440dec7c3fe0d36ad463a121'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-01-04 12:44:03 -0500'>2018-01-04</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=def8a62f627d00503e1fb84ac335cfa3d95a0438'>gnu: file: Mention libmagic.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-10-01 22:16:22 +0300'>2017-10-01</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=64df08f0cfac8f7a329002afa3461fd62a4b229c'>Merge remote-tracking branch 'origin/master' into core-updates</a></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-09-06 08:48:52 +0300'>2017-09-06</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=8d988f3845ebab6e7a87904ecb888733265068d6'>gnu: file: Update to 5.32.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-09-05 23:04:05 +0300'>2017-09-05</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=f1597427f220b0799b9c8847768d2f5a93fe3730'>gnu: file: Fix CVE-2017-1000249.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-04-03 15:12:10 +0200'>2017-04-03</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=8c85cb1b9ff10de2df0f3395d0491c389b6596dd'>gnu: file: Update to 5.30.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2016-08-15 10:42:27 +0300'>2016-08-15</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=da931eee6014a4eaa59c1c513e24fa5045b5e188'>gnu: file: Update to 5.28.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>