diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-11-24 14:33:31 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-11-24 14:33:31 +0000 |
| commit | b593ce1b3ce740c17f209c8b33b74ea430bde65b (patch) | |
| tree | af3368b898a6f29a8cb19aa2b7c8a303413b09a9 /configure.ac | |
| parent | 024a50f566496535cdfe5af0e70916a052845822 (diff) | |
| parent | 5f1a3cf8f27043a6f7860552cb78f1f194a33b10 (diff) | |
| download | rabbitmq-c-github-ask-b593ce1b3ce740c17f209c8b33b74ea430bde65b.tar.gz | |
merge bug23472 into default (ac_abs_confdir only available in recent versions of autoconf)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4077362..ec782fb 100644 --- a/configure.ac +++ b/configure.ac @@ -59,8 +59,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" |