diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | librabbitmq/Makefile.am | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c516eb8..7217440 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,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) @@ -59,6 +61,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() { @@ -84,6 +93,7 @@ fi AC_SUBST(AMQP_CODEGEN_DIR) AC_SUBST(AMQP_SPEC_JSON_PATH) +AC_SUBST(AMQP_EXTENSIONS_JSON_PATH) AC_SUBST(PYTHON) dnl Decide which extra win32 libs we need diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am index 35680d0..203a6fc 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: $(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) $@ |