Merge branch 'master' of git@github.com:sustrik/zeromq2

67194267 · Martin Sustrik · 99c5d928 · 67c69f95 · 67194267
Commit 67194267 authored Aug 27, 2009 by Martin Sustrik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure.in configure.in +2 -2

No files found.
--- a/configure.in
+++ b/configure.in
@@ -212,6 +212,8 @@ if test "x$pyzmq" != "xyes"; then
        [python third-party/openpgm/libpgm-1.0.0/openpgm/pgm/version_generator.py > \
            third-party/openpgm/libpgm-1.0.0/openpgm/pgm/version.c])

+AM_CONDITIONAL(BUILD_PYTHON, test "x$pyzmq" = "xyes")
+
 AC_SUBST(stdint)
 AC_SUBST(inttypes)

@@ -241,5 +243,3 @@ AC_MSG_RESULT([ 0MQ install dir: $prefix])
 AC_MSG_RESULT([   Python language binding: $pyzmq])
 AC_MSG_RESULT([])

-AM_CONDITIONAL(BUILD_PYTHON, test "x$pyzmq" = "xyes")
-