From 36a6364f902bebad1950d386cb7aea9043da8948 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Thu, 17 Jun 2010 15:35:23 +0100
Subject: Use the new extensions file (NB: this does not add synchronous
 basic.recover to the C client, it just unbreaks the build).

---
 configure.ac            | 10 ++++++++++
 librabbitmq/Makefile.am |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0269bd3..c3f1bb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,8 @@ 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")
 AMQP_SPEC_JSON_PATH="$AMQP_CODEGEN_DIR/amqp-0.8.json"
+AMQP_EXTENSIONS_JSON_PATH="$AMQP_CODEGEN_DIR/rabbitmq-0.8-extensions.json"
+
 if test -f "$AMQP_SPEC_JSON_PATH"
 then
   AC_MSG_RESULT($AMQP_CODEGEN_DIR)
@@ -38,6 +40,13 @@ else
   AC_MSG_ERROR(could not find AMQP spec file at "'$AMQP_SPEC_JSON_PATH'")
 fi
 
+if test -f "$AMQP_EXTENSIONS_JSON_PATH"
+then
+  AC_MSG_RESULT($AMQP_EXTENSIONS_DIR)
+else
+  AC_MSG_ERROR(could not find extensions spec file at "'$AMQP_EXTENSIONS_JSON_PATH'")
+fi
+
 AC_MSG_CHECKING(finding a python with simplejson installed)
 found_python=no
 checkPython() {
@@ -62,6 +71,7 @@ fi
 
 AC_SUBST(AMQP_CODEGEN_DIR)
 AC_SUBST(AMQP_SPEC_JSON_PATH)
+AC_SUBST(AMQP_EXTENSIONS_JSON_PATH)
 AC_SUBST(PYTHON)
 
 # Check for libpopt, which we need to build the tools
diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am
index b4c8843..90ab329 100644
--- a/librabbitmq/Makefile.am
+++ b/librabbitmq/Makefile.am
@@ -10,8 +10,8 @@ EXTRA_DIST = codegen.py
 
 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: $(AMQP_SPEC_JSON_PATH) $(AMQP_EXTENSIONS_JSON_PATH) $(CODEGEN_PY)
+	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $(AMQP_EXTENSIONS_JSON_PATH) $@
 
-amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY)
-	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@
+amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(AMQP_EXTENSIONS_JSON_PATH) $(CODEGEN_PY)
+	PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $(AMQP_EXTENSIONS_JSON_PATH) $@
-- 
cgit v1.2.1