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
h: <a href='/guix/log/?id=b8a6230df3fbbeeddb7a0e6976e0b8581bd0ab6e'>root</a>/<a href='/guix/log/gnu?id=b8a6230df3fbbeeddb7a0e6976e0b8581bd0ab6e'>gnu</a>/<a href='/guix/log/gnu/packages?id=b8a6230df3fbbeeddb7a0e6976e0b8581bd0ab6e'>packages</a>/<a href='/guix/log/gnu/packages/gv.scm?id=b8a6230df3fbbeeddb7a0e6976e0b8581bd0ab6e'>gv.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/gv.scm?id=b8a6230df3fbbeeddb7a0e6976e0b8581bd0ab6e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-03-30 01:30:16 +0200'>2017-03-30</span></td><td><a href='/guix/commit/gnu/packages/gv.scm?id=6fd52309b8f52c9bb59fccffac53e029ce94b698'>gnu: Use HTTPS for almost all gnu.org HOME-PAGEs.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-01-05 23:45:38 +0100'>2017-01-05</span></td><td><a href='/guix/commit/gnu/packages/gv.scm?id=fbec5abeef78ee52a56e3cd2183fd34baec47773'>gnu: gv: Do not propagate Ghostscript.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-09-02 14:35:40 +0300'>2016-09-02</span></td><td><a href='/guix/commit/gnu/packages/gv.scm?id=fb0b9ff1fabb3106ff72f3fe5f531b14f96bda8d'>gnu: Use ghostscript over ghostscript-gs.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2016-07-25 11:37:43 +0200'>2016-07-25</span></td><td><a href='/guix/commit/gnu/packages/gv.scm?id=d8eb912132ccdff955e3318fe549c5f7f674adf8'>gnu: Use 'ghostscript-gs' in packages that need the 'gs' command.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>