Patch submitted on qpid-dev:

2006-12-05  Jim Meyering  <meyering@redhat.com>

	* gen/Makefile.am (timestamp): Remove unnecessary "; \",
	that could have obscured a failure.
	(gen-src.mk): Use echo 'var = '\\, rather than 'var = \'.
	Both work, but emacs' font-lock mode mishandles the latter.

	* bootstrap: Give JAVA and JAVAC default values, and export them.
	Don't define abs_srcdir; no longer needed.
	Also filter out gen/Makefile.am's echo warning: ...
	Add comments.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@482637 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 2 deletions

diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap
index 34b16cb16b..e52b403700 100755
--- a/qpid/cpp/bootstrap
+++ b/qpid/cpp/bootstrap
@@ -4,13 +4,22 @@ aclocal -I m4
 autoheader
 libtoolize --automake
 
+# These are needed only if you don't already have the gen/*.{h,cpp} files.
+: ${JAVA=java}
+: ${JAVAC=javac}
+export JAVA JAVAC
+
 # If we're building in the qpid tree, we can generate
 # some Makefile snippets:
 
 if test -d ../gentools && test -d ../specs; then
+  # Transform gen/Makefile.am, removing automake-constructs and the
+  # contents of the sole automake-else clause (the warning), then
+  # use the result to run the rules that create gen-src.mk, a file
+  # that must be created before we run automake.
   (cd gen && rm -f gen-src.mk
-    perl -ne '/^(abs_srcdir|if|else|endif|include)\b/ or print' Makefile.am \
-	| make -f - abs_srcdir=`pwd` srcdir=. gen-src.mk > /dev/null )
+    perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \
+	| make -f - srcdir=. gen-src.mk > /dev/null )
 fi
 
 # Generate (for automake) lots of repetitive parts of tests/Makefile.am.