diff options
| author | Michael Steinert <mike.steinert@gmail.com> | 2012-05-15 17:09:27 -0600 |
|---|---|---|
| committer | Michael Steinert <mike.steinert@gmail.com> | 2012-05-17 11:44:44 -0600 |
| commit | fa9bf464a111549da2d6c7b51fc7eee321ebdc4c (patch) | |
| tree | a498bbf9459b74fb8c38d3077cfc983a9a7ab484 /configure.ac | |
| parent | b742300edabe34beb505139a818a000ef7767a91 (diff) | |
| download | rabbitmq-c-github-ask-fa9bf464a111549da2d6c7b51fc7eee321ebdc4c.tar.gz | |
Convert to non-recursive Automake
This change should speed up parallel builds considerably. It also
simplifies the structure of the build system making it possible to
properly track dependencies.
Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index e6aac32..aa0ae6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT([librabbitmq],[0.0.1],[support@rabbitmq.com]) AC_CONFIG_SRCDIR(librabbitmq/codegen.py) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.9 subdir-objects foreign -Wno-portability]) AC_CONFIG_HEADER([config.h]) @@ -54,6 +54,9 @@ if test "x$windows" = xyes ; then fi AC_SUBST(PLATFORM_DIR) +AM_CONDITIONAL([OS_UNIX], [test "x$windows" = "xno"]) +AM_CONDITIONAL([OS_WIN32], [test "x$windows" = "xyes"]) + dnl Enable -m64 if we were asked to do so AC_ARG_ENABLE(64-bit, [ --enable-64-bit produce 64-bit library], @@ -140,6 +143,11 @@ AS_IF([test "x$LIBPOPT" != "x"], [AC_MSG_FAILURE([You have libpopt, but could not find the popt.h header])]) ]) +POPT_CFLAGS= +POPT_LIBS=-lpopt +AC_SUBST([POPT_CFLAGS]) +AC_SUBST([POPT_LIBS]) + AM_CONDITIONAL(TOOLS, test "x$LIBPOPT" != "x") AC_ARG_WITH([xmlto], @@ -154,13 +162,8 @@ AS_IF([test "x$with_xmlto" != xno], AC_MSG_FAILURE([--with-xmlto was given, but xmlto not found]) fi]) -AM_CONDITIONAL(TOOLS_DOC, test "x$XMLTO" != "x") +AM_CONDITIONAL(DOCS, test "x$XMLTO" != "x") AC_OUTPUT( Makefile -librabbitmq/Makefile -tests/Makefile -examples/Makefile -tools/Makefile -tools/doc/Makefile ) |