From 0ca70692f0b1b9e5dbae1663cafa9e5bc8a13be9 Mon Sep 17 00:00:00 2001
From: ACSYS <cvc4-devel@cs.nyu.edu>
Date: Thu, 25 Oct 2012 19:44:52 +0000
Subject: [PATCH] more minor fixes to build system

---
 Makefile.builds.in       |  8 ++++----
 configure.ac             | 11 ++++++++---
 src/bindings/Makefile.am |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Makefile.builds.in b/Makefile.builds.in
index 274e2c9e7..249a5e380 100644
--- a/Makefile.builds.in
+++ b/Makefile.builds.in
@@ -137,8 +137,8 @@ else
 	done
 endif
 #	set up builds/$(CURRENT_BUILD)/bin and builds/$(CURRENT_BUILD)/lib
-	$(AM_V_at)test -e $(CURRENT_BUILD)/lib || ln -sfv "$(abs_builddir)$(libdir)" $(CURRENT_BUILD)/lib
-	$(AM_V_at)test -e $(CURRENT_BUILD)/bin || ln -sfv "$(abs_builddir)$(bindir)" $(CURRENT_BUILD)/bin
+	$(AM_V_at)test -e $(CURRENT_BUILD)/lib || ln -sf "$(abs_builddir)$(libdir)" $(CURRENT_BUILD)/lib
+	$(AM_V_at)test -e $(CURRENT_BUILD)/bin || ln -sf "$(abs_builddir)$(bindir)" $(CURRENT_BUILD)/bin
 #	set up builds/...prefix.../bin and builds/...prefix.../lib
 	$(AM_V_mkdir) ".$(bindir)"
 	$(AM_V_mkdir) ".$(libdir)"
@@ -184,8 +184,8 @@ else
 	done
 endif
 #	set up builds/bin and builds/lib
-	$(AM_V_at)test -e lib || ln -sfv ".$(libdir)" lib
-	$(AM_V_at)test -e bin || ln -sfv ".$(bindir)" bin
+	$(AM_V_at)test -e lib || ln -sf ".$(libdir)" lib
+	$(AM_V_at)test -e bin || ln -sf ".$(bindir)" bin
 	rm -f doc; ln -sf "$(CURRENT_BUILD)/doc" doc
 	rm -f examples; ln -sf "$(CURRENT_BUILD)/examples" examples
 
diff --git a/configure.ac b/configure.ac
index 44b2c0a31..ccc38cafb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -480,9 +480,14 @@ if test -z "${enable_static_binary+set}"; then
   enable_static_binary=no
 fi
 AC_MSG_RESULT([$enable_static_binary])
-if test "$enable_static_binary" = yes -a "$enable_static" != yes; then
-  enable_static=yes
-  AC_MSG_WARN([forcing static-library building, --enable-static-binary given])
+if test "$nable_static_binary" = yes; then
+  if test "$target_os" = darwin; then
+    AC_MSG_ERROR([Statically-linked binaries are not supported on Mac OS.  See https://developer.apple.com/library/mac/#qa/qa2001/qa1118.html])
+  fi
+  if test "$enable_static" != yes; then
+    enable_static=yes
+    AC_MSG_WARN([forcing static-library building, --enable-static-binary given])
+  fi
 fi
 
 AC_MSG_CHECKING([whether to support proof in libcvc4])
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
index d172e5cf0..68a65b2c9 100644
--- a/src/bindings/Makefile.am
+++ b/src/bindings/Makefile.am
@@ -201,9 +201,9 @@ ocaml/swig.ml:; $(AM_V_GEN)cd ocaml && $(SWIG) -ocaml -co swig.ml
 ocaml/swig.mli:; $(AM_V_GEN)cd ocaml && $(SWIG) -ocaml -co swig.mli
 ocaml/swigp4.ml:; $(AM_V_GEN)cd ocaml && $(SWIG) -ocaml -co swigp4.ml
 #ocaml.cpp:;
-cvc4_ocaml_top: ocaml/CVC4.la ocaml/swig.cmo ocaml/swig.cmi ocaml/swigp4.cmo ocaml/CVC4.cmo ocaml/CVC4.cmi
+cvc4_ocaml_top$(EXEEXT): ocaml/CVC4.la ocaml/swig.cmo ocaml/swig.cmi ocaml/swigp4.cmo ocaml/CVC4.cmo ocaml/CVC4.cmi
 	$(AM_V_GEN)\
-	$(OCAMLFIND) ocamlmktop -I $(ocamldatadir) -custom -o cvc4_ocaml_top -package camlp4 dynlink.cma camlp4o.cma ocaml/swig.cmo ocaml/swigp4.cmo ocaml/CVC4.cmo -cclib ocaml/.libs/CVC4.so -cclib -lstdc++
+	$(OCAMLFIND) ocamlmktop -I $(ocamldatadir) -custom -o cvc4_ocaml_top$(EXEEXT) -package camlp4 dynlink.cma camlp4o.cma ocaml/swig.cmo ocaml/swigp4.cmo ocaml/CVC4.cmo -cclib ocaml/.libs/CVC4.so -cclib -lstdc++
 ruby.lo: ruby.cpp
 	$(AM_V_CXX)$(LTCXXCOMPILE) -c $(RUBY_CPPFLAGS) -o $@ $<
 tcl.lo: tcl.cpp
-- 
2.30.2