diff options
| author | Ask Solem <ask@celeryproject.org> | 2014-04-14 17:29:03 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2014-04-14 17:29:03 +0100 |
| commit | be3000b4c84d7503f5ef4067de44ff16d060d158 (patch) | |
| tree | fecacb0f149b067202c443b59aad3cc027a0ff1c /configure.ac | |
| parent | dcb8edaccd6e164d624edfab0f3120d96f707f0a (diff) | |
| parent | fe844e41ffad5691607982cbfe4054aacdcb81e0 (diff) | |
| download | rabbitmq-c-github-ask-be3000b4c84d7503f5ef4067de44ff16d060d158.tar.gz | |
Merge branch 'alanxz/master'
Conflicts:
Makefile.am
codegen
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 931a22b..0d60b72 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.59]) m4_define([major_version], [0]) -m4_define([minor_version], [3]) +m4_define([minor_version], [5]) m4_define([micro_version], [0]) # Follow all steps below in order to calculate new ABI version when updating the library @@ -12,12 +12,12 @@ m4_define([micro_version], [0]) # 2. If any interfaces have been added, removed, or changed since the last update, increment current and set revision to 0. # 3. If any interfaces have been added since the last public release, then increment age. # 4. If any interfaces have been removed since the last public release, then set age to 0. -m4_define([soversion_current], [1]) -m4_define([soversion_revision], [1]) -m4_define([soversion_age], [0]) +m4_define([soversion_current], [3]) +m4_define([soversion_revision], [0]) +m4_define([soversion_age], [2]) 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@:>@], @@ -144,7 +115,8 @@ AS_IF([test "x$with_ssl" = "xcyassl"], [test "x$with_ssl" = "xgnutls"], [PKG_CHECK_MODULES([SSL], [gnutls],, [with_ssl=no])], [test "x$with_ssl" = "xopenssl"], - [PKG_CHECK_MODULES([SSL], [openssl >= 0.9.8],, [with_ssl=no])], + [PKG_CHECK_MODULES([SSL], [openssl >= 0.9.8], [ssl_pkg_required=openssl], + [with_ssl=no])], [test "x$with_ssl" = "xpolarssl"], [AX_LIB_POLARSSL([SSL_CFLAGS=$POLARSSL_CFLAGS SSL_LIBS=$POLARSSL_LIBS], @@ -191,6 +163,8 @@ AC_ARG_ENABLE([examples], [enable_examples=yes]) AM_CONDITIONAL([EXAMPLES], [test "x$enable_examples" = "xyes"]) +AC_SUBST([requires_private], [$ssl_pkg_required]) +AC_SUBST([libs_private], [$LIBS]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ librabbitmq.pc |