diff options
| author | Alan Antonuk <alan.antonuk@gmail.com> | 2013-08-13 15:55:29 -0700 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2013-08-13 16:40:48 -0700 |
| commit | dcbedd038f6159d982c886c78163bf480efae206 (patch) | |
| tree | 6d5bb2ebaa73b87699c923d6f19a5f7a45da3b17 /configure.ac | |
| parent | 8554733a88a19b19637be4b03b0e570e6dc75be9 (diff) | |
| download | rabbitmq-c-github-ask-dcbedd038f6159d982c886c78163bf480efae206.tar.gz | |
FIX: bring autotools build system up to date
Remove the amqp_framing.c/.h regeneration logic as it breaks make dist.
Bring the EXTRA_DIST list up to date with whats in the repo
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index c92af48..71cb21c 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ m4_define([soversion_revision], [1]) m4_define([soversion_age], [0]) AC_INIT([rabbitmq-c], [major_version.minor_version.micro_version], - [https://github.com/alanxz/rabbitmq-c/issues], [librabbitmq], + [https://github.com/alanxz/rabbitmq-c/issues], [rabbitmq-c], [http://www.rabbitmq.com/]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.9 subdir-objects foreign -Wno-portability]) @@ -101,35 +101,6 @@ AC_SEARCH_LIBS([socket], [socket], [], AC_SEARCH_LIBS([clock_gettime], [rt]) AC_CHECK_FUNCS([htonll]) -AC_ARG_ENABLE([regen-amqp-framing], - [AS_HELP_STRING([--enable-regen-amqp-framing], - [Regenerate amqp_framing.h/amqp_framing.c (for developer use)])]) - -AM_CONDITIONAL([REGENERATE_AMQP_FRAMING], [test "x$enable_regen_amqp_framing" = "xyes"]) - -AS_IF([test "x$enable_regen_amqp_framing" = "xyes"], - [AM_PATH_PYTHON([2.4],,AC_MSG_ERROR([--enable-regen-amqp-framing requires python])) - - AX_PYTHON_MODULE([json], []) - AS_IF([test "x$HAVE_PYMOD_JSON" = "xno"], - [AX_PYTHON_MODULE([simplejson])]) - AS_IF([test "x$HAVE_PYMOD_JSON" = "xno" && test "x$HAVE_PYMOD_SIMPLEJSON" = "xno"], - [AC_MSG_ERROR([Unable to find json or simplejson python modules])]) - - AS_VERSION_COMPARE([$PYTHON_VERSION],[3.0], - [eval HAVE_PYTHON3=no], - [eval HAVE_PYTHON3=yes], - [eval HAVE_PYTHON3=yes]) - - AS_IF([test "x$HAVE_PYTHON3" = "xyes"], - [AC_PATH_PROG(PYTHON2TO3,[2to3]) - AS_IF([test "x$PYTHON2TO3" = "x"], - AC_MSG_ERROR([Unable to find 2to3 python utility]))]) - - ], - [HAVE_PYTHON3=no]) -AM_CONDITIONAL([PYTHON3], [test "x$HAVE_PYTHON3" = "xyes"]) - # Configure SSL/TLS AC_ARG_WITH([ssl], [AS_HELP_STRING([--with-ssl=@<:@cyassl/gnutls/no/openssl/polarssl/yes@:>@], |