/dev/twasilczyk/screenshot: 5c8f2b588ec6: Merge default

[Tomasz Wasilczyk]

Changeset: 5c8f2b588ec69d6638de44f5e3dd74251b00797b
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-30 16:21 +0200
Branch:	 default
URL: https://hg.pidgin.im/dev/twasilczyk/screenshot/rev/5c8f2b588ec6

Description:

Merge default

diffstat:

 configure.ac |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ fi
 AC_CANONICAL_HOST
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4macros])
-AM_INIT_AUTOMAKE([1.11 -Wno-portability dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 -Wno-portability dist-bzip2 subdir-objects])
 AM_SILENT_RULES([yes])
 
 PURPLE_MAJOR_VERSION=purple_major_version