From e8e3d14e014319b6bfd5a94c173116753121a11e Mon Sep 17 00:00:00 2001
From: Damien Doligez <damien.doligez-inria.fr>
Date: Mon, 23 Jan 2012 15:18:22 +0000
Subject: [PATCH] fix configure on MacOSX/64-bit; add an option to configure or
 build without camlp4

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12073 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 Makefile      |  11 +++++++----
 boot/ocamlc   | Bin 1176053 -> 1176089 bytes
 boot/ocamldep | Bin 314356 -> 314392 bytes
 boot/ocamllex | Bin 171113 -> 171096 bytes
 configure     |   6 +++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e2054e690..0911076b4 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,9 @@ CAMLRUN=byterun/ocamlrun
 SHELL=/bin/sh
 MKDIR=mkdir -p
 
+CAMLP4OUT=$(CAMLP4:=out)
+CAMLP4OPT=$(CAMLP4:=opt)
+
 INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver \
 	 -I toplevel
 
@@ -131,7 +134,7 @@ defaultentry:
 
 # Recompile the system using the bootstrap compiler
 all: runtime ocamlc ocamllex ocamlyacc ocamltools library ocaml \
-  otherlibraries ocamlbuild.byte camlp4out $(DEBUGGER) ocamldoc
+  otherlibraries ocamlbuild.byte $(CAMLP4OUT) $(DEBUGGER) ocamldoc
 
 # Compile everything the first time
 world:
@@ -264,12 +267,12 @@ opt:
 
 # Native-code versions of the tools
 opt.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
-	 $(DEBUGGER) ocamldoc ocamlbuild.byte camlp4out \
+	 $(DEBUGGER) ocamldoc ocamlbuild.byte $(CAMLP4OUT) \
 	 ocamlopt.opt otherlibrariesopt ocamllex.opt ocamltoolsopt.opt \
-	 ocamldoc.opt ocamlbuild.native camlp4opt
+	 ocamldoc.opt ocamlbuild.native $(CAMLP4OPT)
 
 base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
-	 ocamlbuild.byte camlp4out $(DEBUGGER) ocamldoc ocamlopt.opt \
+	 ocamlbuild.byte $(CAMLP4OUT) $(DEBUGGER) ocamldoc ocamlopt.opt \
 	 otherlibrariesopt
 
 # Installation
