From 921c4c14c2999a03b9e649b5c9adec73b5cae0de Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 6 Sep 2010 14:26:25 +0200
Subject: Add automake build support

---
 build/bootstrap.make  | 14 ++++++++++++--
 build/mysql/configure |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 12d3425..59a62a2 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -32,17 +32,27 @@ $(call include,$(bld_root)/cxx/configuration.make)
 #
 .PHONY: $(out_base)/       \
         $(out_base)/.test  \
+        $(out_base)/.dist  \
         $(out_base)/.clean
 
 ifdef %interactive%
 
-.PHONY: test clean
+.PHONY: test dist clean
 
-test: $(out_base)/.test
+test:  $(out_base)/.test
+dist:  $(out_base)/.dist
 clean: $(out_base)/.clean
 
 endif
 
+# Make sure the distribution prefix is set if the goal is dist.
+#
+ifneq ($(filter $(MAKECMDGOALS),dist),)
+ifeq ($(dist_prefix),)
+$(error dist_prefix is not set)
+endif
+endif
+
 # If we don't have dependency auto-generation then we need to manually
 # make sure that ODB files are generated before C++ file are compiler.
 # To do this we make the object files ($2) depend in order-only on
diff --git a/build/mysql/configure b/build/mysql/configure
index e4bae87..c1d6382 100755
--- a/build/mysql/configure
+++ b/build/mysql/configure
@@ -39,7 +39,7 @@ $echo
 $echo "Please enter the MySQL database host."
 $echo
 
-host=`read_value "localhost"`
+host=`read_value ""`
 
 $echo
 $echo "Please enter the MySQL database port."
-- 
cgit v1.1