From 5f1a3cf8f27043a6f7860552cb78f1f194a33b10 Mon Sep 17 00:00:00 2001
From: David Wragg <david@rabbitmq.com>
Date: Thu, 4 Nov 2010 13:55:48 +0000
Subject: Don't use ac_abs_confdir in autoconf.ac

It's only available in recent versions of autoconf, and is not
documented.

Instead use things like srcdir and top_srcdir, which are documented
long-standing features of autoconf.
---
 Makefile.am             | 2 +-
 configure.ac            | 6 ++++--
 librabbitmq/Makefile.am | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 144422d..d5bac3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ squeakyclean: maintainer-clean
 
 codegen:
 	mkdir -p $@
-	cp -r "@AMQP_CODEGEN_DIR@"/* $@
+	cp -r "$(top_srcdir)/$(AMQP_CODEGEN_DIR)"/* $@
 	$(MAKE) -C $@ clean
 
 EXTRA_DIST=codegen debian LICENSE-MPL-RabbitMQ LICENSE-GPL-2.0
diff --git a/configure.ac b/configure.ac
index be7e695..e501df4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,10 @@ AC_ARG_ENABLE(64-bit,
 )
 
 AC_MSG_CHECKING(location of AMQP codegen directory)
-sibling_codegen_dir="$ac_abs_confdir/../rabbitmq-codegen"
-AMQP_CODEGEN_DIR=$(test -d "$sibling_codegen_dir" && echo "$sibling_codegen_dir" || echo "$ac_abs_confdir/codegen")
+for d in ../rabbitmq-codegen codegen ; do
+  AMQP_CODEGEN_DIR="$d"
+  test -d "$srcdir/$AMQP_CODEGEN_DIR" && break
+done
 AMQP_SPEC_JSON_PATH="$AMQP_CODEGEN_DIR/amqp-rabbitmq-0.9.1.json"
 
 if test -f "$AMQP_SPEC_JSON_PATH"
diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am
index 82b9f30..70675cb 100644
--- a/librabbitmq/Makefile.am
+++ b/librabbitmq/Makefile.am
@@ -16,8 +16,8 @@ EXTRA_DIST = \
 
 CODEGEN_PY=$(srcdir)/codegen.py
 
-amqp_framing.h: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY)
-	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@
+amqp_framing.h: $(top_srcdir)/$(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY)
+	PYTHONPATH=$(top_srcdir)/$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@
 
-amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY)
-	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@
+amqp_framing.c: $(top_srcdir)/$(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY)
+	PYTHONPATH=$(top_srcdir)/$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@
-- 
cgit v1.2.1