diff --git a/boot/ocamlc b/boot/ocamlc
index beb4998556733c23da281a699832473648ec42ff..6b37a0080b19abb3c528c99ab44c220ac732f989 100755
GIT binary patch
delta 422
zcma)$y-EW?6oohbubPaBg@Vl_dx;hf3nI}s2naqyn9NR0aCUZ>$wE4@7__io?0kT9
zBC!hCSebOTHu?f8);egTq_Mac&f%W>osZ}G<x71vD2J)hp-31Np<A&CPr*XY!jy$+
z3o{mGEzDV%x3FNrx3Fko$-=UQyoJIIpu1uI!t+Y0=Usn#p1B{q4bfA+geU%H?+>Va
z5KQ=8oyy~|*^xhdrz(v3hewQI(vk^@c#CVI5`~FVOevx?XGxqjMreC|hX|Hx!wn`v
zb=#WL$lr9?>~@6U1n-Fm6O9Sgtc`p7wMK0hW0K&irc!j86{-WGj{NYO)=Xt2xT6Z%
zZAcn(qbPIQ*}T<}Ji;bb4sJ}~?*9=g{7q#WV|2b&jVVh^FQl&WuUcpQF><pq=#PtA
LLGCJhd@bTHYm$>V

delta 379
zcmbRF#Qp1IcNJwt{fzwFRQ;UPwAA9_#5{ey{N%*k9Q~sF{E}jQFk81#xK)_3RhX$&
zn7LJ$rB#@<RhX?+n7vh)qg9x*RhX+)n7dV&r&XA@RhVz9F#o}Qyx|NCLZu80o4+tH
z6d&6Da3B9YUS&hV7EQl+hF{U!gs{SrqSCx<{iMu1hzo%{rQ~Ezr}X4x1>Ll~eBBhF
zZ;Esa@~7LJ<=0WyO$+dJw$aVWRZ!5)Nyz~c$)!cbsl`A>K}kkYYGMkfE>P=q+q3*y
z_L^{YS~)2Sx<x=e`3h=9iFrAhNlJ-D%DM&V+F*N%GZKqZQ<Q;hWd3x+bNn5gsyUf?
er4>qv#qAf)@dL5I_6z3(HIx~%r~mvYr~m+@AcB+t

diff --git a/boot/ocamldep b/boot/ocamldep
index 0fee992d5fbbb212f6536b5ec74533f32ff538cf..86c1dbb11f6a6dbd22664931eb3926e76a98f3f3 100755
GIT binary patch
delta 369
zcma)$F-rq67>3X0mV$L?L2>(Pj*3DEh}8ZGe?f<mCb?dY+$AJE=q3(D9lE%rzoJf3
z@GrRfGaN;5GdL+-Tt0YTzK7@i2)*^X*Ta3<ct^G2Ow)KOO>eVhwzte$&l!3ccfOJ&
zT_uTlPm<B+_GOG#`(4;!LRp}G7w`6)0v+P(8RtOq+7Kag>4-HJNKD*XVx8osvf)gj
z^JBOmnm5i%4@BE};Up97(?|!ZP<8`XS^#lCnBxU3M#IVQ5`Y*OI96*lJz)+LJ8RP)
z-?XWPmeH%(d{VPYddqmsv6i{2r2ya9sP`Vn|9?OSf2r`O(EZV%V%+!zWpVPaS$DWZ
PTU@43tfe~P?KOpOyr_Ib

delta 340
zcmbO+L-@;dVHIUX{fzwFRQ;UPwAA9_#5{ey{N%*k9Q~sF{E}jQFk81#xK)_3RhVh3
zFmq=#?-2$DmR<&il!puq7N54SjAriTQ8pxO$aIekW<_rk!U{`@O7pVylQQ!lwgY)e
z$;q5f>B-3ox@md&x+y@H7U>q`Pv4xutfQ`*7U1b@qnnefprD(Rk^>}?ON)wAi-C-S
zl8mC%#1u|lpw{VIGMKgOHR0;Ca#9p@i-3Ca71W9n^KvqiloE@Sbqmt9!S)nqBo?Kn
rC<EEZ{OKz)nL9XDb29TvE0hw8+ugI6x4UPttWRXhxH0|5X%+<leol1G

diff --git a/boot/ocamllex b/boot/ocamllex
index 633bf7095a075ba39cd2bbf554b5c2926d365b18..89e13948565715109e3527a181bc4ffb46b34c2c 100755
GIT binary patch
delta 36
qcmaF4gX_i)E@5Rw{nFwh{ha*d#2kGfk(;C6sM4y!xK)M8bq)aksSMQs

delta 53
zcmcbygX`rEE)``({fzwFRQ;UPwAA9_#5{ey{N%*k9Q~sF{E}jQFk81#xK)^Ot1y%6
F8~`D<6BPge

diff --git a/configure b/configure
index 94aed58af..d1cd0a8ad 100755
--- a/configure
+++ b/configure
@@ -43,6 +43,7 @@ debugruntime=noruntimed
 withsharedlibs=yes
 gcc_warnings="-Wall"
 partialld="ld -r"
+withcamlp4=camlp4
 
 # Try to turn internationalization off, can cause config.guess to malfunction!
 unset LANG
@@ -112,6 +113,8 @@ while : ; do
         verbose=yes;;
     -with-debug-runtime|--with-debug-runtime)
         debugruntime=runtimed;;
+    -no-camlp4|--no-camlp4)
+        withcamlp4="";;
     *) echo "Unknown option \"$1\"." 1>&2; exit 2;;
   esac
   shift
@@ -683,7 +686,7 @@ case "$host" in
   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
   x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
-  x86_64-*-darwin9.5)           arch=amd64; system=macosx;;
+  x86_64-*-darwin*)             arch=amd64; system=macosx;;
 esac
 
 # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
@@ -1571,6 +1574,7 @@ echo "MKEXE=$mkexe" >> Makefile
 echo "MKDLL=$mksharedlib" >> Makefile
 echo "MKMAINDLL=$mkmaindll" >> Makefile
 echo "RUNTIMED=${debugruntime}" >>Makefile
+echo "CAMLP4=${withcamlp4}" >>Makefile
 
 rm -f tst hasgot.c
 rm -f ../m.h ../s.h ../Makefile