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=93b3dc523ef79215f9ac0a26c968770db689f5f0'>root</a>/<a href='/guix/log/gnu?id=93b3dc523ef79215f9ac0a26c968770db689f5f0'>gnu</a>/<a href='/guix/log/gnu/packages?id=93b3dc523ef79215f9ac0a26c968770db689f5f0'>packages</a>/<a href='/guix/log/gnu/packages/geo.scm?id=93b3dc523ef79215f9ac0a26c968770db689f5f0'>geo.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/geo.scm?id=93b3dc523ef79215f9ac0a26c968770db689f5f0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-03-15 20:30:41 +0100'>2019-03-15</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=dc8621a2c1f010bf5d8b3365e26b66603a8f2fd4'>gnu: Move protozero to (gnu packages protobuf).</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-03-15 00:41:02 +0100'>2019-03-15</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=60fddfae130c1034c03f026a1820114436be7caa'>gnu: protozero: Update to 1.6.7.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-03-14 23:51:49 +0100'>2019-03-14</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=a3783aca66cfd256fa361f99ebaa6b67d87a7429'>gnu: libgeotiff: Update to 1.4.3.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-03-12 15:26:19 +0100'>2019-03-12</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=e3df159edca975baa3ae10576be8ecf4c323c854'>gnu: geos: Update to 3.7.1.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-02-19 09:54:35 +0100'>2019-02-19</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=b23c95fe396d4de64084169b304b7e562672a4e3'>gnu: protozero: Fix typo in description.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-02-19 09:54:35 +0100'>2019-02-19</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=d56af1ff62a3759c323fec8760abf2a3e13c7dad'>gnu: protozero: Don't use unstable tarball.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-02-19 09:54:34 +0100'>2019-02-19</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=257c826c918f9897a4219afe86e6558f03350d5f'>gnu: protozero: Update to 1.6.5.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-01-20 22:12:10 +0100'>2019-01-20</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=3e2d4e69c340c3520f546f8c7e21e52383058d1c'>Merge branch 'master' into staging</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-16 16:08:22 +0100'>2019-01-16</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=cd0322a3efd96577de9ab35e4432d1ae399257c8'>gnu: Move sqlite to separate module.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-01-15 14:46:44 +0100'>2019-01-15</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=44d10b1f722856ab8e9b942804aa7ef33e2ef739'>gnu: Separate Python core packages from the rest.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-01-09 10:52:41 +0200'>2019-01-09</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=0e289672503a4e1599ef826d49f2fa5575081942'>Merge remote-tracking branch 'origin/master' into staging</a></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-01-07 15:55:06 +0100'>2019-01-07</span></td><td><a href='/guix/commit/gnu/packages/geo.scm?id=2a2760a08f6a9c45d94f72dff7f97bf2c23a886a'>gnu: Move R packages from geo.scm to cran.scm.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>